mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-01-30 14:01:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Make OPENSSL_sk_push return only 0 or 1

Browse Source 
Most of the callers do not actually check for
the special -1 return condition because they do not
pass NULL to it. It is also extremely improbable that
any code depends on this -1 return value in this condition
so it can be safely changed to 0 return.

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Ben Kaduk <kaduk@mit.edu>
(Merged from https://github.com/openssl/openssl/pull/22930)
This commit is contained in:
Tomas Mraz 2023-12-04 11:16:45 +01:00
parent 8b9cf1bc2c
commit 98d6016afe
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGES.md
View File

@ -41,6 +41,11 @@ OpenSSL 3.3
*Neil Horman*
* OPENSSL_sk_push() and sk_<TYPE>_push() functions now return 0 instead of -1
if called with a NULL stack argument.
*Tomáš Mráz*
* In `openssl speed`, changed the default hash function used with `hmac` from
`md5` to `sha256`.

2
crypto/stack/stack.c
View File

@ -397,7 +397,7 @@ int OPENSSL_sk_find_all(OPENSSL_STACK *st, const void *data, int *pnum)
int OPENSSL_sk_push(OPENSSL_STACK *st, const void *data)
{
if (st == NULL)
return -1;
return 0;
return OPENSSL_sk_insert(st, data, st->num);
}

4
doc/man3/DEFINE_STACK_OF.pod
View File

@ -270,7 +270,6 @@ on error.
B<sk_I<TYPE>_insert>(), B<sk_I<TYPE>_push>() and B<sk_I<TYPE>_unshift>() return
the total number of elements in the stack and 0 if an error occurred.
B<sk_I<TYPE>_push>() further returns -1 if I<sk> is NULL.
B<sk_I<TYPE>_set>() returns a pointer to the replacement element or NULL on
error.
@ -297,6 +296,9 @@ and B<sk_I<TYPE>_find_all>() calls are read-only and do not sort the
stack. To avoid any performance implications this change introduces,
B<sk_I<TYPE>_sort>() should be called before these find operations.
Before OpenSSL 3.3.0 B<sk_I<TYPE>_push>() returned -1 if I<sk> was NULL. It
was changed to return 0 in this condition as for other errors.
=head1 COPYRIGHT
Copyright 2000-2023 The OpenSSL Project Authors. All Rights Reserved.