Fix for new key-data interface.

diff --git a/keymgmt.c b/keymgmt.c
index e1388e04c26b501319253518bd0fcaf5478bd7af..73f62654f8654e204c19cab7018fe4ad9a5fcf65 100644 (file)
--- a/keymgmt.c
+++ b/keymgmt.c
@@ -316,7 +316,7 @@ static int loadpriv(dstr *d)
 {
   key_file kf;
   key *k;
 {
   key_file kf;
   key *k;

-  key_data *kd;
+  key_data **kd;

   dstr t = DSTR_INIT;
   group *g = 0;
   mp *x = 0;
   dstr t = DSTR_INIT;
   group *g = 0;
   mp *x = 0;


@@ -353,7 +353,7 @@ tymatch:;
 
   /* --- Load the key --- */
 
 
   /* --- Load the key --- */
 

-  if ((e = (*ko)->loadpriv(kd, &g, &x, &t)) != 0) {
+  if ((e = (*ko)->loadpriv(*kd, &g, &x, &t)) != 0) {

     dstr_putf(d, "error reading private key `%s': %s", t.buf, e);
     goto done_1;
   }
     dstr_putf(d, "error reading private key `%s': %s", t.buf, e);
     goto done_1;
   }


@@ -546,7 +546,7 @@ void km_init(const char *priv, const char *pub, const char *tag)
 int km_getpubkey(const char *tag, ge *kpub, time_t *t_exp)
 {
   key *k;
 int km_getpubkey(const char *tag, ge *kpub, time_t *t_exp)
 {
   key *k;

-  key_data *kd;
+  key_data **kd;

   dstr t = DSTR_INIT;
   const kgops **ko;
   const char *e;
   dstr t = DSTR_INIT;
   const kgops **ko;
   const char *e;


@@ -574,7 +574,7 @@ tymatch:;
 
   /* --- Load the key --- */
 
 
   /* --- Load the key --- */
 

-  if ((e = (*ko)->loadpub(kd, &g, &p, &t)) != 0) {
+  if ((e = (*ko)->loadpub(*kd, &g, &p, &t)) != 0) {

     a_warn("KEYMGMT public-key %s bad -- %s", t.buf, e);
     goto done;
   }
     a_warn("KEYMGMT public-key %s bad -- %s", t.buf, e);
     goto done;
   }