mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2024-11-21 01:15:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update from 1.0.0-stable.

Browse Source
This commit is contained in:
Dr. Stephen Henson 2009-05-28 18:11:29 +00:00
parent d0b72cf45b
commit caa97ef149
3 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ssl/s3_lib.c
View File

@ -3087,6 +3087,18 @@ int ssl3_get_req_cert_type(SSL *s, unsigned char *p)
alg_k = s->s3->tmp.new_cipher->algorithm_mkey; alg_k = s->s3->tmp.new_cipher->algorithm_mkey;
#ifndef OPENSSL_NO_GOST
if (s->version >= TLS1_VERSION)
{
if (alg_k & SSL_kGOST)
{
p[ret++]=TLS_CT_GOST94_SIGN;
p[ret++]=TLS_CT_GOST01_SIGN;
return(ret);
}
}
#endif
#ifndef OPENSSL_NO_DH #ifndef OPENSSL_NO_DH
if (alg_k & (SSL_kDHr|SSL_kEDH)) if (alg_k & (SSL_kDHr|SSL_kEDH))
{ {

2
ssl/ssl3.h
View File

@ -368,7 +368,7 @@ typedef struct ssl3_buffer_st
* enough to contain all of the cert types defined either for * enough to contain all of the cert types defined either for
* SSLv3 and TLSv1. * SSLv3 and TLSv1.
*/ */
#define SSL3_CT_NUMBER 7 #define SSL3_CT_NUMBER 9
#define SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS 0x0001 #define SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS 0x0001

6
ssl/tls1.h
View File

@ -471,7 +471,11 @@ SSL_CTX_callback_ctrl(ssl,SSL_CTRL_SET_TLSEXT_TICKET_KEY_CB,(void (*)(void))cb)
#define TLS_CT_ECDSA_SIGN 64 #define TLS_CT_ECDSA_SIGN 64
#define TLS_CT_RSA_FIXED_ECDH 65 #define TLS_CT_RSA_FIXED_ECDH 65
#define TLS_CT_ECDSA_FIXED_ECDH 66 #define TLS_CT_ECDSA_FIXED_ECDH 66
#define TLS_CT_NUMBER 7 #define TLS_CT_GOST94_SIGN 21
#define TLS_CT_GOST01_SIGN 22
/* when correcting this number, correct also SSL3_CT_NUMBER in ssl3.h (see
* comment there) */
#define TLS_CT_NUMBER 9
#define TLS1_FINISH_MAC_LENGTH 12 #define TLS1_FINISH_MAC_LENGTH 12