diff options
| author | Simon L. B. Nielsen <simon@FreeBSD.org> | 2010-03-13 19:22:41 +0000 |
|---|---|---|
| committer | Simon L. B. Nielsen <simon@FreeBSD.org> | 2010-03-13 19:22:41 +0000 |
| commit | 6a599222bb564010b80b78eef3f2b6ba6c8db14a (patch) | |
| tree | 909a7c21b7df72ae8c08b80b468a4dd75b3820be /crypto/openssl/ssl/ssl_ciph.c | |
| parent | c5af82e51782b019d13e562a07c17dc19a282de2 (diff) | |
| parent | f7a1b4761cf3f798e1b42d703d38221b47ce1eec (diff) | |
| download | src-6a599222bb564010b80b78eef3f2b6ba6c8db14a.tar.gz src-6a599222bb564010b80b78eef3f2b6ba6c8db14a.zip | |
Merge OpenSSL 0.9.8m into head.
This also "reverts" some FreeBSD local changes so we should now
be back to using entirely stock OpenSSL. The local changes were
simple $FreeBSD$ lines additions, which were required in the CVS
days, and the patch for FreeBSD-SA-09:15.ssl which has been
superseded with OpenSSL 0.9.8m's RFC5746 'TLS renegotiation
extension' support.
MFC after: 3 weeks
Notes
Notes:
svn path=/head/; revision=205128
Diffstat (limited to 'crypto/openssl/ssl/ssl_ciph.c')
| -rw-r--r-- | crypto/openssl/ssl/ssl_ciph.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/crypto/openssl/ssl/ssl_ciph.c b/crypto/openssl/ssl/ssl_ciph.c index 52f91cfe6095..5e2d436da39a 100644 --- a/crypto/openssl/ssl/ssl_ciph.c +++ b/crypto/openssl/ssl/ssl_ciph.c @@ -1091,10 +1091,11 @@ STACK_OF(SSL_CIPHER) *ssl_create_cipher_list(const SSL_METHOD *ssl_method, *cipher_list_by_id = tmp_cipher_list; (void)sk_SSL_CIPHER_set_cmp_func(*cipher_list_by_id,ssl_cipher_ptr_id_cmp); + sk_SSL_CIPHER_sort(*cipher_list_by_id); return(cipherstack); } -char *SSL_CIPHER_description(SSL_CIPHER *cipher, char *buf, int len) +char *SSL_CIPHER_description(const SSL_CIPHER *cipher, char *buf, int len) { int is_export,pkl,kl; const char *ver,*exp_str; |