diff options
| author | Jimmy Olgeni <olgeni@FreeBSD.org> | 2003-06-01 17:01:10 +0000 |
|---|---|---|
| committer | Jimmy Olgeni <olgeni@FreeBSD.org> | 2003-06-01 17:01:10 +0000 |
| commit | 97415c87e231eec3d70046599874d50789adbfc7 (patch) | |
| tree | 2189f80cdce12373f9d0929b6e01a41f8df59981 /lang/erlang14 | |
| parent | Add a patch forgotten when commiting ports/52400. (diff) | |
Merge more crypto related fixes for recent OpenSSL versions.
Submitted by: Youki Kadobayashi <youki-k@is.aist-nara.ac.jp>
Notes
Notes:
svn path=/head/; revision=81913
Diffstat (limited to 'lang/erlang14')
| -rw-r--r-- | lang/erlang14/Makefile | 1 | ||||
| -rw-r--r-- | lang/erlang14/files/patch-lib_crypto_c__src_Makefile.in | 35 | ||||
| -rw-r--r-- | lang/erlang14/files/patch-lib_crypto_c__src_crypto__drv.c | 17 |
3 files changed, 51 insertions, 2 deletions
diff --git a/lang/erlang14/Makefile b/lang/erlang14/Makefile index efc4ad2e596f..c1fbfab28e78 100644 --- a/lang/erlang14/Makefile +++ b/lang/erlang14/Makefile @@ -7,6 +7,7 @@ PORTNAME= erlang PORTVERSION= 9.1 +PORTREVISION= 1 CATEGORIES= lang MASTER_SITES= ftp://ftp.erlang.org/pub/download/ \ http://www.erlang.org/download/ \ diff --git a/lang/erlang14/files/patch-lib_crypto_c__src_Makefile.in b/lang/erlang14/files/patch-lib_crypto_c__src_Makefile.in new file mode 100644 index 000000000000..deb146433712 --- /dev/null +++ b/lang/erlang14/files/patch-lib_crypto_c__src_Makefile.in @@ -0,0 +1,35 @@ + +$FreeBSD$ + +--- lib/crypto/c_src/Makefile.in.orig Sun Jun 1 17:57:42 2003 ++++ lib/crypto/c_src/Makefile.in Sun Jun 1 17:59:06 2003 +@@ -97,6 +97,21 @@ + -u _des_ncbc_encrypt \ + -u _des_ede3_cbc_encrypt + else ++ifeq ($(findstring freebsd,$(TARGET)),freebsd) ++ELIBCRYPTO_UNDEFS = \ ++ -u CRYPTO_set_mem_functions \ ++ -u MD5 \ ++ -u MD5_Init \ ++ -u MD5_Update \ ++ -u MD5_Final \ ++ -u SHA1 \ ++ -u SHA1_Init \ ++ -u SHA1_Update \ ++ -u SHA1_Final \ ++ -u _ossl_old_des_set_key \ ++ -u _ossl_old_des_ncbc_encrypt \ ++ -u _ossl_old_des_ede3_cbc_encrypt ++else + ELIBCRYPTO_UNDEFS = \ + -u CRYPTO_set_mem_functions \ + -u MD5 \ +@@ -110,6 +125,7 @@ + -u des_set_key \ + -u des_ncbc_encrypt \ + -u des_ede3_cbc_encrypt ++endif + endif + + # ---------------------------------------------------- diff --git a/lang/erlang14/files/patch-lib_crypto_c__src_crypto__drv.c b/lang/erlang14/files/patch-lib_crypto_c__src_crypto__drv.c index 70f2fe018613..b79cd54b3d5a 100644 --- a/lang/erlang14/files/patch-lib_crypto_c__src_crypto__drv.c +++ b/lang/erlang14/files/patch-lib_crypto_c__src_crypto__drv.c @@ -1,8 +1,8 @@ $FreeBSD$ ---- lib/crypto/c_src/crypto_drv.c.orig Thu Oct 21 15:37:08 1999 -+++ lib/crypto/c_src/crypto_drv.c Mon Mar 3 15:12:27 2003 +--- lib/crypto/c_src/crypto_drv.c.orig Sun Jun 1 18:15:54 2003 ++++ lib/crypto/c_src/crypto_drv.c Sun Jun 1 18:15:50 2003 @@ -29,6 +29,7 @@ #include <string.h> #include "erl_driver.h" @@ -11,3 +11,16 @@ $FreeBSD$ #include "des.h" #include "md5.h" #include "sha.h" +@@ -207,9 +208,9 @@ + cfs.SHA1_Init = driver_dl_sym(lib_handle, "SHA1_Init"); + cfs.SHA1_Update = driver_dl_sym(lib_handle, "SHA1_Update"); + cfs.SHA1_Final = driver_dl_sym(lib_handle, "SHA1_Final"); +- cfs.des_set_key = driver_dl_sym(lib_handle, "des_set_key"); +- cfs.des_ncbc_encrypt = driver_dl_sym(lib_handle, "des_ncbc_encrypt"); +- cfs.des_ede3_cbc_encrypt = driver_dl_sym(lib_handle, "des_ede3_cbc_encrypt"); ++ cfs.des_set_key = driver_dl_sym(lib_handle, "_ossl_old_des_set_key"); ++ cfs.des_ncbc_encrypt = driver_dl_sym(lib_handle, "_ossl_old_des_ncbc_encrypt"); ++ cfs.des_ede3_cbc_encrypt = driver_dl_sym(lib_handle, "_ossl_old_des_ede3_cbc_encrypt"); + + /* Check that all pointer where initialized */ + for (i = 0; i < sizeof(crypto_funcs)/sizeof(void*); i++) { |