-handle failure to load certs more nicely

[oweals/gnunet.git] / src / gns / gnunet-gns.c

diff --git a/src/gns/gnunet-gns.c b/src/gns/gnunet-gns.c
index 4472c764eaa09268b3a8e7a763fff6638d6dc885..0a6bcf66b4ffb7003c2aac5e3d5386d198a36160 100644 (file)
--- a/src/gns/gnunet-gns.c
+++ b/src/gns/gnunet-gns.c
@@ -180,7 +180,7 @@ process_lookup_result (void *cls, uint32_t rd_count,
  * @param shorten_key private key used for shortening, can be NULL
  */
 static void
-lookup_with_keys (const struct GNUNET_CRYPTO_EccPublicKey *pkey,
+lookup_with_keys (const struct GNUNET_CRYPTO_EccPublicSignKey *pkey,
                  const struct GNUNET_CRYPTO_EccPrivateKey *shorten_key)
 {
   if (NULL != lookup_type)
@@ -227,7 +227,7 @@ identity_shorten_cb (void *cls,
                     void **ctx,
                     const char *name)
 {
-  struct GNUNET_CRYPTO_EccPublicKey *pkeym = cls;
+  struct GNUNET_CRYPTO_EccPublicSignKey *pkeym = cls;
 
   id_op = NULL;
   if (NULL == ego) 
@@ -246,12 +246,12 @@ identity_shorten_cb (void *cls,
  * @param pkey public key to use for the zone
  */
 static void
-lookup_with_public_key (const struct GNUNET_CRYPTO_EccPublicKey *pkey)
+lookup_with_public_key (const struct GNUNET_CRYPTO_EccPublicSignKey *pkey)
 {
-  struct GNUNET_CRYPTO_EccPublicKey *pkeym;
+  struct GNUNET_CRYPTO_EccPublicSignKey *pkeym;
 
   GNUNET_assert (NULL != pkey);
-  pkeym = GNUNET_new (struct GNUNET_CRYPTO_EccPublicKey);
+  pkeym = GNUNET_new (struct GNUNET_CRYPTO_EccPublicSignKey);
   *pkeym = *pkey;
   id_op = GNUNET_IDENTITY_get (identity,
                               "shorten-zone",
@@ -276,7 +276,7 @@ static void
 identity_zone_cb (void *cls,
                  const struct GNUNET_IDENTITY_Ego *ego)
 {
-  struct GNUNET_CRYPTO_EccPublicKey pkey;
+  struct GNUNET_CRYPTO_EccPublicSignKey pkey;
 
   el = NULL;
   if (NULL == ego) 
@@ -314,7 +314,7 @@ identity_master_cb (void *cls,
                    void **ctx,
                    const char *name)
 {
-  struct GNUNET_CRYPTO_EccPublicKey pkey;
+  struct GNUNET_CRYPTO_EccPublicSignKey pkey;
 
   id_op = NULL;
   if (NULL == ego) 
@@ -341,7 +341,7 @@ static void
 run (void *cls, char *const *args, const char *cfgfile,
      const struct GNUNET_CONFIGURATION_Handle *c)
 {
-  struct GNUNET_CRYPTO_EccPublicKey pkey;
+  struct GNUNET_CRYPTO_EccPublicSignKey pkey;
 
   cfg = c;
   gns = GNUNET_GNS_connect (cfg);
@@ -357,7 +357,7 @@ run (void *cls, char *const *args, const char *cfgfile,
   if (NULL != public_key)
   {
     if (GNUNET_OK !=
-       GNUNET_CRYPTO_ecc_public_key_from_string (public_key,
+       GNUNET_CRYPTO_ecc_public_sign_key_from_string (public_key,
                                                  strlen (public_key),
                                                  &pkey))
     {
@@ -384,7 +384,7 @@ run (void *cls, char *const *args, const char *cfgfile,
                     &lookup_name[strlen (lookup_name) - 4])) )
   {
     /* no zone required, use 'anonymous' zone */
-    GNUNET_CRYPTO_ecc_key_get_public (GNUNET_CRYPTO_ecc_key_get_anonymous (),
+    GNUNET_CRYPTO_ecc_key_get_public_for_signature (GNUNET_CRYPTO_ecc_key_get_anonymous (),
                                      &pkey);
     lookup_with_public_key (&pkey);
   }