summaryrefslogtreecommitdiff
path: root/src/lib/libssl/ssl_locl.h
diff options
context:
space:
mode:
authorjsing <>2016-12-04 14:32:30 +0000
committerjsing <>2016-12-04 14:32:30 +0000
commit782e6af2c8cf001e1a3eef1d0acb0d16317e4464 (patch)
tree6a613d77bd4aec9fa5dc6298f87635dc2e192c5e /src/lib/libssl/ssl_locl.h
parent125562152f7bac1aa3f59cb62b9845b28dd7d530 (diff)
downloadopenbsd-782e6af2c8cf001e1a3eef1d0acb0d16317e4464.tar.gz
openbsd-782e6af2c8cf001e1a3eef1d0acb0d16317e4464.tar.bz2
openbsd-782e6af2c8cf001e1a3eef1d0acb0d16317e4464.zip
Convert ssl_cipher_list_to_bytes() to CBB, changing the function to return
the number of bytes written via an explicit *outlen argument and retaining the return value to indicate success or failure. ok doug@
Diffstat (limited to 'src/lib/libssl/ssl_locl.h')
-rw-r--r--src/lib/libssl/ssl_locl.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/libssl/ssl_locl.h b/src/lib/libssl/ssl_locl.h
index 6c36795b1d..c7ae289a3a 100644
--- a/src/lib/libssl/ssl_locl.h
+++ b/src/lib/libssl/ssl_locl.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssl_locl.h,v 1.136 2016/11/06 17:21:04 jsing Exp $ */ 1/* $OpenBSD: ssl_locl.h,v 1.137 2016/12/04 14:32:30 jsing Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -569,7 +569,7 @@ int ssl_cipher_ptr_id_cmp(const SSL_CIPHER * const *ap,
569STACK_OF(SSL_CIPHER) *ssl_bytes_to_cipher_list(SSL *s, const unsigned char *p, 569STACK_OF(SSL_CIPHER) *ssl_bytes_to_cipher_list(SSL *s, const unsigned char *p,
570 int num); 570 int num);
571int ssl_cipher_list_to_bytes(SSL *s, STACK_OF(SSL_CIPHER) *sk, 571int ssl_cipher_list_to_bytes(SSL *s, STACK_OF(SSL_CIPHER) *sk,
572 unsigned char *p); 572 unsigned char *p, size_t maxlen, size_t *outlen);
573STACK_OF(SSL_CIPHER) *ssl_create_cipher_list(const SSL_METHOD *meth, 573STACK_OF(SSL_CIPHER) *ssl_create_cipher_list(const SSL_METHOD *meth,
574 STACK_OF(SSL_CIPHER) **pref, STACK_OF(SSL_CIPHER) **sorted, 574 STACK_OF(SSL_CIPHER) **pref, STACK_OF(SSL_CIPHER) **sorted,
575 const char *rule_str); 575 const char *rule_str);