Ooops. Stupid bugs.

diff --git a/keymgmt.c b/keymgmt.c
index e05706aca251d050d3369981ff67ea869c8a1bb0..79945f419fd9e1fc193cdc5bc7a5dea0b8651efd 100644 (file)
--- a/keymgmt.c
+++ b/keymgmt.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
 /* -*-c-*-
  *

- * $Id: keymgmt.c,v 1.6 2004/04/18 18:08:11 mdw Exp $
+ * $Id: keymgmt.c,v 1.7 2004/04/19 08:49:40 mdw Exp $

  *
  * Key loading and storing
  *
  *
  * Key loading and storing
  *


@@ -192,9 +192,9 @@ static const char *algs_get(algswitch *a, key_file *kf, key *k)
   if ((a->h = ghash_byname(p)) == 0)
     FAIL("unknown hash function");
 
   if ((a->h = ghash_byname(p)) == 0)
     FAIL("unknown hash function");
 

-  if ((p = key_getattr(kf, k, "mgf")) != 0) {
+  if ((p = key_getattr(kf, k, "mgf")) == 0) {

     dstr_reset(&d);
     dstr_reset(&d);

-    dstr_putf(&d, "%s-mgf");
+    dstr_putf(&d, "%s-mgf", a->h->name);

     p = d.buf;
   }
   if ((a->mgf = gcipher_byname(p)) == 0)
     p = d.buf;
   }
   if ((a->mgf = gcipher_byname(p)) == 0)

diff --git a/tripe.c b/tripe.c
index 92a6a62d398a2a158042e06efe1d243e8b3e5e00..e2356ebbc104102c3ba6d8f3e084bdf9edb170e0 100644 (file)
--- a/tripe.c
+++ b/tripe.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
 /* -*-c-*-
  *

- * $Id: tripe.c,v 1.14 2004/04/18 18:08:11 mdw Exp $
+ * $Id: tripe.c,v 1.15 2004/04/19 08:49:40 mdw Exp $

  *
  * Main program
  *
  *
  * Main program
  *


@@ -160,7 +160,7 @@ int main(int argc, char *argv[])
       { 0,             0,              0,      0 }
     };
 
       { 0,             0,              0,      0 }
     };
 

-    int i = mdwopt(argc, argv, "hvu DU:G: b:p:d:k:K:t:a:" T("T:"),
+    int i = mdwopt(argc, argv, "hvuDU:G:b:p:d:k:K:t:a:" T("T:"),

                   opts, 0, 0, 0);
     if (i < 0)
       break;
                   opts, 0, 0, 0);
     if (i < 0)
       break;