[rpms/openssl] rebase_40beta: Another attempt at the AES-CCM regression fix

[rpms/openssl] rebase_40beta: Another attempt at the AES-CCM regression fix

[Tomas Mraz]

A new commit has been pushed.

Repo   : rpms/openssl
Branch : rebase_40beta
Commit : b3060e5f2d7944e050bf133ecb15d779b2c64496
Author : Tomas Mraz <tmraz@fedoraproject.org>
Date   : 2019-05-10T16:27:24+02:00
Stats  : +6/-3 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/openssl/c/b3060e5f2d7944e050bf133ecb15d779b2c64496?branch=rebase_40beta

Log:
Another attempt at the AES-CCM regression fix

---
diff --git a/openssl-1.1.1-regression-fixes.patch b/openssl-1.1.1-regression-fixes.patch
index 3af815e..4e8c388 100644
--- a/openssl-1.1.1-regression-fixes.patch
+++ b/openssl-1.1.1-regression-fixes.patch
@@ -22,7 +22,7 @@ diff -up openssl-1.1.1b/crypto/evp/evp_enc.c.regression openssl-1.1.1b/crypto/ev
      bl = ctx->cipher->block_size;
  
 -    if (inl <= 0) {
-+    if (in == NULL && inl <= 0) {
++    if (out != NULL && in == NULL && inl <= 0) {
          *outl = 0;
          return inl == 0;
      }
@@ -31,7 +31,7 @@ diff -up openssl-1.1.1b/crypto/evp/evp_enc.c.regression openssl-1.1.1b/crypto/ev
          cmpl = (cmpl + 7) / 8;
  
 -    if (inl <= 0) {
-+    if (in == NULL && inl <= 0) {
++    if (out != NULL && in == NULL && inl <= 0) {
          *outl = 0;
          return inl == 0;
      }

diff --git a/openssl.spec b/openssl.spec
index a8ba638..04bb83f 100644
--- a/openssl.spec
+++ b/openssl.spec
@@ -22,7 +22,7 @@
 Summary: Utilities from the general purpose cryptography library with TLS implementation
 Name: openssl
 Version: 1.1.1b
-Release: 9%{?dist}
+Release: 10%{?dist}
 Epoch: 1
 # We have to remove certain patented algorithms from the openssl source
 # tarball with the hobble-openssl script which is included below.
@@ -454,6 +454,9 @@ export LD_LIBRARY_PATH
 %ldconfig_scriptlets libs
 
 %changelog
+* Fri May 10 2019 Tomáš Mráz <tmraz@redhat.com> 1.1.1b-10
+- Another attempt at the AES-CCM regression fix
+
 * Fri May 10 2019 Tomáš Mráz <tmraz@redhat.com> 1.1.1b-9
 - Fix two small regressions
 - Change the ts application default hash to SHA256