diff options
| author | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2017-06-16 09:03:05 +0200 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2017-06-16 15:31:51 +0200 |
| commit | 72aaf102929121513a91b69a9808f6e3c669655d (patch) | |
| tree | 466def07918a5c6bbe36d46108b60d0241699f74 /src/serv.c | |
| parent | 4ad76785ef2feec7af64f3821edd8eb67de88762 (diff) | |
| download | gnutls-72aaf102929121513a91b69a9808f6e3c669655d.tar.gz | |
tools: removed options for openpgp support
Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>
Diffstat (limited to 'src/serv.c')
| -rw-r--r-- | src/serv.c | 45 |
1 files changed, 0 insertions, 45 deletions
diff --git a/src/serv.c b/src/serv.c index 2ed184c270..63138a509e 100644 --- a/src/serv.c +++ b/src/serv.c @@ -34,7 +34,6 @@ #include <string.h> #include <gnutls/gnutls.h> #include <gnutls/dtls.h> -#include <gnutls/openpgp.h> #include <sys/time.h> #include <sys/select.h> #include <fcntl.h> @@ -67,9 +66,6 @@ int disable_client_cert; const char *psk_passwd = NULL; const char *srp_passwd = NULL; const char *srp_passwd_conf = NULL; -const char *pgp_keyring = NULL; -const char *pgp_keyfile = NULL; -const char *pgp_certfile = NULL; const char **x509_keyfile = NULL; const char **x509_certfile = NULL; unsigned x509_certfile_size = 0; @@ -1073,39 +1069,6 @@ int main(int argc, char **argv) printf("Processed %d CRL(s).\n", ret); } } -#ifdef ENABLE_OPENPGP - if (pgp_keyring != NULL) { - ret = - 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"); - GERR(ret); - } - } - - if (pgp_certfile != NULL && pgp_keyfile != NULL) { - if (HAVE_OPT(PGPSUBKEY)) - ret = gnutls_certificate_set_openpgp_key_file2 - (cert_cred, pgp_certfile, pgp_keyfile, - OPT_ARG(PGPSUBKEY), - GNUTLS_OPENPGP_FMT_BASE64); - else - ret = gnutls_certificate_set_openpgp_key_file - (cert_cred, pgp_certfile, pgp_keyfile, - GNUTLS_OPENPGP_FMT_BASE64); - - if (ret < 0) { - fprintf(stderr, - "Error[%d] while reading the OpenPGP key pair ('%s', '%s')\n", - ret, pgp_certfile, pgp_keyfile); - GERR(ret); - } else - cert_set = 1; - } -#endif if (x509_certfile_size > 0 && x509_keyfile_size > 0) { unsigned i; @@ -1672,14 +1635,6 @@ static void cmd_parser(int argc, char **argv) if (HAVE_OPT(X509CRLFILE)) x509_crlfile = OPT_ARG(X509CRLFILE); - if (HAVE_OPT(PGPKEYFILE)) - pgp_keyfile = OPT_ARG(PGPKEYFILE); - if (HAVE_OPT(PGPCERTFILE)) - pgp_certfile = OPT_ARG(PGPCERTFILE); - - if (HAVE_OPT(PGPKEYRING)) - pgp_keyring = OPT_ARG(PGPKEYRING); - if (HAVE_OPT(SRPPASSWD)) srp_passwd = OPT_ARG(SRPPASSWD); if (HAVE_OPT(SRPPASSWDCONF)) |