diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-03-31 20:20:09 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-03-31 20:20:09 +0200 |
| commit | c2bd3a43342e37a05a97e12581dd2bd52993877a (patch) | |
| tree | 39f9427d581669d8f619b4df44c5c5548c8fd955 /package/ipsec-tools/patches/patch-src_racoon_crypto_openssl_c | |
| parent | ac46bdeef28bc2b65e1880884a79257c28e423a7 (diff) | |
Revert "fix conflict, autoseect libgcj"
This reverts commit ac46bdeef28bc2b65e1880884a79257c28e423a7, reversing
changes made to 418fb3668f7140cc3e2ba07c354fe0d9bbb47d04.
Diffstat (limited to 'package/ipsec-tools/patches/patch-src_racoon_crypto_openssl_c')
| -rw-r--r-- | package/ipsec-tools/patches/patch-src_racoon_crypto_openssl_c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/package/ipsec-tools/patches/patch-src_racoon_crypto_openssl_c b/package/ipsec-tools/patches/patch-src_racoon_crypto_openssl_c index cc10bca3b..76c6a62cc 100644 --- a/package/ipsec-tools/patches/patch-src_racoon_crypto_openssl_c +++ b/package/ipsec-tools/patches/patch-src_racoon_crypto_openssl_c @@ -1,5 +1,6 @@ ---- ipsec-tools-0.8.0.orig/src/racoon/crypto_openssl.c 2010-10-20 15:40:02.000000000 +0200 -+++ ipsec-tools-0.8.0/src/racoon/crypto_openssl.c 2011-03-31 13:22:18.821818767 +0200 +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- ipsec-tools-0.7.2.orig/src/racoon/crypto_openssl.c 2009-04-20 15:33:30.000000000 +0200 ++++ ipsec-tools-0.7.2/src/racoon/crypto_openssl.c 2009-05-29 15:31:04.728378359 +0200 @@ -63,8 +63,12 @@ #ifdef HAVE_OPENSSL_ENGINE_H #include <openssl/engine.h> @@ -13,7 +14,7 @@ #include <openssl/err.h> #ifdef HAVE_OPENSSL_RC5_H #include <openssl/rc5.h> -@@ -1405,6 +1409,7 @@ eay_idea_keylen(len) +@@ -1347,6 +1351,7 @@ eay_idea_keylen(len) } #endif @@ -21,7 +22,7 @@ /* * BLOWFISH-CBC */ -@@ -1439,6 +1444,7 @@ eay_bf_keylen(len) +@@ -1381,6 +1386,7 @@ eay_bf_keylen(len) return -1; return len; } @@ -29,7 +30,7 @@ #ifdef HAVE_OPENSSL_RC5_H /* -@@ -1550,6 +1556,7 @@ eay_3des_keylen(len) +@@ -1492,6 +1498,7 @@ eay_3des_keylen(len) return 192; } @@ -37,7 +38,7 @@ /* * CAST-CBC */ -@@ -1584,6 +1591,7 @@ eay_cast_keylen(len) +@@ -1526,6 +1533,7 @@ eay_cast_keylen(len) return -1; return len; } |