mirror of
git://slackware.nl/current.git
synced 2024-12-27 09:59:16 +01:00
646a5c1cbf
a/pkgtools-15.0-noarch-13.txz: Rebuilt. installpkg: default line length for --terselength is the number of columns. removepkg: added --terse mode. upgradepkg: default line length for --terselength is the number of columns. upgradepkg: accept -option in addition to --option. ap/vim-8.1.0026-x86_64-1.txz: Upgraded. d/bison-3.0.5-x86_64-1.txz: Upgraded. e/emacs-26.1-x86_64-1.txz: Upgraded. kde/kopete-4.14.3-x86_64-8.txz: Rebuilt. Recompiled against libidn-1.35. n/conntrack-tools-1.4.5-x86_64-1.txz: Upgraded. n/libnetfilter_conntrack-1.0.7-x86_64-1.txz: Upgraded. n/libnftnl-1.1.0-x86_64-1.txz: Upgraded. n/links-2.16-x86_64-2.txz: Rebuilt. Rebuilt to enable X driver for -g mode. n/lynx-2.8.9dev.19-x86_64-1.txz: Upgraded. n/nftables-0.8.5-x86_64-1.txz: Upgraded. n/p11-kit-0.23.11-x86_64-1.txz: Upgraded. n/ulogd-2.0.7-x86_64-1.txz: Upgraded. n/whois-5.3.1-x86_64-1.txz: Upgraded. xap/network-manager-applet-1.8.12-x86_64-1.txz: Upgraded. xap/vim-gvim-8.1.0026-x86_64-1.txz: Upgraded.
77 lines
2.8 KiB
Diff
77 lines
2.8 KiB
Diff
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();
|