- update from 2.0.1 to 2.1.1
This commit is contained in:
Mikhail Pchelin
parent
cf9019161e
commit
57b5bda878
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=495915
4 changed files with 25 additions and 105 deletions
|
|
@ -2,8 +2,7 @@
|
|||
# $FreeBSD$
|
||||
|
||||
PORTNAME= epic5
|
||||
PORTVERSION= 2.0.1
|
||||
PORTREVISION= 1
|
||||
PORTVERSION= 2.1.1
|
||||
CATEGORIES= irc ipv6
|
||||
MASTER_SITES= http://ftp.epicsol.org/pub/epic/EPIC5-PRODUCTION/
|
||||
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
TIMESTAMP = 1470511709
|
||||
SHA256 (epic5-2.0.1.tar.xz) = 55260fc832c76f7a4975bde2bd0d0805fd8012fc8908ac94ec8c6de24a1be7aa
|
||||
SIZE (epic5-2.0.1.tar.xz) = 808612
|
||||
TIMESTAMP = 1552750901
|
||||
SHA256 (epic5-2.1.1.tar.xz) = 81e18b5f6aa32c5c4b5d01d4cd94e3124b538e3ba42cf7dbb74a6f1f5081f9df
|
||||
SIZE (epic5-2.1.1.tar.xz) = 844992
|
||||
|
|
|
|||
|
|
@ -1,84 +0,0 @@
|
|||
--- source/crypto.c.orig 2016-08-05 20:49:07 UTC
|
||||
+++ source/crypto.c
|
||||
@@ -282,28 +282,33 @@ static char * decipher_evp (const unsigned char *passw
|
||||
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 *context = EVP_CIPHER_CTX_new();
|
||||
|
||||
+ if(context == NULL) {
|
||||
+ yell("ERROR: Could not generate cipher context");
|
||||
+ return NULL;
|
||||
+ }
|
||||
+
|
||||
+ EVP_CIPHER_CTX_set_padding(context, 0);
|
||||
+
|
||||
if (ivsize > 0)
|
||||
iv = new_malloc(ivsize);
|
||||
outbuf = new_malloc(cipherlen + 1024);
|
||||
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(context, type, NULL, NULL, iv);
|
||||
+ EVP_CIPHER_CTX_set_key_length(context, passwdlen);
|
||||
+ EVP_CIPHER_CTX_set_padding(context, 0);
|
||||
+ EVP_DecryptInit_ex(context, NULL, NULL, passwd, NULL);
|
||||
|
||||
- if (EVP_DecryptUpdate(&a, outbuf, outlen, ciphertext, cipherlen) != 1)
|
||||
+ if (EVP_DecryptUpdate(context, outbuf, outlen, ciphertext, cipherlen) != 1)
|
||||
yell("EVP_DecryptUpdate died.");
|
||||
- if (EVP_DecryptFinal_ex(&a, outbuf + (*outlen), &outlen2) != 1)
|
||||
+ if (EVP_DecryptFinal_ex(context, outbuf + (*outlen), &outlen2) != 1)
|
||||
yell("EVP_DecryptFinal_Ex died.");
|
||||
*outlen += outlen2;
|
||||
|
||||
- EVP_CIPHER_CTX_cleanup(&a);
|
||||
+ EVP_CIPHER_CTX_free(context);
|
||||
|
||||
ERR_load_crypto_strings();
|
||||
while ((errcode = ERR_get_error()))
|
||||
@@ -454,10 +459,15 @@ static char * cipher_evp (const unsigned char *passwd,
|
||||
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 *context = EVP_CIPHER_CTX_new();
|
||||
|
||||
+ if(context == NULL) {
|
||||
+ yell("ERROR: Could not generate cipher context");
|
||||
+ return NULL;
|
||||
+ }
|
||||
+
|
||||
+ EVP_CIPHER_CTX_set_padding(context, 0);
|
||||
+
|
||||
if (ivsize < 0)
|
||||
ivsize = 0; /* Shenanigans! */
|
||||
|
||||
@@ -480,12 +490,12 @@ static char * cipher_evp (const unsigned char *passwd,
|
||||
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(context, type, NULL, NULL, iv);
|
||||
+ EVP_CIPHER_CTX_set_key_length(context, passwdlen);
|
||||
+ EVP_EncryptInit_ex(context, NULL, NULL, passwd, NULL);
|
||||
+ EVP_EncryptUpdate(context, outbuf + ivsize, &outlen, plaintext, plaintextlen);
|
||||
+ EVP_EncryptFinal_ex(context, outbuf + ivsize + outlen, &extralen);
|
||||
+ EVP_CIPHER_CTX_free(context);
|
||||
outlen += extralen;
|
||||
|
||||
ERR_load_crypto_strings();
|
||||
|
|
@ -2,39 +2,40 @@ bin/epic5
|
|||
bin/epic5-%%PORTVERSION%%
|
||||
libexec/epic5-wserv4
|
||||
man/man1/epic5.1.gz
|
||||
%%PORTDOCS%%%%DOCSDIR%%/antiflooding
|
||||
%%PORTDOCS%%%%DOCSDIR%%/BUG_FORM
|
||||
%%PORTDOCS%%%%DOCSDIR%%/colors
|
||||
%%PORTDOCS%%%%DOCSDIR%%/DCC_REVERSE
|
||||
%%PORTDOCS%%%%DOCSDIR%%/EPIC4-USERS-README
|
||||
%%PORTDOCS%%%%DOCSDIR%%/dccresum.txt
|
||||
%%PORTDOCS%%%%DOCSDIR%%/entry_points
|
||||
%%PORTDOCS%%%%DOCSDIR%%/EPIC_ABOUT
|
||||
%%PORTDOCS%%%%DOCSDIR%%/EPIC_THANKS
|
||||
%%PORTDOCS%%%%DOCSDIR%%/EPIC_VERSIONS
|
||||
%%PORTDOCS%%%%DOCSDIR%%/FILES
|
||||
%%PORTDOCS%%%%DOCSDIR%%/IPV6
|
||||
%%PORTDOCS%%%%DOCSDIR%%/IRCII_VERSIONS
|
||||
%%PORTDOCS%%%%DOCSDIR%%/KNOWNBUGS
|
||||
%%PORTDOCS%%%%DOCSDIR%%/README
|
||||
%%PORTDOCS%%%%DOCSDIR%%/README-CRYPTO
|
||||
%%PORTDOCS%%%%DOCSDIR%%/README.SSL
|
||||
%%PORTDOCS%%%%DOCSDIR%%/SILLINESS
|
||||
%%PORTDOCS%%%%DOCSDIR%%/TS4
|
||||
%%PORTDOCS%%%%DOCSDIR%%/UPDATES
|
||||
%%PORTDOCS%%%%DOCSDIR%%/WISHLIST
|
||||
%%PORTDOCS%%%%DOCSDIR%%/antiflooding
|
||||
%%PORTDOCS%%%%DOCSDIR%%/colors
|
||||
%%PORTDOCS%%%%DOCSDIR%%/dccresum.txt
|
||||
%%PORTDOCS%%%%DOCSDIR%%/entry_points
|
||||
%%PORTDOCS%%%%DOCSDIR%%/epic.1
|
||||
%%PORTDOCS%%%%DOCSDIR%%/EPIC4-USERS-README
|
||||
%%PORTDOCS%%%%DOCSDIR%%/epic5.1
|
||||
%%PORTDOCS%%%%DOCSDIR%%/expansions
|
||||
%%PORTDOCS%%%%DOCSDIR%%/FILES
|
||||
%%PORTDOCS%%%%DOCSDIR%%/fish
|
||||
%%PORTDOCS%%%%DOCSDIR%%/IPV6
|
||||
%%PORTDOCS%%%%DOCSDIR%%/IRCII_VERSIONS
|
||||
%%PORTDOCS%%%%DOCSDIR%%/keys
|
||||
%%PORTDOCS%%%%DOCSDIR%%/KNOWNBUGS
|
||||
%%PORTDOCS%%%%DOCSDIR%%/missing
|
||||
%%PORTDOCS%%%%DOCSDIR%%/nicknames
|
||||
%%PORTDOCS%%%%DOCSDIR%%/outputhelp
|
||||
%%PORTDOCS%%%%DOCSDIR%%/pf-loader
|
||||
%%PORTDOCS%%%%DOCSDIR%%/python
|
||||
%%PORTDOCS%%%%DOCSDIR%%/README
|
||||
%%PORTDOCS%%%%DOCSDIR%%/README-CRYPTO
|
||||
%%PORTDOCS%%%%DOCSDIR%%/README.SSL
|
||||
%%PORTDOCS%%%%DOCSDIR%%/scrollind
|
||||
%%PORTDOCS%%%%DOCSDIR%%/SILLINESS
|
||||
%%PORTDOCS%%%%DOCSDIR%%/TS4
|
||||
%%PORTDOCS%%%%DOCSDIR%%/UPDATES
|
||||
%%PORTDOCS%%%%DOCSDIR%%/utf8
|
||||
%%PORTDOCS%%%%DOCSDIR%%/what-needs-rewriting
|
||||
%%PORTDOCS%%%%DOCSDIR%%/WISHLIST
|
||||
%%PORTDOCS%%%%DOCSDIR%%/word-lists
|
||||
%%PORTDOCS%%%%DOCSDIR%%/word-support
|
||||
%%DATADIR%%/script/2.8script
|
||||
|
|
@ -51,6 +52,7 @@ man/man1/epic5.1.gz
|
|||
%%DATADIR%%/script/chanmonitor
|
||||
%%DATADIR%%/script/commandqueues
|
||||
%%DATADIR%%/script/country
|
||||
%%DATADIR%%/script/ctcp
|
||||
%%DATADIR%%/script/cycle
|
||||
%%DATADIR%%/script/data_array
|
||||
%%DATADIR%%/script/data_struct
|
||||
|
|
@ -60,6 +62,7 @@ man/man1/epic5.1.gz
|
|||
%%DATADIR%%/script/edit_topic
|
||||
%%DATADIR%%/script/epic-crypt-gpg
|
||||
%%DATADIR%%/script/epic-crypt-gpg-aa
|
||||
%%DATADIR%%/script/epic.py
|
||||
%%DATADIR%%/script/files
|
||||
%%DATADIR%%/script/find_ssl_root_certs
|
||||
%%DATADIR%%/script/floodprot
|
||||
|
|
@ -97,6 +100,7 @@ man/man1/epic5.1.gz
|
|||
%%DATADIR%%/script/notify
|
||||
%%DATADIR%%/script/paste
|
||||
%%DATADIR%%/script/pipe
|
||||
%%DATADIR%%/script/python
|
||||
%%DATADIR%%/script/reconnect
|
||||
%%DATADIR%%/script/rejoin
|
||||
%%DATADIR%%/script/renumber
|
||||
|
|
@ -108,6 +112,7 @@ man/man1/epic5.1.gz
|
|||
%%DATADIR%%/script/screen.e
|
||||
%%DATADIR%%/script/set_color
|
||||
%%DATADIR%%/script/setmail
|
||||
%%DATADIR%%/script/shorturl.irc
|
||||
%%DATADIR%%/script/slowcat
|
||||
%%DATADIR%%/script/snip
|
||||
%%DATADIR%%/script/speak.irc
|
||||
|
|
|
|||
Loading…
Reference in a new issue