irc/epic5: Fix OpenSSL 1.1.x build PR: 231931 Submitted by: Nathan Index: irc/epic5/Makefile =================================================================== --- irc/epic5/Makefile (revision 481499) +++ irc/epic5/Makefile (working copy) @@ -3,6 +3,7 @@ PORTNAME= epic5 PORTVERSION= 2.0.1 +PORTREVISION= 1 CATEGORIES= irc ipv6 MASTER_SITES= http://ftp.epicsol.org/pub/epic/EPIC5-PRODUCTION/ Index: irc/epic5/files/patch-source_crypto.c =================================================================== --- irc/epic5/files/patch-source_crypto.c (nonexistent) +++ irc/epic5/files/patch-source_crypto.c (working copy) @@ -0,0 +1,51 @@ +--- source/crypto.c.orig 2018-10-09 12:46:55 UTC ++++ source/crypto.c +@@ -282,9 +282,9 @@ 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 *a; ++ EVP_CIPHER_CTX_init(a); ++ EVP_CIPHER_CTX_set_padding(a, 0); + + if (ivsize > 0) + iv = new_malloc(ivsize); +@@ -292,18 +292,18 @@ static char * decipher_evp (const unsigned char *passw + if (ivsize > 0) + memcpy(iv, ciphertext, ivsize); + +- EVP_DecryptInit_ex(&a, type, NULL, NULL, iv); ++ 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_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); + + ERR_load_crypto_strings(); + while ((errcode = ERR_get_error())) +@@ -454,8 +454,8 @@ 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 *a; ++ EVP_CIPHER_CTX_init(a); + EVP_CIPHER_CTX_set_padding(&a, 0); + + if (ivsize < 0) Property changes on: 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