[svn-upgrade] Integrating new upstream version, strongswan (4.2.12)

6 files changed, 21 insertions, 11 deletions

diff --git a/src/libstrongswan/crypto/crypters/crypter.c b/src/libstrongswan/crypto/crypters/crypter.c
index 2c291a9f5..13ba9c6e2 100644
--- a/src/libstrongswan/crypto/crypters/crypter.c
+++ b/src/libstrongswan/crypto/crypters/crypter.c
@@ -13,7 +13,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * $Id: crypter.c 3971 2008-05-16 13:27:21Z tobias $
+ * $Id: crypter.c 4880 2009-02-18 19:45:46Z tobias $
  */
 
 #include "crypter.h"
@@ -41,5 +41,7 @@ ENUM_NEXT(encryption_algorithm_names, ENCR_AES_GCM_ICV8, ENCR_AES_GCM_ICV16, ENC
 	"AES_GCM_8",
 	"AES_GCM_12",
 	"AES_GCM_16");
-ENUM_END(encryption_algorithm_names, ENCR_AES_GCM_ICV16);
+ENUM_NEXT(encryption_algorithm_names, ENCR_DES_ECB, ENCR_DES_ECB, ENCR_AES_GCM_ICV16,
+	"DES_ECB");
+ENUM_END(encryption_algorithm_names, ENCR_DES_ECB);
 
diff --git a/src/libstrongswan/crypto/crypters/crypter.h b/src/libstrongswan/crypto/crypters/crypter.h
index fb06af97d..1a70bd125 100644
--- a/src/libstrongswan/crypto/crypters/crypter.h
+++ b/src/libstrongswan/crypto/crypters/crypter.h
@@ -13,7 +13,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * $Id: crypter.h 4532 2008-10-30 13:21:21Z martin $
+ * $Id: crypter.h 4886 2009-02-19 13:46:08Z tobias $
  */
  
 /**
@@ -51,7 +51,8 @@ enum encryption_algorithm_t {
     ENCR_AES_CCM_ICV16 = 16,
     ENCR_AES_GCM_ICV8 = 18,
     ENCR_AES_GCM_ICV12 = 19,
-    ENCR_AES_GCM_ICV16 = 20
+    ENCR_AES_GCM_ICV16 = 20,
+    ENCR_DES_ECB = 1025
 };
 
 /**
diff --git a/src/libstrongswan/crypto/diffie_hellman.c b/src/libstrongswan/crypto/diffie_hellman.c
index 02d2cb52a..53c3a1632 100644
--- a/src/libstrongswan/crypto/diffie_hellman.c
+++ b/src/libstrongswan/crypto/diffie_hellman.c
@@ -13,7 +13,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * $Id: diffie_hellman.c 4023 2008-05-29 06:55:03Z andreas $
+ * $Id: diffie_hellman.c 4685 2008-11-22 16:14:55Z martin $
  */
 
 #include "diffie_hellman.h"
@@ -36,5 +36,7 @@ ENUM_NEXT(diffie_hellman_group_names, MODP_2048_BIT, ECP_521_BIT, MODP_1536_BIT,
 ENUM_NEXT(diffie_hellman_group_names, ECP_192_BIT, ECP_224_BIT, ECP_521_BIT,
 	"ECP_192_BIT",
 	"ECP_224_BIT");
-ENUM_END(diffie_hellman_group_names, ECP_224_BIT);
+ENUM_NEXT(diffie_hellman_group_names, MODP_NULL, MODP_NULL, ECP_224_BIT,
+	"MODP_NULL");
+ENUM_END(diffie_hellman_group_names, MODP_NULL);
 
diff --git a/src/libstrongswan/crypto/diffie_hellman.h b/src/libstrongswan/crypto/diffie_hellman.h
index ce8ab8e21..4147d85af 100644
--- a/src/libstrongswan/crypto/diffie_hellman.h
+++ b/src/libstrongswan/crypto/diffie_hellman.h
@@ -13,7 +13,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * $Id: diffie_hellman.h 4566 2008-11-04 13:12:11Z martin $
+ * $Id: diffie_hellman.h 4685 2008-11-22 16:14:55Z martin $
  */
  
 /**
@@ -52,6 +52,8 @@ enum diffie_hellman_group_t {
 	ECP_521_BIT   = 21,
 	ECP_192_BIT   = 25,
 	ECP_224_BIT   = 26,
+	/** insecure NULL diffie hellman group for testing, in PRIVATE USE */
+	MODP_NULL = 1024,
 };
 
 /**
diff --git a/src/libstrongswan/crypto/hashers/hasher.c b/src/libstrongswan/crypto/hashers/hasher.c
index 6c29d1d5d..cf507442d 100644
--- a/src/libstrongswan/crypto/hashers/hasher.c
+++ b/src/libstrongswan/crypto/hashers/hasher.c
@@ -14,14 +14,14 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * $Id: hasher.c 3619 2008-03-19 14:02:52Z martin $
+ * $Id: hasher.c 4880 2009-02-18 19:45:46Z tobias $
  */
 
 #include "hasher.h"
 
 #include <asn1/oid.h>
 
-ENUM(hash_algorithm_names, HASH_UNKNOWN, HASH_SHA512,
+ENUM(hash_algorithm_names, HASH_UNKNOWN, HASH_MD4,
 	"HASH_UNKNOWN",
 	"HASH_PREFERRED",
 	"HASH_MD2",
@@ -29,7 +29,8 @@ ENUM(hash_algorithm_names, HASH_UNKNOWN, HASH_SHA512,
 	"HASH_SHA1",
 	"HASH_SHA256",
 	"HASH_SHA384",
-	"HASH_SHA512"
+	"HASH_SHA512",
+	"HASH_MD4"
 );
 
 /*
diff --git a/src/libstrongswan/crypto/hashers/hasher.h b/src/libstrongswan/crypto/hashers/hasher.h
index e19b0318b..fe2f48be6 100644
--- a/src/libstrongswan/crypto/hashers/hasher.h
+++ b/src/libstrongswan/crypto/hashers/hasher.h
@@ -14,7 +14,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * $Id: hasher.h 3619 2008-03-19 14:02:52Z martin $
+ * $Id: hasher.h 4880 2009-02-18 19:45:46Z tobias $
  */
  
 /**
@@ -44,9 +44,11 @@ enum hash_algorithm_t {
 	HASH_SHA256 		= 5,
 	HASH_SHA384 		= 6,
 	HASH_SHA512 		= 7,
+	HASH_MD4			= 8,
 };
 
 #define HASH_SIZE_MD2		16
+#define HASH_SIZE_MD4		16
 #define HASH_SIZE_MD5		16
 #define HASH_SIZE_SHA1		20
 #define HASH_SIZE_SHA256	32