Add patch to crypto/evp which didn't apply from PR#2124
diff --git a/ssl/d1_clnt.c b/ssl/d1_clnt.c index 57c1033..5317a51 100644 --- a/ssl/d1_clnt.c +++ b/ssl/d1_clnt.c
@@ -698,7 +698,7 @@ #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 007542f..fb64d49 100644 --- a/ssl/d1_srvr.c +++ b/ssl/d1_srvr.c
@@ -814,7 +814,7 @@ #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 8085057..9f2e16d 100644 --- a/ssl/s3_pkt.c +++ b/ssl/s3_pkt.c
@@ -789,8 +789,8 @@ if (eivlen) { - if (RAND_pseudo_bytes(p, eivlen) <= 0) - goto err; + /* if (RAND_pseudo_bytes(p, eivlen) <= 0) + goto err; */ wr->length += eivlen; }
diff --git a/ssl/ssl.h b/ssl/ssl.h index 4d53ef8..897a8ca 100644 --- a/ssl/ssl.h +++ b/ssl/ssl.h
@@ -2159,6 +2159,7 @@ #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 7540bd4..f47e4a5 100644 --- a/ssl/ssl_err.c +++ b/ssl/ssl_err.c
@@ -414,6 +414,7 @@ {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"},