TS bugfixes: Do not hardcode message digest algorithms; fix ASN1 decoding.

Submitted by: Zoltan Glozik <zglozik@opentsa.org>

1 files changed, 4 insertions, 10 deletions

diff --git a/apps/ts.c b/apps/ts.c
index b8fb50b3b5..0083f9a1e1 100644
--- a/apps/ts.c
+++ b/apps/ts.c
@@ -191,16 +191,6 @@ int MAIN(int argc, char **argv)
 			if (argc-- < 1) goto usage;
 			digest = *++argv;
 			}
-		else if (strcmp(*argv, "-md2") == 0
-			|| strcmp(*argv, "-md4") == 0
-			|| strcmp(*argv, "-md5") == 0
-			|| strcmp(*argv, "-sha") == 0
-			|| strcmp(*argv, "-sha1") == 0
-			|| strcmp(*argv, "-mdc2") == 0
-			|| strcmp(*argv, "-ripemd160") == 0)
-			{
-			md = EVP_get_digestbyname(*argv + 1);
-			}
 		else if (strcmp(*argv, "-rand") == 0)
 			{
 			if (argc-- < 1) goto usage;
@@ -296,6 +286,10 @@ int MAIN(int argc, char **argv)
 			if (argc-- < 1) goto usage;
 			engine = *++argv;
 			}
+		else if ((md = EVP_get_digestbyname(*argv + 1)) != NULL)
+			{
+			/* empty. */
+			}
 		else
 			goto usage;
 		}