generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update RI to match latest spec.

Browse Source 
MCSV is now called SCSV.

Don't send SCSV if renegotiating.

Also note if RI is empty in debug messages.
This commit is contained in:
Dr. Stephen Henson
2009-12-27 22:58:55 +00:00
parent b57599b70c
commit d68015764e
3 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ssl/ssl_lib.c
View File

@@ -1370,18 +1370,18 @@ int ssl_cipher_list_to_bytes(SSL *s,STACK_OF(SSL_CIPHER) *sk,unsigned char *p,
p+=j;
}
/* If p == q, no ciphers and caller indicates an error, otherwise
* add MCSV
* add SCSV if not renegotiating
*/
if (p != q)
if (p != q && !s->new_session)
{
static SSL_CIPHER msvc =
{
0, NULL, SSL3_CK_MCSV, 0, 0, 0, 0, 0, 0, 0, 0, 0
0, NULL, SSL3_CK_SCSV, 0, 0, 0, 0, 0, 0, 0, 0, 0
};
j = put_cb ? put_cb(&msvc,p) : ssl_put_cipher_by_char(s,&msvc,p);
p+=j;
#ifdef OPENSSL_RI_DEBUG
fprintf(stderr, "MCSV sent by client\n");
fprintf(stderr, "SCSV sent by client\n");
#endif
}
@@ -1413,15 +1413,15 @@ 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 */
/* Check for SCSV */
if (s->s3 && (n != 3 || !p[0]) &&
(p[n-2] == ((SSL3_CK_MCSV >> 8) & 0xff)) &&
(p[n-1] == (SSL3_CK_MCSV & 0xff)))
(p[n-2] == ((SSL3_CK_SCSV >> 8) & 0xff)) &&
(p[n-1] == (SSL3_CK_SCSV & 0xff)))
{
s->s3->send_connection_binding = 1;
p += n;
#ifdef OPENSSL_RI_DEBUG
fprintf(stderr, "MCSV received by server\n");
fprintf(stderr, "SCSV received by server\n");
#endif
continue;
}