From: mdw <mdw>
Date: Mon, 19 Apr 2004 08:49:40 +0000 (+0000)
Subject: Ooops.  Stupid bugs.
X-Git-Tag: 1.0.0pre7~9
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/tripe/commitdiff_plain/74ee77cb7c67b4faca6d959dbd06dc0969ccf351

Ooops.  Stupid bugs.
---

diff --git a/keymgmt.c b/keymgmt.c
index e05706ac..79945f41 100644
--- a/keymgmt.c
+++ b/keymgmt.c
@@ -1,6 +1,6 @@
 /* -*-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
  *
@@ -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 ((p = key_getattr(kf, k, "mgf")) != 0) {
+  if ((p = key_getattr(kf, k, "mgf")) == 0) {
     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)
diff --git a/tripe.c b/tripe.c
index 92a6a62d..e2356ebb 100644
--- a/tripe.c
+++ b/tripe.c
@@ -1,6 +1,6 @@
 /* -*-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
  *
@@ -160,7 +160,7 @@ int main(int argc, char *argv[])
       { 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;