diff options
author | Simon Josefsson <simon@josefsson.org> | 2007-11-14 16:36:37 +0100 |
---|---|---|
committer | Simon Josefsson <simon@josefsson.org> | 2007-11-14 16:36:37 +0100 |
commit | 610bd3f31381dd2f802439b73142647783eeea51 (patch) | |
tree | 442021434c1e0b2e6542e044e3fc9c5f92c5580a | |
parent | fdfe796245619e9b31c3f429fd14df28918599a0 (diff) | |
download | gnutls-610bd3f31381dd2f802439b73142647783eeea51.tar.gz |
Use new API.
-rw-r--r-- | src/cli.c | 6 | ||||
-rw-r--r-- | src/common.c | 2 |
2 files changed, 4 insertions, 4 deletions
@@ -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 49a05e9be5..ab1a907687 100644 --- 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); |