diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2006-07-05 19:24:53 +0000 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2006-07-05 19:24:53 +0000 |
| commit | 5284d90115304c2b3506579f651b057cae7b1a1c (patch) | |
| tree | de517e97ccb9fc6accddcdf1f7c4174e34957ea8 /src | |
| parent | e116372d5e830c981a85cd01ebcdc12521847467 (diff) | |
| download | gnutls-5284d90115304c2b3506579f651b057cae7b1a1c.tar.gz | |
replaced USE_OPENPGP ifdefs with ENABLE_OPENPGP.
Diffstat (limited to 'src')
| -rw-r--r-- | src/cli.c | 4 | ||||
| -rw-r--r-- | src/common.c | 7 | ||||
| -rw-r--r-- | src/serv.c | 4 |
3 files changed, 9 insertions, 6 deletions
@@ -239,7 +239,7 @@ load_keys (void) fprintf (stderr, "Processed %d client X.509 certificates...\n", x509_crt_size); } -#ifdef USE_OPENPGP +#ifdef ENABLE_OPENPGP if (pgp_certfile != NULL && pgp_keyfile != NULL) { data = load_file (pgp_certfile); @@ -973,7 +973,7 @@ init_global_tls_stuff (void) load_keys (); -#ifdef USE_OPENPGP +#ifdef ENABLE_OPENPGP if (pgp_keyring != NULL) { ret = gnutls_certificate_set_openpgp_keyring_file (xcred, pgp_keyring); diff --git a/src/common.c b/src/common.c index 2c588ec8c2..22ba54a2d3 100644 --- a/src/common.c +++ b/src/common.c @@ -300,7 +300,7 @@ print_x509_info (gnutls_session session, const char *hostname) } -#ifdef USE_OPENPGP +#ifdef ENABLE_OPENPGP void print_openpgp_info (gnutls_session session, const char *hostname) @@ -573,6 +573,9 @@ void print_cert_info (gnutls_session session, const char *hostname) { + if (gnutls_certificate_client_get_request_status( session) != 0) + printf("- Server has requested a certificate.\n"); + printf ("- Certificate type: "); switch (gnutls_certificate_type_get (session)) { @@ -580,7 +583,7 @@ print_cert_info (gnutls_session session, const char *hostname) printf ("X.509\n"); print_x509_info (session, hostname); break; -#ifdef USE_OPENPGP +#ifdef ENABLE_OPENPGP case GNUTLS_CRT_OPENPGP: printf ("OpenPGP\n"); print_openpgp_info (session, hostname); diff --git a/src/serv.c b/src/serv.c index 4673e2582f..5528e777e2 100644 --- a/src/serv.c +++ b/src/serv.c @@ -708,7 +708,7 @@ main (int argc, char **argv) if ((ret = gnutls_global_init_extra ()) < 0) { fprintf (stderr, "global_init_extra: %s\n", gnutls_strerror (ret)); -// exit (1); + exit (1); } /* Note that servers must generate parameters for @@ -763,7 +763,7 @@ main (int argc, char **argv) } #endif -#ifdef USE_OPENPGP +#ifdef ENABLE_OPENPGP if (pgp_keyring != NULL) { ret = |