diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2009-12-09 18:01:07 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2009-12-09 18:01:07 +0000 |
| commit | 98c7b0367d94f7c18f6cc77c4ce9453f2675b842 (patch) | |
| tree | d946c8ed570eb8531e10c24d368a52b14289326f /ssl/ssl_lib.c | |
| parent | 9e5dea0ffdd63f9fb45d91ceb13071008fdc1d6c (diff) | |
Document option clearning functions.
Initial secure renegotiation documentation.
Diffstat (limited to 'ssl/ssl_lib.c')
| -rw-r--r-- | ssl/ssl_lib.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c index f3b2eb9e95..c5eafe4524 100644 --- a/ssl/ssl_lib.c +++ b/ssl/ssl_lib.c @@ -1324,8 +1324,8 @@ STACK_OF(SSL_CIPHER) *ssl_bytes_to_cipher_list(SSL *s,unsigned char *p,int num, SSL_CIPHER *c; STACK_OF(SSL_CIPHER) *sk; int i,n; - - s->s3->send_connection_binding = 0; + if (s->s3) + s->s3->send_connection_binding = 0; n=ssl_put_cipher_by_char(s,NULL,NULL); if ((num%n) != 0) @@ -1344,7 +1344,7 @@ STACK_OF(SSL_CIPHER) *ssl_bytes_to_cipher_list(SSL *s,unsigned char *p,int num, for (i=0; i<num; i+=n) { /* Check for MCSV */ - if ((n != 3 || !p[0]) && + if (s->s3 && (n != 3 || !p[0]) && (p[n-2] == ((SSL3_CK_MCSV >> 8) & 0xff)) && (p[n-1] == (SSL3_CK_MCSV & 0xff))) { |