Index: head/irc/epic5/Makefile =================================================================== --- head/irc/epic5/Makefile (revision 486013) +++ head/irc/epic5/Makefile (revision 486014) @@ -1,43 +1,44 @@ # Created by: Josh Paetzel # $FreeBSD$ PORTNAME= epic5 PORTVERSION= 2.0.1 +PORTREVISION= 1 CATEGORIES= irc ipv6 MASTER_SITES= http://ftp.epicsol.org/pub/epic/EPIC5-PRODUCTION/ MAINTAINER= mp39590@gmail.com COMMENT= Enhanced Programmable IRC-II Client LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYRIGHT GNU_CONFIGURE= yes PLIST_SUB+= PORTVERSION=${PORTVERSION} CFLAGS:= ${CFLAGS:C/-O2/-O/g} OPTIONS_DEFINE= DOCS PERL RUBY TCL CONFIGURE_ARGS+=--with-iconv=${ICONV_PREFIX} USES= iconv libarchive ncurses ssl tar:xz PERL_USES= perl5 PERL_CONFIGURE_WITH= perl RUBY_USE= ruby=yes RUBY_CONFIGURE_WITH= ruby TCL_USES= tcl TCL_CONFIGURE_ON= --with-tcl=${TCL_LIBDIR}/tclConfig.sh post-patch: @${REINPLACE_CMD} -e 's|-lcurses|-lncurses|' ${WRKSRC}/configure post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/epic5-${PORTVERSION} ${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/epic5-wserv4 ${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in BUG_FORM EPIC4-USERS-README FILES KNOWNBUGS README README-CRYPTO UPDATES WISHLIST ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR} .endfor (cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}) .include Index: head/irc/epic5/files/patch-source_crypto.c =================================================================== --- head/irc/epic5/files/patch-source_crypto.c (nonexistent) +++ head/irc/epic5/files/patch-source_crypto.c (revision 486014) @@ -0,0 +1,84 @@ +--- 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(); Property changes on: head/irc/epic5/files/patch-source_crypto.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property