*** empty log message ***gnutls_0_4_with_new_dh_primes

12 files changed, 37 insertions, 32 deletions

diff --git a/lib/auth_anon.c b/lib/auth_anon.c
index 48741d5032..95571f8adb 100644
--- a/lib/auth_anon.c
+++ b/lib/auth_anon.c
@@ -27,7 +27,7 @@
 #include "gnutls_dh.h"
 #include "auth_anon.h"
 #include "gnutls_num.h"
-#include "gnutls_gcry.h"
+#include "gnutls_mpi.h"
 #include <gnutls_state.h>
 
 int gen_anon_server_kx( GNUTLS_STATE, opaque**);
diff --git a/lib/gnutls_anon_cred.c b/lib/gnutls_anon_cred.c
index 405dd6a4f7..9585642b2a 100644
--- a/lib/gnutls_anon_cred.c
+++ b/lib/gnutls_anon_cred.c
@@ -27,7 +27,7 @@
 #include "gnutls_auth_int.h"
 #include "gnutls_dh.h"
 #include "gnutls_num.h"
-#include "gnutls_gcry.h"
+#include "gnutls_mpi.h"
 
 static int anon_tmp;
 
diff --git a/lib/gnutls_cert.c b/lib/gnutls_cert.c
index 9d45e1cb5b..e624f01fff 100644
--- a/lib/gnutls_cert.c
+++ b/lib/gnutls_cert.c
@@ -25,7 +25,7 @@
 #include <x509_asn1.h>
 #include <x509_der.h>
 #include <gnutls_datum.h>
-#include <gnutls_gcry.h>
+#include <gnutls_mpi.h>
 #include <gnutls_global.h>
 #include <x509_verify.h>
 #include <gnutls_privkey.h>
diff --git a/lib/gnutls_dh.c b/lib/gnutls_dh.c
index 9788de7442..c747b342e9 100644
--- a/lib/gnutls_dh.c
+++ b/lib/gnutls_dh.c
@@ -21,7 +21,6 @@
 
 #include <gnutls_int.h>
 #include <gnutls_errors.h>
-#include <gnutls_gcry.h>
 
 
 /* 
diff --git a/lib/gnutls_dh_primes.c b/lib/gnutls_dh_primes.c
index 8e2a7f0a65..80821fa420 100644
--- a/lib/gnutls_dh_primes.c
+++ b/lib/gnutls_dh_primes.c
@@ -20,28 +20,34 @@
 
 #include <gnutls_int.h>
 #include <gnutls_errors.h>
-#include <gnutls_gcry.h>
 #include <gnutls_datum.h>
 #include "debug.h"
 
-static uint8 DH_G_1024[] = { 0x02 };
+static uint8 DH_G_1024[] = { 0x05 };
 static uint8 DH_G_4096[] = { 0x05 };
 static uint8 DH_G_2048[] = { 0x07 };
 static uint8 DH_G_3072[] = { 0x06 };
 
-static uint8 diffie_hellman_group1_prime[] = { 0x00, 0x04,
-	0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xC9, 0x0F,
-	0xDA, 0xA2, 0x21, 0x68, 0xC2, 0x34, 0xC4, 0xC6, 0x62, 0x8B, 0x80,
-	0xDC, 0x1C, 0xD1, 0x29, 0x02, 0x4E, 0x08, 0x8A, 0x67, 0xCC, 0x74,
-	0x02, 0x0B, 0xBE, 0xA6, 0x3B, 0x13, 0x9B, 0x22, 0x51, 0x4A, 0x08,
-	0x79, 0x8E, 0x34, 0x04, 0xDD, 0xEF, 0x95, 0x19, 0xB3, 0xCD, 0x3A,
-	0x43, 0x1B, 0x30, 0x2B, 0x0A, 0x6D, 0xF2, 0x5F, 0x14, 0x37, 0x4F,
-	0xE1, 0x35, 0x6D, 0x6D, 0x51, 0xC2, 0x45, 0xE4, 0x85, 0xB5, 0x76,
-	0x62, 0x5E, 0x7E, 0xC6, 0xF4, 0x4C, 0x42, 0xE9, 0xA6, 0x37, 0xED,
-	0x6B, 0x0B, 0xFF, 0x5C, 0xB6, 0xF4, 0x06, 0xB7, 0xED, 0xEE, 0x38,
-	0x6B, 0xFB, 0x5A, 0x89, 0x9F, 0xA5, 0xAE, 0x9F, 0x24, 0x11, 0x7C,
-	0x4B, 0x1F, 0xE6, 0x49, 0x28, 0x66, 0x51, 0xEC, 0xE6, 0x53, 0x81,
-	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF
+static uint8 diffie_hellman_prime_1024[128] = { 
+	0xe3, 0x79, 0xb5, 0xa7, 0x47, 0x4c, 0xfd, 
+	0x9c, 0x78, 0xfe, 0x17, 0x87, 0x44, 0xc4, 
+	0x86, 0x2b, 0x92, 0x13, 0x43, 0xf5, 0xac, 
+	0x72, 0xd2, 0xf1, 0x2a, 0xf5, 0x39, 0xa2, 
+	0x79, 0x01, 0xdd, 0x4c, 0x7e, 0x5b, 0xa0, 
+	0x19, 0x11, 0xd4, 0x2f, 0x0a, 0x92, 0x8d, 
+	0xfd, 0xde, 0x85, 0x93, 0x99, 0xad, 0xe0, 
+	0xd4, 0x0b, 0x62, 0xaa, 0x86, 0xa7, 0xd7, 
+	0x63, 0x2e, 0x35, 0x96, 0x88, 0xbe, 0x52, 
+	0x2e, 0x8c, 0x27, 0xf0, 0xe0, 0xa1, 0x0e, 
+	0xb7, 0xb9, 0xc8, 0xbd, 0x5d, 0xe8, 0xdb, 
+	0x63, 0xd8, 0xb4, 0xe7, 0x0d, 0xff, 0x0f, 
+	0x55, 0xe7, 0x27, 0x0d, 0xb7, 0x57, 0x33, 
+	0x30, 0xd6, 0xeb, 0x51, 0x99, 0x86, 0x17, 
+	0x5b, 0x48, 0xb3, 0x0c, 0xae, 0xbd, 0xa1, 
+	0x83, 0x6b, 0xbd, 0x9f, 0x83, 0x83, 0x2b, 
+	0x46, 0x3e, 0x18, 0xa4, 0x4d, 0x82, 0x95, 
+	0xa4, 0x08, 0xdd, 0x28, 0x0c, 0x4f, 0x93, 
+	0xfd, 0xd7
 };
 
 /* prime - 4096 bits */
@@ -227,11 +233,11 @@ static uint8 diffie_hellman_prime_2048[256] = {
  */
 _GNUTLS_DH_PARAMS _gnutls_dh_default_params[] = {
 	{768, NULL, NULL, {DH_G_1024, sizeof(DH_G_1024)}
-	 , {diffie_hellman_group1_prime, sizeof diffie_hellman_group1_prime}
-	 , 0, 160}
+	 , {diffie_hellman_prime_1024, sizeof diffie_hellman_prime_1024}
+	 , 0, 180}
 	,
 	{1024, NULL, NULL, {DH_G_1024, sizeof(DH_G_1024)}
-	 , {diffie_hellman_group1_prime, sizeof diffie_hellman_group1_prime}
+	 , {diffie_hellman_prime_1024, sizeof diffie_hellman_prime_1024}
 	 , 0, 180}
 	,
 	{2048, NULL, NULL, {DH_G_2048, sizeof(DH_G_2048)}
@@ -254,11 +260,11 @@ _GNUTLS_DH_PARAMS _gnutls_dh_default_params[] = {
 const 
 static _GNUTLS_DH_PARAMS _gnutls_dh_copy_params[] = {
 	{768, NULL, NULL, {DH_G_1024, sizeof(DH_G_1024)}
-	 , {diffie_hellman_group1_prime, sizeof diffie_hellman_group1_prime}
-	 , 0, 160}
+	 , {diffie_hellman_prime_1024, sizeof diffie_hellman_prime_1024}
+	 , 0, 180}
 	,
 	{1024, NULL, NULL, {DH_G_1024, sizeof(DH_G_1024)}
-	 , {diffie_hellman_group1_prime, sizeof diffie_hellman_group1_prime}
+	 , {diffie_hellman_prime_1024, sizeof diffie_hellman_prime_1024}
 	 , 0, 180}
 	,
 	{2048, NULL, NULL, {DH_G_2048, sizeof(DH_G_2048)}
diff --git a/lib/gnutls_kx.c b/lib/gnutls_kx.c
index 4ede709cd4..ba09d33b95 100644
--- a/lib/gnutls_kx.c
+++ b/lib/gnutls_kx.c
@@ -25,7 +25,7 @@
 #include "gnutls_errors.h"
 #include "gnutls_algorithms.h"
 #include "debug.h"
-#include "gnutls_gcry.h"
+#include "gnutls_mpi.h"
 #include <gnutls_state.h>
 #include <gnutls_datum.h>
 #include <gnutls_alert.h>
diff --git a/lib/gnutls_openpgp.c b/lib/gnutls_openpgp.c
index 059cac97a7..3f0eea3347 100644
--- a/lib/gnutls_openpgp.c
+++ b/lib/gnutls_openpgp.c
@@ -20,7 +20,7 @@
 
 #include "gnutls_int.h"
 #include "gnutls_errors.h"
-#include "gnutls_gcry.h"
+#include "gnutls_mpi.h"
 #include "gnutls_cert.h"
 #include "gnutls_datum.h"
 #include "gnutls_global.h"
diff --git a/lib/gnutls_pk.c b/lib/gnutls_pk.c
index 86bd020ebe..06adf25a58 100644
--- a/lib/gnutls_pk.c
+++ b/lib/gnutls_pk.c
@@ -22,7 +22,7 @@
  */
 
 #include <gnutls_int.h>
-#include <gnutls_gcry.h>
+#include <gnutls_mpi.h>
 #include <gnutls_pk.h>
 #include <gnutls_errors.h>
 #include <gnutls_random.h>
diff --git a/lib/gnutls_privkey.c b/lib/gnutls_privkey.c
index 5e6d31f192..e6982c9c90 100644
--- a/lib/gnutls_privkey.c
+++ b/lib/gnutls_privkey.c
@@ -27,7 +27,7 @@
 #include <x509_asn1.h>
 #include <x509_der.h>
 #include <gnutls_datum.h>
-#include <gnutls_gcry.h>
+#include <gnutls_mpi.h>
 #include <gnutls_global.h>
 
 void _gcry_mpi_invm( MPI x, MPI a, MPI n );
diff --git a/lib/gnutls_sig.c b/lib/gnutls_sig.c
index d3d9aa74a1..8a4ebd0d9a 100644
--- a/lib/gnutls_sig.c
+++ b/lib/gnutls_sig.c
@@ -26,7 +26,7 @@
 #include <x509_asn1.h>
 #include <x509_der.h>
 #include <gnutls_datum.h>
-#include <gnutls_gcry.h>
+#include <gnutls_mpi.h>
 #include <gnutls_privkey.h>
 #include <gnutls_global.h>
 #include <gnutls_pk.h>
diff --git a/lib/gnutls_srp.c b/lib/gnutls_srp.c
index f5ca3e7fd6..e4eb030ba3 100644
--- a/lib/gnutls_srp.c
+++ b/lib/gnutls_srp.c
@@ -28,7 +28,7 @@
 #include <gnutls_srp.h>
 #include <auth_srp_passwd.h>
 #include <crypt_bcrypt.h>
-#include <gnutls_gcry.h>
+#include <gnutls_mpi.h>
 #include "debug.h"
 
 
diff --git a/lib/x509_sig_check.c b/lib/x509_sig_check.c
index fe1d5b90e8..5abd8d36ee 100644
--- a/lib/x509_sig_check.c
+++ b/lib/x509_sig_check.c
@@ -26,7 +26,7 @@
 #include <x509_asn1.h>
 #include <x509_der.h>
 #include <gnutls_datum.h>
-#include <gnutls_gcry.h>
+#include <gnutls_mpi.h>
 #include <gnutls_privkey.h>
 #include <gnutls_global.h>
 #include <gnutls_pk.h>