curl-7.19.5: Fix for curl artifact 2825989
authorMarc Olzheim <marc@iphion.nl>
Mon, 10 Aug 2009 09:14:06 +0000 (11:14 +0200)
committerHolger Hans Peter Freyther <zecke@selfish.org>
Tue, 11 Aug 2009 01:34:30 +0000 (03:34 +0200)
Add curl-add_all_algorithms.patch to 7.19.5 recipe. Fixes curl artifact id 2825989
https://sourceforge.net/tracker/index.php?func=detail&aid=2825989&group_id=976&atid=100976

http://cool.haxx.se/cvs.cgi/curl/lib/ssluse.c#rev1.229
http://patchwork.openembedded.org/patch/928/

Signed-Off-By: Holger Hans Peter Freyther <zecke@selfish.org>
recipes/curl/curl_7.19.5.bb
recipes/curl/files/curl-add_all_algorithms.patch [new file with mode: 0644]

index df83fe8..b5b6182 100644 (file)
@@ -1,5 +1,6 @@
 require curl-common.inc
 require curl-target.inc
 
-SRC_URI += "file://off_t_abi_fix.patch;patch=1;pnum=0"
-PR = "r0"
+SRC_URI += "file://off_t_abi_fix.patch;patch=1;pnum=0 \
+            file://curl-add_all_algorithms.patch;patch=1"
+PR = "r1"
diff --git a/recipes/curl/files/curl-add_all_algorithms.patch b/recipes/curl/files/curl-add_all_algorithms.patch
new file mode 100644 (file)
index 0000000..a55af12
--- /dev/null
@@ -0,0 +1,22 @@
+--- curl-7.19.5/lib/ssluse.c   2009-01-26 15:36:22.000000000 +0100
++++ curl-7.19.5/lib/ssluse.c   2009-07-23 15:44:12.000000000 +0200
+@@ -58,6 +58,7 @@
+ #ifdef USE_SSLEAY
+ #ifdef USE_OPENSSL
++#include <openssl/evp.h>
+ #include <openssl/rand.h>
+ #include <openssl/x509v3.h>
+ #else
+@@ -627,6 +628,11 @@
+   /* Lets get nice error messages */
+   SSL_load_error_strings();
++#ifdef USE_OPENSSL
++  /* Load all algorithms (including SHA2) */
++  OpenSSL_add_all_algorithms();
++#endif /* USE_OPENSSL */
++
+   /* Setup all the global SSL stuff */
+   if(!SSLeay_add_ssl_algorithms())
+     return 0;