Use centralized hasher names in pki utility

diff --git a/src/pki/commands/issue.c b/src/pki/commands/issue.c
index 4dbe2e0699873be5f5396af154b2c847bcb5a31a..47e668b6cdd52f53704bf482470c58ccd7490219 100644 (file)
--- a/src/pki/commands/issue.c
+++ b/src/pki/commands/issue.c
@@ -105,8 +105,8 @@ static int issue()
                                }
                                continue;
                        case 'g':
-                               digest = get_digest(arg);
-                               if (digest == HASH_UNKNOWN)
+                               digest = enum_from_name(hash_algorithm_short_names, arg);
+                               if (digest == -1)
                                {
                                        error = "invalid --digest type";
                                        goto usage;

diff --git a/src/pki/commands/req.c b/src/pki/commands/req.c
index 087a97b3e133b7f610425b1dcaea4217adcaff98..d050c70321a672678dbd1d28816853d794fab0f2 100644 (file)
--- a/src/pki/commands/req.c
+++ b/src/pki/commands/req.c
@@ -63,8 +63,8 @@ static int req()
                                }
                                continue;
                        case 'g':
-                               digest = get_digest(arg);
-                               if (digest == HASH_UNKNOWN)
+                               digest = enum_from_name(hash_algorithm_short_names, arg);
+                               if (digest == -1)
                                {
                                        error = "invalid --digest type";
                                        goto usage;

diff --git a/src/pki/commands/self.c b/src/pki/commands/self.c
index e98f90f4e5d48f1ff54f3713efe399124d87a242..4a50aa46392655b2b66fee6608fc0c79fcc4fed7 100644 (file)
--- a/src/pki/commands/self.c
+++ b/src/pki/commands/self.c
@@ -94,8 +94,8 @@ static int self()
                                }
                                continue;
                        case 'g':
-                               digest = get_digest(arg);
-                               if (digest == HASH_UNKNOWN)
+                               digest = enum_from_name(hash_algorithm_short_names, arg);
+                               if (digest == -1)
                                {
                                        error = "invalid --digest type";
                                        goto usage;

diff --git a/src/pki/commands/signcrl.c b/src/pki/commands/signcrl.c
index 153734f53c210762851c322dbec6fe2a6c7926ca..4ada120edeaab7df47cd64fe45ba028a6e1523c8 100644 (file)
--- a/src/pki/commands/signcrl.c
+++ b/src/pki/commands/signcrl.c
@@ -141,8 +141,8 @@ static int sign_crl()
                        case 'h':
                                goto usage;
                        case 'g':
-                               digest = get_digest(arg);
-                               if (digest == HASH_UNKNOWN)
+                               digest = enum_from_name(hash_algorithm_short_names, arg);
+                               if (digest == -1)
                                {
                                        error = "invalid --digest type";
                                        goto usage;

diff --git a/src/pki/pki.c b/src/pki/pki.c
index 3005d2fcd02760be93dbeaa1984312f3914eb6e1..e28bf15955ac44c405af585c0c92f6d0b709df7d 100644 (file)
--- a/src/pki/pki.c
+++ b/src/pki/pki.c
@@ -79,38 +79,6 @@ bool get_form(char *form, cred_encoding_type_t *enc, credential_type_t type)
        return FALSE;
 }
 
-/**
- * Convert a digest string to a hash algorithm
- */
-hash_algorithm_t get_digest(char *name)
-{
-       if (streq(name, "md5"))
-       {
-               return HASH_MD5;
-       }
-       if (streq(name, "sha1"))
-       {
-               return HASH_SHA1;
-       }
-       if (streq(name, "sha224"))
-       {
-               return HASH_SHA224;
-       }
-       if (streq(name, "sha256"))
-       {
-               return HASH_SHA256;
-       }
-       if (streq(name, "sha384"))
-       {
-               return HASH_SHA384;
-       }
-       if (streq(name, "sha512"))
-       {
-               return HASH_SHA512;
-       }
-       return HASH_UNKNOWN;
-}
-
 /**
  * Callback credential set pki uses
  */

diff --git a/src/pki/pki.h b/src/pki/pki.h
index 9c145cdc0af8d32b403499f378606bfdaa9b70e9..f72b1804ce16cabc89cdb3ccc45e52108b1c4fbb 100644 (file)
--- a/src/pki/pki.h
+++ b/src/pki/pki.h
@@ -31,9 +31,4 @@
  */
 bool get_form(char *form, cred_encoding_type_t *enc, credential_type_t type);
 
-/**
- * Convert a digest string to a hash algorithm
- */
-hash_algorithm_t get_digest(char *name);
-
 #endif /** PKI_H_ @}*/