diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2019-02-27 03:09:41 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2019-02-27 08:59:45 +0100 |
commit | aea2ef36ce7429426cea468334d292fe11ce1dd9 (patch) | |
tree | 6b70f2d0153e7073af72cfcf7990cdb32d59b4fc /source/n/epic5/openssl-1.1.patch | |
parent | 604397857e72280ba64741771fa6667d71608201 (diff) | |
download | current-aea2ef36ce7429426cea468334d292fe11ce1dd9.tar.gz current-aea2ef36ce7429426cea468334d292fe11ce1dd9.tar.xz |
Wed Feb 27 03:09:41 UTC 201920190227030941
a/btrfs-progs-4.20.2-x86_64-1.txz: Upgraded.
a/openssl-solibs-1.1.1b-x86_64-1.txz: Upgraded.
ap/ddrescue-1.24-x86_64-1.txz: Upgraded.
ap/sqlite-3.27.2-x86_64-1.txz: Upgraded.
l/libssh-0.8.7-x86_64-1.txz: Upgraded.
l/talloc-2.1.16-x86_64-1.txz: Upgraded.
l/tdb-1.3.18-x86_64-1.txz: Upgraded.
l/tevent-0.9.39-x86_64-1.txz: Upgraded.
n/ca-certificates-20181210-noarch-2.txz: Rebuilt.
Use "c_rehash" rather than "openssl rehash" for compatibility with all
versions of OpenSSL.
n/epic5-2.1.1-x86_64-1.txz: Upgraded.
n/openssl-1.1.1b-x86_64-1.txz: Upgraded.
x/xorg-server-1.20.4-x86_64-1.txz: Upgraded.
x/xorg-server-xephyr-1.20.4-x86_64-1.txz: Upgraded.
x/xorg-server-xnest-1.20.4-x86_64-1.txz: Upgraded.
x/xorg-server-xvfb-1.20.4-x86_64-1.txz: Upgraded.
xap/mozilla-thunderbird-60.5.2-x86_64-1.txz: Upgraded.
This is a bugfix release.
For more information, see:
https://www.mozilla.org/en-US/thunderbird/60.5.2/releasenotes/
Diffstat (limited to 'source/n/epic5/openssl-1.1.patch')
-rw-r--r-- | source/n/epic5/openssl-1.1.patch | 77 |
1 files changed, 0 insertions, 77 deletions
diff --git a/source/n/epic5/openssl-1.1.patch b/source/n/epic5/openssl-1.1.patch deleted file mode 100644 index 254035e6d..000000000 --- a/source/n/epic5/openssl-1.1.patch +++ /dev/null @@ -1,77 +0,0 @@ -Index: epic5-2.0/source/crypto.c -=================================================================== ---- epic5-2.0.orig/source/crypto.c -+++ epic5-2.0/source/crypto.c -@@ -282,9 +282,9 @@ static char * decipher_evp (const unsign - unsigned char *iv = NULL; - unsigned long errcode; - int outlen2; -- EVP_CIPHER_CTX a; -- EVP_CIPHER_CTX_init(&a); -- EVP_CIPHER_CTX_set_padding(&a, 0); -+ EVP_CIPHER_CTX *a = EVP_CIPHER_CTX_new(); -+ EVP_CIPHER_CTX_init(a); -+ EVP_CIPHER_CTX_set_padding(a, 0); - - if (ivsize > 0) - iv = new_malloc(ivsize); -@@ -292,18 +292,19 @@ static char * decipher_evp (const unsign - if (ivsize > 0) - memcpy(iv, ciphertext, ivsize); - -- EVP_DecryptInit_ex(&a, type, NULL, NULL, iv); -- EVP_CIPHER_CTX_set_key_length(&a, passwdlen); -- EVP_CIPHER_CTX_set_padding(&a, 0); -- EVP_DecryptInit_ex(&a, NULL, NULL, passwd, NULL); -+ EVP_DecryptInit_ex(a, type, NULL, NULL, iv); -+ EVP_CIPHER_CTX_set_key_length(a, passwdlen); -+ EVP_CIPHER_CTX_set_padding(a, 0); -+ EVP_DecryptInit_ex(a, NULL, NULL, passwd, NULL); - -- if (EVP_DecryptUpdate(&a, outbuf, outlen, ciphertext, cipherlen) != 1) -+ if (EVP_DecryptUpdate(a, outbuf, outlen, ciphertext, cipherlen) != 1) - yell("EVP_DecryptUpdate died."); -- if (EVP_DecryptFinal_ex(&a, outbuf + (*outlen), &outlen2) != 1) -+ if (EVP_DecryptFinal_ex(a, outbuf + (*outlen), &outlen2) != 1) - yell("EVP_DecryptFinal_Ex died."); - *outlen += outlen2; - -- EVP_CIPHER_CTX_cleanup(&a); -+ EVP_CIPHER_CTX_cleanup(a); -+ EVP_CIPHER_CTX_free(a); - - ERR_load_crypto_strings(); - while ((errcode = ERR_get_error())) -@@ -454,9 +455,9 @@ static char * cipher_evp (const unsigned - unsigned long errcode; - u_32int_t randomval; - int iv_count; -- EVP_CIPHER_CTX a; -- EVP_CIPHER_CTX_init(&a); -- EVP_CIPHER_CTX_set_padding(&a, 0); -+ EVP_CIPHER_CTX *a = EVP_CIPHER_CTX_new(); -+ EVP_CIPHER_CTX_init(a); -+ EVP_CIPHER_CTX_set_padding(a, 0); - - if (ivsize < 0) - ivsize = 0; /* Shenanigans! */ -@@ -480,12 +481,13 @@ static char * cipher_evp (const unsigned - if (iv) - memcpy(outbuf, iv, ivsize); - -- EVP_EncryptInit_ex(&a, type, NULL, NULL, iv); -- EVP_CIPHER_CTX_set_key_length(&a, passwdlen); -- EVP_EncryptInit_ex(&a, NULL, NULL, passwd, NULL); -- EVP_EncryptUpdate(&a, outbuf + ivsize, &outlen, plaintext, plaintextlen); -- EVP_EncryptFinal_ex(&a, outbuf + ivsize + outlen, &extralen); -- EVP_CIPHER_CTX_cleanup(&a); -+ EVP_EncryptInit_ex(a, type, NULL, NULL, iv); -+ EVP_CIPHER_CTX_set_key_length(a, passwdlen); -+ EVP_EncryptInit_ex(a, NULL, NULL, passwd, NULL); -+ EVP_EncryptUpdate(a, outbuf + ivsize, &outlen, plaintext, plaintextlen); -+ EVP_EncryptFinal_ex(a, outbuf + ivsize + outlen, &extralen); -+ EVP_CIPHER_CTX_cleanup(a); -+ EVP_CIPHER_CTX_free(a); - outlen += extralen; - - ERR_load_crypto_strings(); |