diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2009-12-08 13:47:28 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2009-12-08 13:47:28 +0000 |
| commit | 59f44e810b696b7a908ab5b1958e16711a9154c2 (patch) | |
| tree | 0ba7506f53ae1febe4aac8b57ef8038f32844003 /ssl/ssl_lib.c | |
| parent | 7a014dceb61236803270f5c6022b82a2c656e0a1 (diff) | |
Add ctrl and macro so we can determine if peer support secure renegotiation.
Fix SSL_CIPHER initialiser for mcsv
Diffstat (limited to 'ssl/ssl_lib.c')
| -rw-r--r-- | ssl/ssl_lib.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c index e0a5926192..5399d46b93 100644 --- a/ssl/ssl_lib.c +++ b/ssl/ssl_lib.c @@ -1003,6 +1003,10 @@ long SSL_ctrl(SSL *s,int cmd,long larg,void *parg) return larg; } return 0; + case SSL_CTRL_GET_RI_SUPPORT: + if (s->s3) + return s->s3->send_connection_binding; + else return 0; default: return(s->method->ssl_ctrl(s,cmd,larg,parg)); } @@ -1294,7 +1298,7 @@ int ssl_cipher_list_to_bytes(SSL *s,STACK_OF(SSL_CIPHER) *sk,unsigned char *p, { static SSL_CIPHER msvc = { - 0, NULL, SSL3_CK_MCSV, 0, 0, 0, 0, 0, 0, 0, 0, 0 + 0, NULL, SSL3_CK_MCSV, 0, 0, 0, 0, 0, 0, 0, }; j = put_cb ? put_cb(&msvc,p) : ssl_put_cipher_by_char(s,&msvc,p); p+=j; |