diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2007-10-24 23:44:45 +0300 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2007-10-24 23:44:45 +0300 |
| commit | 3a9bb9663e20587447699352ad78b231e35ad9f0 (patch) | |
| tree | 90877fd0409d3bef96afcaacb9fa2016772e367b /src | |
| parent | e3b8eea08c24fd71a66669f4e7424d2636c9aaca (diff) | |
| download | gnutls-3a9bb9663e20587447699352ad78b231e35ad9f0.tar.gz | |
Several changes to openpgp code:
* gnutls_certificate_set_openpgp_* functions were modified to include format
* KEYRING_HACK is defined to overcome a bug in opencdk which makes keyrings reentrant.
Once fixed, the KEYRING_HACK code should be removed.
Diffstat (limited to 'src')
| -rw-r--r-- | src/cli.c | 2 | ||||
| -rw-r--r-- | src/serv.c | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -966,7 +966,7 @@ init_global_tls_stuff (void) #ifdef ENABLE_OPENPGP if (pgp_keyring != NULL) { - ret = gnutls_certificate_set_openpgp_keyring_file (xcred, pgp_keyring); + ret = gnutls_certificate_set_openpgp_keyring_file (xcred, pgp_keyring, GNUTLS_OPENPGP_FMT_BASE64); if (ret < 0) { fprintf (stderr, "Error setting the OpenPGP keyring file\n"); diff --git a/src/serv.c b/src/serv.c index 9ab93d4755..27959d253c 100644 --- a/src/serv.c +++ b/src/serv.c @@ -898,7 +898,7 @@ main (int argc, char **argv) if (pgp_keyring != NULL) { ret = - gnutls_certificate_set_openpgp_keyring_file (cert_cred, pgp_keyring); + gnutls_certificate_set_openpgp_keyring_file (cert_cred, pgp_keyring, GNUTLS_OPENPGP_FMT_BASE64); if (ret < 0) { fprintf (stderr, "Error setting the OpenPGP keyring file\n"); @@ -908,7 +908,7 @@ main (int argc, char **argv) if (pgp_certfile != NULL) if ((ret = gnutls_certificate_set_openpgp_key_file - (cert_cred, pgp_certfile, pgp_keyfile)) < 0) + (cert_cred, pgp_certfile, pgp_keyfile, GNUTLS_OPENPGP_FMT_BASE64)) < 0) { fprintf (stderr, "Error[%d] while reading the OpenPGP key pair ('%s', '%s')\n", |