[Astlinux-commits] SF.net SVN: astlinux: [1107] trunk/package/openvpn

[<kr...@us...>]

Revision: 1107
          http://svn.sourceforge.net/astlinux/?rev=1107&view=rev
Author:   krisk84
Date:     2007-06-27 15:38:06 -0700 (Wed, 27 Jun 2007)

Log Message:
-----------
openvpn padlock support

Modified Paths:
--------------
    trunk/package/openvpn/openvpn.mk

Added Paths:
-----------
    trunk/package/openvpn/padlock.patch

Modified: trunk/package/openvpn/openvpn.mk
===================================================================
--- trunk/package/openvpn/openvpn.mk	2007-06-27 20:54:00 UTC (rev 1106)
+++ trunk/package/openvpn/openvpn.mk	2007-06-27 22:38:06 UTC (rev 1107)
@@ -29,6 +29,10 @@
 
 $(OPENVPN_DIR)/.unpacked: $(DL_DIR)/$(OPENVPN_SOURCE)
 	$(OPENVPN_CAT) $(DL_DIR)/$(OPENVPN_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+ifeq ($(strip $(BR2_TARGET_VIA)),y)
+	toolchain/patch-kernel.sh $(OPENVPN_DIR) package/openvpn/ padlock\*.patch
+endif
+	toolchain/patch-kernel.sh $(OPENVPN_DIR) package/openvpn/ openvpn\*.patch
 	touch $(OPENVPN_DIR)/.unpacked
 
 $(OPENVPN_DIR)/.configured: $(OPENVPN_DIR)/.unpacked

Added: trunk/package/openvpn/padlock.patch
===================================================================
--- trunk/package/openvpn/padlock.patch	                        (rev 0)
+++ trunk/package/openvpn/padlock.patch	2007-06-27 22:38:06 UTC (rev 1107)
@@ -0,0 +1,48 @@
+diff -ur openvpn-2.0.9.orig/crypto.c openvpn-2.0.9/crypto.c
+--- openvpn-2.0.9.orig/crypto.c	2005-11-01 06:06:11.000000000 -0500
++++ openvpn-2.0.9/crypto.c	2007-06-27 18:31:01.000000000 -0400
+@@ -39,6 +39,8 @@
+ 
+ #include "memdbg.h"
+ 
++#include <openssl/engine.h>
++
+ /*
+  * Check for key size creepage.
+  */
+@@ -1709,6 +1711,12 @@
+ {
+   ERR_load_crypto_strings ();
+   OpenSSL_add_all_algorithms ();
++
++  /* Init available hardware crypto engines. */
++  ENGINE_load_builtin_engines();
++  ENGINE_register_all_complete();
++  ENGINE_set_default_ciphers(ENGINE_by_id("padlock"));
++
+   init_crypto_lib ();
+ }
+ 
+diff -ur openvpn-2.0.9.orig/ssl.c openvpn-2.0.9/ssl.c
+--- openvpn-2.0.9.orig/ssl.c	2005-12-13 12:10:01.000000000 -0500
++++ openvpn-2.0.9/ssl.c	2007-06-27 18:28:10.000000000 -0400
+@@ -52,6 +52,7 @@
+ #include "perf.h"
+ #include "status.h"
+ #include "gremlin.h"
++#include <openssl/engine.h>
+ 
+ #ifdef WIN32
+ #include "cryptoapi.h"
+@@ -225,6 +226,11 @@
+   SSL_load_error_strings ();
+   OpenSSL_add_all_algorithms ();
+ 
++  /* Init available hardware crypto engines. */
++  ENGINE_load_builtin_engines();
++  ENGINE_register_all_complete();
++  ENGINE_set_default_ciphers(ENGINE_by_id("padlock"));
++
+   init_crypto_lib();
+ 
+   /*


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.