diff options
Diffstat (limited to 'cipher')
| -rw-r--r-- | cipher/Makefile.am | 1 | ||||
| -rw-r--r-- | cipher/Makefile.in | 5 | ||||
| -rw-r--r-- | cipher/md.c | 10 | ||||
| -rw-r--r-- | cipher/misc.c | 152 |
4 files changed, 158 insertions, 10 deletions
diff --git a/cipher/Makefile.am b/cipher/Makefile.am index 2f0792cb9..0855d7da9 100644 --- a/cipher/Makefile.am +++ b/cipher/Makefile.am @@ -23,6 +23,7 @@ cipher_SOURCES = blowfish.c \ dsa.h \ dsa.c \ md.c \ + misc.c \ smallprime.c cipher_LIBADD = @CIPHER_EXTRA_OBJS@ diff --git a/cipher/Makefile.in b/cipher/Makefile.in index f71937966..7bd7691f8 100644 --- a/cipher/Makefile.in +++ b/cipher/Makefile.in @@ -60,6 +60,7 @@ cipher_SOURCES = blowfish.c \ dsa.h \ dsa.c \ md.c \ + misc.c \ smallprime.c cipher_LIBADD = @CIPHER_EXTRA_OBJS@ @@ -82,7 +83,7 @@ LIBS = @LIBS@ COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) LINK = $(CC) $(LDFLAGS) -o $@ cipher_OBJECTS = blowfish.o elgamal.o gost.o md5.o primegen.o random.o \ -rmd160.o sha1.o dsa.o md.o smallprime.o +rmd160.o sha1.o dsa.o md.o misc.o smallprime.o EXTRA_cipher_SOURCES = LIBFILES = libcipher.a AR = ar @@ -101,7 +102,7 @@ DEP_DISTFILES = $(DIST_COMMON) $(SOURCES) $(BUILT_SOURCES) $(HEADERS) \ TAR = tar DEP_FILES = $(srcdir)/.deps/blowfish.P $(srcdir)/.deps/dsa.P \ $(srcdir)/.deps/elgamal.P $(srcdir)/.deps/gost.P $(srcdir)/.deps/md.P \ -$(srcdir)/.deps/md5.P $(srcdir)/.deps/primegen.P \ +$(srcdir)/.deps/md5.P $(srcdir)/.deps/misc.P $(srcdir)/.deps/primegen.P \ $(srcdir)/.deps/random.P $(srcdir)/.deps/rmd160.P \ $(srcdir)/.deps/sha1.P $(srcdir)/.deps/smallprime.P SOURCES = $(cipher_SOURCES) diff --git a/cipher/md.c b/cipher/md.c index 71403c8c9..67f5356a8 100644 --- a/cipher/md.c +++ b/cipher/md.c @@ -26,17 +26,11 @@ #include "cipher.h" #include "errors.h" + int md_okay( int algo ) { - switch( algo ) { - case DIGEST_ALGO_MD5: - case DIGEST_ALGO_RMD160: - case DIGEST_ALGO_SHA1: - return 0; - default: - return G10ERR_DIGEST_ALGO; - } + return check_digest_algo( algo ); } diff --git a/cipher/misc.c b/cipher/misc.c new file mode 100644 index 000000000..cd0d31a49 --- /dev/null +++ b/cipher/misc.c @@ -0,0 +1,152 @@ +/* misc.c - utility functions + * Copyright (c) 1997 by Werner Koch (dd9jn) + * + * This file is part of G10. + * + * G10 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. + * + * G10 is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + */ + +#include <config.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <errno.h> +#include "util.h" +#include "cipher.h" + + +static struct { const char *name; int algo;} cipher_names[] = { + { "IDEA", CIPHER_ALGO_IDEA }, + { "3DES", CIPHER_ALGO_3DES }, + { "CAST", CIPHER_ALGO_CAST }, + { "BLOWFISH128", CIPHER_ALGO_BLOWFISH128 }, + { "ROT_N", CIPHER_ALGO_ROT_N }, + { "SAFER_SK128", CIPHER_ALGO_SAFER_SK128 }, + { "DES_SK", CIPHER_ALGO_DES_SK }, + { "BLOWFISH", CIPHER_ALGO_BLOWFISH }, + { "GOST", CIPHER_ALGO_GOST }, + {NULL} }; + +static struct { const char *name; int algo;} pubkey_names[] = { + { "RSA", PUBKEY_ALGO_RSA }, + { "RSA-E", PUBKEY_ALGO_RSA_E }, + { "RSA-S", PUBKEY_ALGO_RSA_S }, + { "ELGAMAL", PUBKEY_ALGO_ELGAMAL }, + { "ELG", PUBKEY_ALGO_ELGAMAL }, + { "DSA", PUBKEY_ALGO_DSA }, + {NULL} }; + +static struct { const char *name; int algo;} digest_names[] = { + { "MD5", DIGEST_ALGO_MD5 }, + { "SHA1", DIGEST_ALGO_SHA1 }, + { "SHA-1", DIGEST_ALGO_SHA1 }, + { "RMD160", DIGEST_ALGO_RMD160 }, + { "RMD-160", DIGEST_ALGO_RMD160 }, + { "RIPE-MD-160", DIGEST_ALGO_RMD160 }, + {NULL} }; + + +/**************** + * Map a string to the cipher algo + */ +int +string_to_cipher_algo( const char *string ) +{ + int i; + const char *s; + + for(i=0; s=cipher_names[i].name; i++ ) + if( !stricmp( s, string ) ) + return cipher_names[i].algo; + return 0; +} + + +/**************** + * Map a string to the pubkey algo + */ +int +string_to_pubkey_algo( const char *string ) +{ + int i; + const char *s; + + for(i=0; s=pubkey_names[i].name; i++ ) + if( !stricmp( s, string ) ) + return pubkey_names[i].algo; + return 0; +} + +/**************** + * Map a string to the digest algo + */ +int +string_to_digest_algo( const char *string ) +{ + int i; + const char *s; + + for(i=0; s=digest_names[i].name; i++ ) + if( !stricmp( s, string ) ) + return digest_names[i].algo; + return 0; +} + +/**************** + * Return 0 if the cipher algo is available + */ +int +check_cipher_algo( int algo ) +{ + switch( algo ) { + case CIPHER_ALGO_BLOWFISH128: + case CIPHER_ALGO_BLOWFISH: + return 0; + default: + return G10ERR_CIPHER_ALGO; + } +} + + +int +check_pubkey_algo( int algo ) +{ + switch( algo ) { + case PUBKEY_ALGO_ELGAMAL: + #ifdef HAVE_RSA_CIPHER + case PUBKEY_ALGO_RSA: + #endif + return 0; + default: + return G10ERR_PUBKEY_ALGO; + } +} + + +int +check_digest_algo( int algo ) +{ + switch( algo ) { + case DIGEST_ALGO_MD5: + case DIGEST_ALGO_RMD160: + case DIGEST_ALGO_SHA1: + return 0; + default: + return G10ERR_DIGEST_ALGO; + } +} + + + |