diff options
| author |   jsing <jsing@openbsd.org> | 2015-04-15 16:25:43 +0000 |
|---|---|---|
| committer | jsing <jsing@openbsd.org> | 2015-04-15 16:25:43 +0000 |
| commit | ca366248adfd5c721424a6c92d7b72413e244187 (patch) | |
| tree | 9f5fa4149c6ddf9985cafa352d92e6197211e574 /lib/libssl/ssl_lib.c | |
| parent | Now that tls_close() is more robust, consider a failure to be fatal. (diff) | |
| download | wireguard-openbsd-ca366248adfd5c721424a6c92d7b72413e244187.tar.xz wireguard-openbsd-ca366248adfd5c721424a6c92d7b72413e244187.zip | |
Clean up the ssl_bytes_to_cipher_list() API - rather than having the
ability to pass or not pass a STACK_OF(SSL_CIPHER) *, which is then either
zeroed or if NULL a new one is allocated, always allocate one and return it
directly.
Inspired by simliar changes in BoringSSL.
ok beck@ doug@
Diffstat (limited to 'lib/libssl/ssl_lib.c')
| -rw-r--r-- | lib/libssl/ssl_lib.c | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/lib/libssl/ssl_lib.c b/lib/libssl/ssl_lib.c index 79ce81e70eb..b5ce2ea5ace 100644 --- a/lib/libssl/ssl_lib.c +++ b/lib/libssl/ssl_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl_lib.c,v 1.102 2015/03/27 12:26:41 jsing Exp $ */ +/* $OpenBSD: ssl_lib.c,v 1.103 2015/04/15 16:25:43 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -1410,11 +1410,10 @@ ssl_cipher_list_to_bytes(SSL *s, STACK_OF(SSL_CIPHER) *sk, unsigned char *p) } STACK_OF(SSL_CIPHER) * -ssl_bytes_to_cipher_list(SSL *s, unsigned char *p, int num, - STACK_OF(SSL_CIPHER) **skp) +ssl_bytes_to_cipher_list(SSL *s, unsigned char *p, int num) { const SSL_CIPHER *c; - STACK_OF(SSL_CIPHER) *sk; + STACK_OF(SSL_CIPHER) *sk = NULL; int i; unsigned long cipher_id; uint16_t cipher_value; @@ -1428,13 +1427,10 @@ ssl_bytes_to_cipher_list(SSL *s, unsigned char *p, int num, SSL_R_ERROR_IN_RECEIVED_CIPHER_LIST); return (NULL); } - if (skp == NULL || *skp == NULL) { - sk = sk_SSL_CIPHER_new_null(); /* change perhaps later */ - if (sk == NULL) - goto err; - } else { - sk = *skp; - sk_SSL_CIPHER_zero(sk); + + if ((sk = sk_SSL_CIPHER_new_null()) == NULL) { + SSLerr(SSL_F_SSL_BYTES_TO_CIPHER_LIST, ERR_R_MALLOC_FAILURE); + goto err; } for (i = 0; i < num; i += SSL3_CIPHER_VALUE_SIZE) { @@ -1486,13 +1482,11 @@ ssl_bytes_to_cipher_list(SSL *s, unsigned char *p, int num, } } - if (skp != NULL) - *skp = sk; return (sk); err: - if (skp == NULL || *skp == NULL) - sk_SSL_CIPHER_free(sk); + sk_SSL_CIPHER_free(sk); + return (NULL); } |