X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=lib%2Fsilcske%2Fgroups.c;h=992779123a54c0f85663fa53b216738d02fd26cb;hb=40f8443d8d3a6577336ee66d18e04d9ac4d956bb;hp=18d70c6c29027f6af6bdd1a4a13f26f4828e25a0;hpb=318d79b391bf6288e3e28c840217a7097f3d0392;p=silc.git diff --git a/lib/silcske/groups.c b/lib/silcske/groups.c index 18d70c6c..99277912 100644 --- a/lib/silcske/groups.c +++ b/lib/silcske/groups.c @@ -2,14 +2,13 @@ groups.c - Author: Pekka Riikonen + Author: Pekka Riikonen - 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 @@ -17,19 +16,9 @@ GNU General Public License for more details. */ -/* - * $Id$ - * $Log$ - * Revision 1.2 2000/07/05 06:05:15 priikone - * Global cosmetic change. - * - * Revision 1.1.1.1 2000/06/27 11:36:56 priikone - * Imported from internal CVS/Added Log headers. - * - * - */ - -#include "silcincludes.h" +/* $Id$ */ + +#include "silc.h" #include "groups_internal.h" /* Fixed and public Diffie Hellman Groups defined by the SKE @@ -39,50 +28,50 @@ const struct SilcSKEDiffieHellmanGroupDefStruct silc_ske_groups[] = { /* 1024 bits modulus (Mandatory group) */ { 1, "diffie-hellman-group1", - "0x" - "FFFFFFFF FFFFFFFF C90FDAA2 2168C234 C4C6628B 80DC1CD1" - "29024E08 8A67CC74 020BBEA6 3B139B22 514A0879 8E3404DD" - "EF9519B3 CD3A431B 302B0A6D F25F1437 4FE1356D 6D51C245" - "E485B576 625E7EC6 F44C42E9 A637ED6B 0BFF5CB6 F406B7ED" - "EE386BFB 5A899FA5 AE9F2411 7C4B1FE6 49286651 ECE65381" - "FFFFFFFF FFFFFFFF", - "0x" - "7FFFFFFF FFFFFFFF E487ED51 10B4611A 62633145 C06E0E68" - "94812704 4533E63A 0105DF53 1D89CD91 28A5043C C71A026E" - "F7CA8CD9 E69D218D 98158536 F92F8A1B A7F09AB6 B6A8E122" - "F242DABB 312F3F63 7A262174 D31BF6B5 85FFAE5B 7A035BF6" - "F71C35FD AD44CFD2 D74F9208 BE258FF3 24943328 F67329C0" - "FFFFFFFF FFFFFFFF", - "0x2" }, + + "FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD1" + "29024E088A67CC74020BBEA63B139B22514A08798E3404DD" + "EF9519B3CD3A431B302B0A6DF25F14374FE1356D6D51C245" + "E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7ED" + "EE386BFB5A899FA5AE9F24117C4B1FE649286651ECE65381" + "FFFFFFFFFFFFFFFF", + + "7FFFFFFFFFFFFFFFE487ED5110B4611A62633145C06E0E68" + "948127044533E63A0105DF531D89CD9128A5043CC71A026E" + "F7CA8CD9E69D218D98158536F92F8A1BA7F09AB6B6A8E122" + "F242DABB312F3F637A262174D31BF6B585FFAE5B7A035BF6" + "F71C35FDAD44CFD2D74F9208BE258FF324943328F67329C0" + "FFFFFFFFFFFFFFFF", + "2" }, /* 1536 bits modulus (Optional group) */ { 2, "diffie-hellman-group2", - "0x" - "FFFFFFFF FFFFFFFF C90FDAA2 2168C234 C4C6628B 80DC1CD1" - "29024E08 8A67CC74 020BBEA6 3B139B22 514A0879 8E3404DD" - "EF9519B3 CD3A431B 302B0A6D F25F1437 4FE1356D 6D51C245" - "E485B576 625E7EC6 F44C42E9 A637ED6B 0BFF5CB6 F406B7ED" - "EE386BFB 5A899FA5 AE9F2411 7C4B1FE6 49286651 ECE45B3D" - "C2007CB8 A163BF05 98DA4836 1C55D39A 69163FA8 FD24CF5F" - "83655D23 DCA3AD96 1C62F356 208552BB 9ED52907 7096966D" - "670C354E 4ABC9804 F1746C08 CA237327 FFFFFFFF FFFFFFFF", - "0x" - "7FFFFFFF FFFFFFFF E487ED51 10B4611A 62633145 C06E0E68" - "94812704 4533E63A 0105DF53 1D89CD91 28A5043C C71A026E" - "F7CA8CD9 E69D218D 98158536 F92F8A1B A7F09AB6 B6A8E122" - "F242DABB 312F3F63 7A262174 D31BF6B5 85FFAE5B 7A035BF6" - "F71C35FD AD44CFD2 D74F9208 BE258FF3 24943328 F6722D9E" - "E1003E5C 50B1DF82 CC6D241B 0E2AE9CD 348B1FD4 7E9267AF" - "C1B2AE91 EE51D6CB 0E3179AB 1042A95D CF6A9483 B84B4B36" - "B3861AA7 255E4C02 78BA3604 6511B993 FFFFFFFF FFFFFFFF", - "0x2" }, + + "FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD1" + "29024E088A67CC74020BBEA63B139B22514A08798E3404DD" + "EF9519B3CD3A431B302B0A6DF25F14374FE1356D6D51C245" + "E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7ED" + "EE386BFB5A899FA5AE9F24117C4B1FE649286651ECE45B3D" + "C2007CB8A163BF0598DA48361C55D39A69163FA8FD24CF5F" + "83655D23DCA3AD961C62F356208552BB9ED529077096966D" + "670C354E4ABC9804F1746C08CA237327FFFFFFFFFFFFFFFF", + + "7FFFFFFFFFFFFFFFE487ED5110B4611A62633145C06E0E68" + "948127044533E63A0105DF531D89CD9128A5043CC71A026E" + "F7CA8CD9E69D218D98158536F92F8A1BA7F09AB6B6A8E122" + "F242DABB312F3F637A262174D31BF6B585FFAE5B7A035BF6" + "F71C35FDAD44CFD2D74F9208BE258FF324943328F6722D9E" + "E1003E5C50B1DF82CC6D241B0E2AE9CD348B1FD47E9267AF" + "C1B2AE91EE51D6CB0E3179AB1042A95DCF6A9483B84B4B36" + "B3861AA7255E4C0278BA36046511B993FFFFFFFFFFFFFFFF", + "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; @@ -93,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) { @@ -104,9 +95,9 @@ SilcSKEStatus silc_ske_get_group_by_number(int number, silc_mp_init(&group->group); silc_mp_init(&group->group_order); silc_mp_init(&group->generator); - silc_mp_set_str(&group->group, silc_ske_groups[i].group, 0); - silc_mp_set_str(&group->group_order, silc_ske_groups[i].group_order, 0); - silc_mp_set_str(&group->generator, silc_ske_groups[i].generator, 0); + silc_mp_set_str(&group->group, silc_ske_groups[i].group, 16); + silc_mp_set_str(&group->group_order, silc_ske_groups[i].group_order, 16); + silc_mp_set_str(&group->generator, silc_ske_groups[i].generator, 16); *ret = group; } @@ -116,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; @@ -127,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,9 +131,9 @@ SilcSKEStatus silc_ske_get_group_by_name(const char *name, silc_mp_init(&group->group); silc_mp_init(&group->group_order); silc_mp_init(&group->generator); - silc_mp_set_str(&group->group, silc_ske_groups[i].group, 0); - silc_mp_set_str(&group->group_order, silc_ske_groups[i].group_order, 0); - silc_mp_set_str(&group->generator, silc_ske_groups[i].generator, 0); + silc_mp_set_str(&group->group, silc_ske_groups[i].group, 16); + silc_mp_set_str(&group->group_order, silc_ske_groups[i].group_order, 16); + silc_mp_set_str(&group->generator, silc_ske_groups[i].generator, 16); *ret = group; } @@ -148,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() @@ -170,3 +173,17 @@ char *silc_ske_get_supported_groups() return list; } + +/* Returns the number of the `group'. */ + +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; +}