diff options
| author | jkim <jkim@FreeBSD.org> | 2014-06-09 06:00:28 +0000 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2014-06-09 06:00:28 +0000 |
| commit | 309e057bcfb01861779d20e3ce027661dcae0910 (patch) | |
| tree | 806791a3db00c226152a7ed55c647916c51c974b /crypto/openssl/ssl/ssl_lib.c | |
| parent | 679c7dcca69d7c267e21eb3b50c5cfa2e1f53f35 (diff) | |
| download | FreeBSD-src-309e057bcfb01861779d20e3ce027661dcae0910.zip FreeBSD-src-309e057bcfb01861779d20e3ce027661dcae0910.tar.gz | |
MFC: r267256
Merge OpenSSL 1.0.1h.
Approved by: so (delphij)
Diffstat (limited to 'crypto/openssl/ssl/ssl_lib.c')
| -rw-r--r-- | crypto/openssl/ssl/ssl_lib.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/crypto/openssl/ssl/ssl_lib.c b/crypto/openssl/ssl/ssl_lib.c index 6dbc3c1..ef6258c 100644 --- a/crypto/openssl/ssl/ssl_lib.c +++ b/crypto/openssl/ssl/ssl_lib.c @@ -1349,6 +1349,10 @@ char *SSL_get_shared_ciphers(const SSL *s,char *buf,int len) p=buf; sk=s->session->ciphers; + + if (sk_SSL_CIPHER_num(sk) == 0) + return NULL; + for (i=0; i<sk_SSL_CIPHER_num(sk); i++) { int n; |
