diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2009-12-09 15:01:39 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2009-12-09 15:01:39 +0000 |
| commit | 338a61b94e39e3db628ff862853255b8d71615ee (patch) | |
| tree | 1975d51ad1e192d9aa0b6621447bebc3d246e277 /ssl | |
| parent | e4bcadb3021e875f94b4a37b0edd18a83b7569a8 (diff) | |
Add patch to crypto/evp which didn't apply from PR#2124
Diffstat (limited to 'ssl')
| -rw-r--r-- | ssl/d1_clnt.c | 2 | ||||
| -rw-r--r-- | ssl/d1_srvr.c | 2 | ||||
| -rw-r--r-- | ssl/s3_pkt.c | 4 | ||||
| -rw-r--r-- | ssl/ssl.h | 1 | ||||
| -rw-r--r-- | ssl/ssl_err.c | 1 |
5 files changed, 6 insertions, 4 deletions
diff --git a/ssl/d1_clnt.c b/ssl/d1_clnt.c index 57c1033f55..5317a51180 100644 --- a/ssl/d1_clnt.c +++ b/ssl/d1_clnt.c @@ -698,7 +698,7 @@ int dtls1_client_hello(SSL *s) #ifndef OPENSSL_NO_TLSEXT if ((p = ssl_add_clienthello_tlsext(s, p, buf+SSL3_RT_MAX_PLAIN_LENGTH)) == NULL) { - SSLerr(SSL_F_SSL3_CLIENT_HELLO,ERR_R_INTERNAL_ERROR); + SSLerr(SSL_F_DTLS1_CLIENT_HELLO,ERR_R_INTERNAL_ERROR); goto err; } #endif diff --git a/ssl/d1_srvr.c b/ssl/d1_srvr.c index 007542f534..fb64d49166 100644 --- a/ssl/d1_srvr.c +++ b/ssl/d1_srvr.c @@ -814,7 +814,7 @@ int dtls1_send_server_hello(SSL *s) #ifndef OPENSSL_NO_TLSEXT if ((p = ssl_add_serverhello_tlsext(s, p, buf+SSL3_RT_MAX_PLAIN_LENGTH)) == NULL) { - SSLerr(SSL_F_SSL3_SEND_SERVER_HELLO,ERR_R_INTERNAL_ERROR); + SSLerr(SSL_F_DTLS1_SEND_SERVER_HELLO,ERR_R_INTERNAL_ERROR); return -1; } #endif diff --git a/ssl/s3_pkt.c b/ssl/s3_pkt.c index 808505771d..9f2e16de87 100644 --- a/ssl/s3_pkt.c +++ b/ssl/s3_pkt.c @@ -789,8 +789,8 @@ static int do_ssl3_write(SSL *s, int type, const unsigned char *buf, if (eivlen) { - if (RAND_pseudo_bytes(p, eivlen) <= 0) - goto err; + /* if (RAND_pseudo_bytes(p, eivlen) <= 0) + goto err; */ wr->length += eivlen; } @@ -2159,6 +2159,7 @@ void ERR_load_SSL_strings(void); #define SSL_R_NO_PRIVATE_KEY_ASSIGNED 190 #define SSL_R_NO_PROTOCOLS_AVAILABLE 191 #define SSL_R_NO_PUBLICKEY 192 +#define SSL_R_NO_RENEGOTIATION 339 #define SSL_R_NO_REQUIRED_DIGEST 324 #define SSL_R_NO_SHARED_CIPHER 193 #define SSL_R_NO_VERIFY_CALLBACK 194 diff --git a/ssl/ssl_err.c b/ssl/ssl_err.c index 7540bd4ebd..f47e4a5099 100644 --- a/ssl/ssl_err.c +++ b/ssl/ssl_err.c @@ -414,6 +414,7 @@ static ERR_STRING_DATA SSL_str_reasons[]= {ERR_REASON(SSL_R_NO_PRIVATE_KEY_ASSIGNED),"no private key assigned"}, {ERR_REASON(SSL_R_NO_PROTOCOLS_AVAILABLE),"no protocols available"}, {ERR_REASON(SSL_R_NO_PUBLICKEY) ,"no publickey"}, +{ERR_REASON(SSL_R_NO_RENEGOTIATION) ,"no renegotiation"}, {ERR_REASON(SSL_R_NO_REQUIRED_DIGEST) ,"digest requred for handshake isn't computed"}, {ERR_REASON(SSL_R_NO_SHARED_CIPHER) ,"no shared cipher"}, {ERR_REASON(SSL_R_NO_VERIFY_CALLBACK) ,"no verify callback"}, |