jinql
/
openssl-patch
mirror of https://github.com/hakasenyang/openssl-patch
1
0
Fork 0
Code Issues Releases Wiki Activity

Update openssl-equal-pre6.patch

openssl-1.1.1
Hakase 2018-04-23 13:25:01 +09:00
parent dc30e407bb
commit ea82075c07
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openssl-equal-pre6.patch
View File

@ -307,7 +307,7 @@ index 6193269..8f9262f 100644
} }
diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c
index 9011e42..9fd70b6 100644 index 9011e42..113a728 100644
--- a/ssl/ssl_ciph.c --- a/ssl/ssl_ciph.c
+++ b/ssl/ssl_ciph.c +++ b/ssl/ssl_ciph.c
@@ -190,6 +190,7 @@ typedef struct cipher_order_st { @@ -190,6 +190,7 @@ typedef struct cipher_order_st {
@ -633,7 +633,7 @@ index 9011e42..9fd70b6 100644
- OPENSSL_free(co_list); - OPENSSL_free(co_list);
SSLerr(SSL_F_SSL_CREATE_CIPHER_LIST, ERR_R_MALLOC_FAILURE); SSLerr(SSL_F_SSL_CREATE_CIPHER_LIST, ERR_R_MALLOC_FAILURE);
- return NULL; /* Failure */ - return NULL; /* Failure */
+ goto err; /* Failure */ + goto err; /* Failure */
} }
ssl_cipher_collect_aliases(ca_list, num_of_group_aliases, ssl_cipher_collect_aliases(ca_list, num_of_group_aliases,
disabled_mkey, disabled_auth, disabled_enc, disabled_mkey, disabled_auth, disabled_enc,
@ -646,7 +646,7 @@ index 9011e42..9fd70b6 100644
- return NULL; - return NULL;
- } - }
+ if (!ok) + if (!ok)
+ goto err; /* Rule processing failure */ + goto err; /* Rule processing failure */
/* /*
* Allocate new "cipherstack" for the result, return with error * Allocate new "cipherstack" for the result, return with error