diff options
| author | Bodo Möller <bodo@openssl.org> | 2005-05-11 18:25:49 +0000 |
|---|---|---|
| committer | Bodo Möller <bodo@openssl.org> | 2005-05-11 18:25:49 +0000 |
| commit | c6c2e3135dd6cff21bb4cd05a3891b5fdde04977 (patch) | |
| tree | c3db1720b495d5edec01e48abd0696b20cd40fee /ssl/ssl_lib.c | |
| parent | 4b26fe30de5c29439ebcf39f0baf897864211883 (diff) | |
| download | openssl-c6c2e3135dd6cff21bb4cd05a3891b5fdde04977.zip openssl-c6c2e3135dd6cff21bb4cd05a3891b5fdde04977.tar.gz openssl-c6c2e3135dd6cff21bb4cd05a3891b5fdde04977.tar.bz2 | |
Don't use the SSL 2.0 Client Hello format if SSL 2.0 is disabled
with the SSL_OP_NO_SSLv2 option.
Diffstat (limited to 'ssl/ssl_lib.c')
| -rw-r--r-- | ssl/ssl_lib.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c index b504c2c..d716d97 100644 --- a/ssl/ssl_lib.c +++ b/ssl/ssl_lib.c @@ -1204,7 +1204,8 @@ char *SSL_get_shared_ciphers(const SSL *s,char *buf,int len) return(buf); } -int ssl_cipher_list_to_bytes(SSL *s,STACK_OF(SSL_CIPHER) *sk,unsigned char *p) +int ssl_cipher_list_to_bytes(SSL *s,STACK_OF(SSL_CIPHER) *sk,unsigned char *p, + int (*put_cb)(const SSL_CIPHER *, unsigned char *)) { int i,j=0; SSL_CIPHER *c; @@ -1223,7 +1224,8 @@ int ssl_cipher_list_to_bytes(SSL *s,STACK_OF(SSL_CIPHER) *sk,unsigned char *p) if ((c->algorithms & SSL_KRB5) && nokrb5) continue; #endif /* OPENSSL_NO_KRB5 */ - j=ssl_put_cipher_by_char(s,c,p); + + j = put_cb ? put_cb(c,p) : ssl_put_cipher_by_char(s,c,p); p+=j; } return(p-q); |