jonathan/openssl
1
0
Fork 0
forked from rpms/openssl
Code Pull Requests Activity

Another attempt at the AES-CCM regression fix

Browse Source
This commit is contained in:
Tomas Mraz 2019-05-10 16:27:24 +02:00
parent 22a821356e
commit b3060e5f2d
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openssl-1.1.1-regression-fixes.patch
View File

@ -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; bl = ctx->cipher->block_size;
- if (inl <= 0) { - if (inl <= 0) {
+ if (in == NULL && inl <= 0) { + if (out != NULL && in == NULL && inl <= 0) {
*outl = 0; *outl = 0;
return inl == 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; cmpl = (cmpl + 7) / 8;
- if (inl <= 0) { - if (inl <= 0) {
+ if (in == NULL && inl <= 0) { + if (out != NULL && in == NULL && inl <= 0) {
*outl = 0; *outl = 0;
return inl == 0; return inl == 0;
} }

5
openssl.spec
View File

@ -22,7 +22,7 @@
Summary: Utilities from the general purpose cryptography library with TLS implementation Summary: Utilities from the general purpose cryptography library with TLS implementation
Name: openssl Name: openssl
Version: 1.1.1b Version: 1.1.1b
Release: 9%{?dist} Release: 10%{?dist}
Epoch: 1 Epoch: 1
# We have to remove certain patented algorithms from the openssl source # We have to remove certain patented algorithms from the openssl source
# tarball with the hobble-openssl script which is included below. # tarball with the hobble-openssl script which is included below.
@ -454,6 +454,9 @@ export LD_LIBRARY_PATH
%ldconfig_scriptlets libs %ldconfig_scriptlets libs
%changelog %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 * Fri May 10 2019 Tomáš Mráz <tmraz@redhat.com> 1.1.1b-9
- Fix two small regressions - Fix two small regressions
- Change the ts application default hash to SHA256 - Change the ts application default hash to SHA256