Use new API.

diff --git a/src/cli.c b/src/cli.c
index 29bba312268c70413ca0a952c28068110cf13214..a9af923a15c2bae0103472f9ed47466121966df4 100644 (file)
--- a/src/cli.c
+++ b/src/cli.c
@@ -166,7 +166,7 @@ static unsigned int x509_crt_size;
 static gnutls_x509_crt_t x509_crt[MAX_CRT];
 static gnutls_x509_privkey_t x509_key = NULL;
 
-static gnutls_openpgp_key_t pgp_crt = NULL;
+static gnutls_openpgp_crt_t pgp_crt = NULL;
 static gnutls_openpgp_privkey_t pgp_key = NULL;
 
 /* Load the certificate and the private key.
@@ -245,10 +245,10 @@ load_keys (void)
          fprintf (stderr, "*** Error loading PGP cert file.\n");
          exit (1);
        }
-      gnutls_openpgp_key_init (&pgp_crt);
+      gnutls_openpgp_crt_init (&pgp_crt);
 
       ret =
-       gnutls_openpgp_key_import (pgp_crt, &data, GNUTLS_OPENPGP_FMT_BASE64);
+       gnutls_openpgp_crt_import (pgp_crt, &data, GNUTLS_OPENPGP_FMT_BASE64);
       if (ret < 0)
        {
          fprintf (stderr,

diff --git a/src/common.c b/src/common.c
index 49a05e9be50190879e8c0d7398ee7e7f1ef14549..ab1a90768741eb9127bea24005e7eaf21b31479b 100644 (file)
--- a/src/common.c
+++ b/src/common.c
@@ -365,7 +365,7 @@ print_openpgp_info (gnutls_session_t session, const char *hostname)
          print = raw_to_string (digest, digest_size);
 
          printf (" # PGP Key version: %d\n",
-                 gnutls_openpgp_key_get_version (crt));
+                 gnutls_openpgp_crt_get_version (crt));
 
          bits = 0;
          algo = gnutls_openpgp_crt_get_pk_algorithm (crt, &bits);