diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2012-12-26 16:25:06 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2012-12-26 16:25:06 +0000 |
| commit | 1520e6c084ccc06a6325381bf9fc618ab5cfb230 (patch) | |
| tree | e15351c2802795a0c9ff38f83ed6e50160e9f66c /ssl/s3_lib.c | |
| parent | 2001129f096d10bbd815936d23af3e97daf7882d (diff) | |
Add ctrl and utility functions to retrieve raw cipher list sent by client in
client hello message. Previously this could only be retrieved on an initial
connection and it was impossible to determine the cipher IDs of any uknown
ciphersuites.
(backport from HEAD)
Diffstat (limited to 'ssl/s3_lib.c')
| -rw-r--r-- | ssl/s3_lib.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c index 088ca05e67..f8b3e4a32a 100644 --- a/ssl/s3_lib.c +++ b/ssl/s3_lib.c @@ -3955,10 +3955,7 @@ const SSL_CIPHER *ssl3_get_cipher_by_char(const unsigned char *p) #ifdef DEBUG_PRINT_UNKNOWN_CIPHERSUITES if (cp == NULL) fprintf(stderr, "Unknown cipher ID %x\n", (p[0] << 8) | p[1]); #endif - if (cp == NULL || cp->valid == 0) - return NULL; - else - return cp; + return cp; } int ssl3_put_cipher_by_char(const SSL_CIPHER *c, unsigned char *p) |