From a6f902baed7abb17a1a9c014e01bb100077f8198 Mon Sep 17 00:00:00 2001
From: Rene Mayrhofer <rene@mayrhofer.eu.org>
Date: Sun, 1 Mar 2009 10:48:08 +0000
Subject: - Updated to new upstream revision.

---
 src/charon/config/proposal.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'src/charon/config/proposal.c')

diff --git a/src/charon/config/proposal.c b/src/charon/config/proposal.c
index 202dc913a..8fcbdc960 100644
--- a/src/charon/config/proposal.c
+++ b/src/charon/config/proposal.c
@@ -13,7 +13,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * $Id: proposal.c 4635 2008-11-12 08:27:48Z martin $
+ * $Id: proposal.c 4685 2008-11-22 16:14:55Z martin $
  */
 
 #include <string.h>
@@ -739,6 +739,10 @@ static status_t add_string_algo(private_proposal_t *this, chunk_t alg)
 			add_algorithm(this, PSEUDO_RANDOM_FUNCTION, PRF_AES128_XCBC, 0);
 		}
 	}
+	else if (strncmp(alg.ptr, "modpnull", alg.len) == 0)
+	{
+		add_algorithm(this, DIFFIE_HELLMAN_GROUP, MODP_NULL, 0);
+	}
 	else if (strncmp(alg.ptr, "modp768", alg.len) == 0)
 	{
 		add_algorithm(this, DIFFIE_HELLMAN_GROUP, MODP_768_BIT, 0);
@@ -1030,6 +1034,9 @@ static void proposal_add_supported_ike(private_proposal_t *this)
 	{
 		switch (group)
 		{
+			case MODP_NULL:
+				/* only for testing purposes */
+				break;
 			case MODP_768_BIT:
 				/* weak */
 				break;
-- 
cgit v1.2.3