Skip to content

Conversation

@xyu
Copy link

@xyu xyu commented Dec 28, 2021

The 1.1.1e no longer applies cleanly due to openssl/openssl#16955 which was merged into 1.1.1m.

Here's the diff against the last patch:

diff -U3 openssl-equal-1.1.1e-dev_ciphers.patch openssl-equal-1.1.1m-dev_ciphers.patch
--- openssl-equal-1.1.1e-dev_ciphers.patch	2021-12-28 22:00:04.000000000 +0000
+++ openssl-equal-1.1.1m-dev_ciphers.patch	2021-12-28 22:05:07.000000000 +0000
@@ -697,7 +697,7 @@
      }
      ssl_cipher_collect_aliases(ca_list, num_of_group_aliases,
                                 disabled_mkey, disabled_auth, disabled_enc,
-@@ -1583,28 +1647,19 @@ STACK_OF(SSL_CIPHER) *ssl_create_cipher_list(const SSL_METHOD *ssl_method,
+@@ -1583,29 +1647,19 @@ STACK_OF(SSL_CIPHER) *ssl_create_cipher_list(const SSL_METHOD *ssl_method,

      OPENSSL_free(ca_list);      /* Not needed anymore */

@@ -723,6 +723,7 @@
 -    for (i = 0; i < sk_SSL_CIPHER_num(tls13_ciphersuites); i++) {
 -        if (!sk_SSL_CIPHER_push(cipherstack,
 -                                sk_SSL_CIPHER_value(tls13_ciphersuites, i))) {
+-            OPENSSL_free(co_list);
 -            sk_SSL_CIPHER_free(cipherstack);
 -            return NULL;
 -        }
@@ -733,7 +734,7 @@

      /*
       * The cipher selection for the list is done. The ciphers are added
-@@ -1612,26 +1667,50 @@ STACK_OF(SSL_CIPHER) *ssl_create_cipher_list(const SSL_METHOD *ssl_method,
+@@ -1613,26 +1667,50 @@ STACK_OF(SSL_CIPHER) *ssl_create_cipher_list(const SSL_METHOD *ssl_method,
       */
      for (curr = head; curr != NULL; curr = curr->next) {
          if (curr->active) {

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant