X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=lib%2Fsilcske%2Fgroups.c;h=992779123a54c0f85663fa53b216738d02fd26cb;hb=40f8443d8d3a6577336ee66d18e04d9ac4d956bb;hp=20cba0c01ea3f61c9a703d45a55de11d67651d34;hpb=ae81323a6c29c176f6dd235aea5f6ce4b42263ea;p=silc.git

diff --git a/lib/silcske/groups.c b/lib/silcske/groups.c
index 20cba0c0..99277912 100644
--- a/lib/silcske/groups.c
+++ b/lib/silcske/groups.c
@@ -2,14 +2,13 @@
 
   groups.c
 
-  Author: Pekka Riikonen <priikone@poseidon.pspt.fi>
+  Author: Pekka Riikonen <priikone@silcnet.org>
 
-  Copyright (C) 2000 Pekka Riikonen
+  Copyright (C) 2000 - 2001 Pekka Riikonen
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
+  the Free Software Foundation; version 2 of the License.
   
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,7 +18,7 @@
 */
 /* $Id$ */
 
-#include "silcincludes.h"
+#include "silc.h"
 #include "groups_internal.h"
 
 /* Fixed and public Diffie Hellman Groups defined by the SKE
@@ -29,25 +28,25 @@ const struct SilcSKEDiffieHellmanGroupDefStruct silc_ske_groups[] =
 {
   /* 1024 bits modulus (Mandatory group) */
   { 1, "diffie-hellman-group1",
-    "0x"
+
     "FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD1"
     "29024E088A67CC74020BBEA63B139B22514A08798E3404DD"
     "EF9519B3CD3A431B302B0A6DF25F14374FE1356D6D51C245"
     "E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7ED"
     "EE386BFB5A899FA5AE9F24117C4B1FE649286651ECE65381"
     "FFFFFFFFFFFFFFFF",
-    "0x"
+
     "7FFFFFFFFFFFFFFFE487ED5110B4611A62633145C06E0E68"
     "948127044533E63A0105DF531D89CD9128A5043CC71A026E"
     "F7CA8CD9E69D218D98158536F92F8A1BA7F09AB6B6A8E122"
     "F242DABB312F3F637A262174D31BF6B585FFAE5B7A035BF6"
     "F71C35FDAD44CFD2D74F9208BE258FF324943328F67329C0"
     "FFFFFFFFFFFFFFFF",
-    "0x2" },
+    "2" },
 
   /* 1536 bits modulus (Optional group) */
   { 2, "diffie-hellman-group2",
-    "0x"
+
     "FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD1"
     "29024E088A67CC74020BBEA63B139B22514A08798E3404DD"
     "EF9519B3CD3A431B302B0A6DF25F14374FE1356D6D51C245"
@@ -56,7 +55,7 @@ const struct SilcSKEDiffieHellmanGroupDefStruct silc_ske_groups[] =
     "C2007CB8A163BF0598DA48361C55D39A69163FA8FD24CF5F"
     "83655D23DCA3AD961C62F356208552BB9ED529077096966D"
     "670C354E4ABC9804F1746C08CA237327FFFFFFFFFFFFFFFF",
-    "0x"
+
     "7FFFFFFFFFFFFFFFE487ED5110B4611A62633145C06E0E68"
     "948127044533E63A0105DF531D89CD9128A5043CC71A026E"
     "F7CA8CD9E69D218D98158536F92F8A1BA7F09AB6B6A8E122"
@@ -65,14 +64,14 @@ const struct SilcSKEDiffieHellmanGroupDefStruct silc_ske_groups[] =
     "E1003E5C50B1DF82CC6D241B0E2AE9CD348B1FD47E9267AF"
     "C1B2AE91EE51D6CB0E3179AB1042A95DCF6A9483B84B4B36"
     "B3861AA7255E4C0278BA36046511B993FFFFFFFFFFFFFFFF",
-    "0x2" },
+    "2" },
 
   { 0, NULL, NULL, NULL }
 };
 
 /* Returns Diffie Hellman group by group number */
 
-SilcSKEStatus silc_ske_get_group_by_number(int number,
+SilcSKEStatus silc_ske_group_get_by_number(int number,
 					   SilcSKEDiffieHellmanGroup *ret)
 {
   int i;
@@ -83,8 +82,10 @@ SilcSKEStatus silc_ske_get_group_by_number(int number,
       break;
   }
 
-  if (silc_ske_groups[i].name == NULL)
+  if (silc_ske_groups[i].name == NULL) {
+    SILC_LOG_ERROR(("Unsupported Diffie-Hellman group number %d", number));
     return SILC_SKE_STATUS_UNKNOWN_GROUP;
+  }
 
   /* Return the group */
   if (ret) {
@@ -106,7 +107,7 @@ SilcSKEStatus silc_ske_get_group_by_number(int number,
 
 /* Returns Diffie Hellman group by name */
 
-SilcSKEStatus silc_ske_get_group_by_name(const char *name,
+SilcSKEStatus silc_ske_group_get_by_name(const char *name,
 					 SilcSKEDiffieHellmanGroup *ret)
 {
   int i;
@@ -117,8 +118,10 @@ SilcSKEStatus silc_ske_get_group_by_name(const char *name,
       break;
   }
 
-  if (silc_ske_groups[i].name == NULL)
+  if (silc_ske_groups[i].name == NULL) {
+    SILC_LOG_ERROR(("Unsupported Diffie-Hellman group `%s'", name));
     return SILC_SKE_STATUS_UNKNOWN_GROUP;
+  }
 
   /* Return the group */
   if (ret) {
@@ -138,6 +141,16 @@ SilcSKEStatus silc_ske_get_group_by_name(const char *name,
   return SILC_SKE_STATUS_OK;
 }
 
+/* Free group */
+
+void silc_ske_group_free(SilcSKEDiffieHellmanGroup group)
+{
+  silc_mp_uninit(&group->group);
+  silc_mp_uninit(&group->group_order);
+  silc_mp_uninit(&group->generator);
+  silc_free(group);
+}
+
 /* Returns comma separated list of supported groups */
 
 char *silc_ske_get_supported_groups()
@@ -167,3 +180,10 @@ int silc_ske_group_get_number(SilcSKEDiffieHellmanGroup group)
 {
   return group->number;
 }
+
+/* Returns the name of the `group'. */
+
+const char *silc_ske_group_get_name(SilcSKEDiffieHellmanGroup group)
+{
+  return group->name;
+}