Browse Source

Fix app crash when using wrong cipher (3.0.0-dev)

master
Hakase 1 week ago
parent
commit
89c8eedc85
Signed by: Hakase <hakase@hakase.app> GPG Key ID: BB2821A9E0DF48C9
2 changed files with 8 additions and 6 deletions
  1. 4
    3
      openssl-equal-3.0.0-dev.patch
  2. 4
    3
      openssl-equal-3.0.0-dev_ciphers.patch

+ 4
- 3
openssl-equal-3.0.0-dev.patch View File

@@ -331,7 +331,7 @@ index a3639fd18c..c24b5154ac 100644
331 331
  }
332 332
  
333 333
 diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c
334
-index 5aa04dbd53..dc238fc9c9 100644
334
+index 5aa04dbd53..655e259c9b 100644
335 335
 --- a/ssl/ssl_ciph.c
336 336
 +++ b/ssl/ssl_ciph.c
337 337
 @@ -193,6 +193,7 @@ typedef struct cipher_order_st {
@@ -717,7 +717,7 @@ index 5aa04dbd53..dc238fc9c9 100644
717 717
  
718 718
      OSSL_TRACE_BEGIN(TLS_CIPHER) {
719 719
          BIO_printf(trc_out, "cipher selection:\n");
720
-@@ -1618,11 +1673,10 @@ STACK_OF(SSL_CIPHER) *ssl_create_cipher_list(const SSL_METHOD *ssl_method,
720
+@@ -1618,26 +1673,51 @@ STACK_OF(SSL_CIPHER) *ssl_create_cipher_list(const SSL_METHOD *ssl_method,
721 721
      for (curr = head; curr != NULL; curr = curr->next) {
722 722
          if (curr->active) {
723 723
              if (!sk_SSL_CIPHER_push(cipherstack, curr->cipher)) {
@@ -731,8 +731,9 @@ index 5aa04dbd53..dc238fc9c9 100644
731 731
              if (trc_out != NULL)
732 732
                  BIO_printf(trc_out, "<%s>\n", curr->cipher->name);
733 733
          }
734
-@@ -1630,14 +1684,39 @@ STACK_OF(SSL_CIPHER) *ssl_create_cipher_list(const SSL_METHOD *ssl_method,
734
+     }
735 735
      OPENSSL_free(co_list);      /* Not needed any longer */
736
++    co_list = NULL;
736 737
      OSSL_TRACE_END(TLS_CIPHER);
737 738
  
738 739
 -    if (!update_cipher_list_by_id(cipher_list_by_id, cipherstack)) {

+ 4
- 3
openssl-equal-3.0.0-dev_ciphers.patch View File

@@ -380,7 +380,7 @@ index a3639fd18c..3f830c5d40 100644
380 380
  }
381 381
  
382 382
 diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c
383
-index 5aa04dbd53..dc238fc9c9 100644
383
+index 5aa04dbd53..655e259c9b 100644
384 384
 --- a/ssl/ssl_ciph.c
385 385
 +++ b/ssl/ssl_ciph.c
386 386
 @@ -193,6 +193,7 @@ typedef struct cipher_order_st {
@@ -766,7 +766,7 @@ index 5aa04dbd53..dc238fc9c9 100644
766 766
  
767 767
      OSSL_TRACE_BEGIN(TLS_CIPHER) {
768 768
          BIO_printf(trc_out, "cipher selection:\n");
769
-@@ -1618,11 +1673,10 @@ STACK_OF(SSL_CIPHER) *ssl_create_cipher_list(const SSL_METHOD *ssl_method,
769
+@@ -1618,26 +1673,51 @@ STACK_OF(SSL_CIPHER) *ssl_create_cipher_list(const SSL_METHOD *ssl_method,
770 770
      for (curr = head; curr != NULL; curr = curr->next) {
771 771
          if (curr->active) {
772 772
              if (!sk_SSL_CIPHER_push(cipherstack, curr->cipher)) {
@@ -780,8 +780,9 @@ index 5aa04dbd53..dc238fc9c9 100644
780 780
              if (trc_out != NULL)
781 781
                  BIO_printf(trc_out, "<%s>\n", curr->cipher->name);
782 782
          }
783
-@@ -1630,14 +1684,39 @@ STACK_OF(SSL_CIPHER) *ssl_create_cipher_list(const SSL_METHOD *ssl_method,
783
+     }
784 784
      OPENSSL_free(co_list);      /* Not needed any longer */
785
++    co_list = NULL;
785 786
      OSSL_TRACE_END(TLS_CIPHER);
786 787
  
787 788
 -    if (!update_cipher_list_by_id(cipher_list_by_id, cipherstack)) {

Loading…
Cancel
Save