Added LIBOPENCDK ifdefs (suggested by Andrew McDonald)

diff --git a/lib/auth_cert.c b/lib/auth_cert.c
index f5e51898980887af4164cf694da9abad9b046d58..91516bca44b5a200fef7ecbfd1ba3e45ca72a6c0 100644 (file)
--- a/lib/auth_cert.c
+++ b/lib/auth_cert.c
@@ -795,6 +795,7 @@ int _gnutls_proc_x509_server_certificate(GNUTLS_STATE state, opaque * data,
        return 0;
 }
 
+#ifdef HAVE_LIBOPENCDK
 
 #define CLEAR_CERTS for(x=0;x<peer_certificate_list_size;x++) gnutls_free_cert(peer_certificate_list[x])
 int _gnutls_proc_openpgp_server_certificate(GNUTLS_STATE state,
@@ -918,15 +919,17 @@ int _gnutls_proc_openpgp_server_certificate(GNUTLS_STATE state,
 
        return 0;
 }
-
+#endif /* HAVE_LIBOPENCDK */
 
 int _gnutls_proc_cert_server_certificate(GNUTLS_STATE state, opaque * data,
                                         int data_size)
 {
        switch (state->security_parameters.cert_type) {
+#ifdef HAVE_LIBOPENCDK
        case GNUTLS_CRT_OPENPGP:
                return _gnutls_proc_openpgp_server_certificate(state, data,
                                                               data_size);
+#endif /* HAVE_LIBOPENCDK */
        case GNUTLS_CRT_X509:
                return _gnutls_proc_x509_server_certificate(state, data,
                                                            data_size);
@@ -1119,6 +1122,7 @@ int _gnutls_proc_cert_client_cert_vrfy(GNUTLS_STATE state, opaque * data,
                                                  info->
                                                  raw_certificate_list[0]);
                break;
+#ifdef HAVE_LIBOPENCDK
        case GNUTLS_CRT_OPENPGP:
                ret =
                    _gnutls_openpgp_cert2gnutls_cert(&peer_cert,
@@ -1126,7 +1130,7 @@ int _gnutls_proc_cert_client_cert_vrfy(GNUTLS_STATE state, opaque * data,
                                                     raw_certificate_list
                                                     [0]);
                break;
-
+#endif /* HAVE_LIBOPENCDK */
        default:
                gnutls_assert();
                return GNUTLS_E_UNKNOWN_ERROR;

diff --git a/lib/auth_dhe.c b/lib/auth_dhe.c
index 03cea28620606d3bdb158c31a18aa672f8ea2365..7ce2f86c322ab1b684d68f26e91b89fef7b9078b 100644 (file)
--- a/lib/auth_dhe.c
+++ b/lib/auth_dhe.c
@@ -341,6 +341,7 @@ static int proc_dhe_server_kx(GNUTLS_STATE state, opaque * data,
                                return ret;
                        }
                        break;
+#ifdef HAVE_LIBOPENCDK
                case GNUTLS_CRT_OPENPGP:
                        if ((ret =
                             _gnutls_openpgp_cert2gnutls_cert( &peer_cert,
@@ -349,7 +350,7 @@ static int proc_dhe_server_kx(GNUTLS_STATE state, opaque * data,
                                return ret;
                        }
                        break;
-               
+#endif /* HAVE_LIBOPENCDK */
                default:
                        gnutls_assert();
                        return GNUTLS_E_UNKNOWN_ERROR;

diff --git a/lib/auth_rsa.c b/lib/auth_rsa.c
index cd601f1a7d5faf859ce2eaa7daba2d49502730ab..5d6d169bb08b8107a8a59bb580be3e1787bc4db2 100644 (file)
--- a/lib/auth_rsa.c
+++ b/lib/auth_rsa.c
@@ -86,6 +86,7 @@ gnutls_cert peer_cert;
                                return ret;
                        }
                        break;
+#ifdef HAVE_LIBOPENCDK
                case GNUTLS_CRT_OPENPGP:
                        if ((ret =
                             _gnutls_openpgp_cert2gnutls_cert( &peer_cert,
@@ -94,7 +95,7 @@ gnutls_cert peer_cert;
                                return ret;
                        }
                        break;
-               
+#endif /* HAVE_LIBOPENCDK */
                default:
                        gnutls_assert();
                        return GNUTLS_E_UNKNOWN_ERROR;

diff --git a/lib/gnutls_cert.c b/lib/gnutls_cert.c
index 21ee7e236ee8389cbb91c0a72d8b6cc336442f95..efdda83cf28daaa0957e3be9b596dfc30152c657 100644 (file)
--- a/lib/gnutls_cert.c
+++ b/lib/gnutls_cert.c
@@ -296,6 +296,7 @@ void gnutls_certificate_server_set_select_func(GNUTLS_STATE state,
        state->gnutls_internals.server_cert_callback = func;
 }
 
+#ifdef HAVE_LIBOPENCDK
 /*-
   * _gnutls_openpgp_cert_verify_peers - This function returns the peer's certificate status
   * @state: is a gnutls state
@@ -353,6 +354,7 @@ int _gnutls_openpgp_cert_verify_peers(GNUTLS_STATE state)
 
        return verify;
 }
+#endif /* HAVE_LIBOPENCDK */
 
 /**
   * gnutls_certificate_verify_peers - This function returns the peer's certificate verification status
@@ -382,8 +384,10 @@ int gnutls_certificate_verify_peers(GNUTLS_STATE state)
        switch( gnutls_cert_type_get( state)) {
                case GNUTLS_CRT_X509:
                        return _gnutls_x509_cert_verify_peers( state);
+#ifdef HAVE_LIBOPENCDK
                case GNUTLS_CRT_OPENPGP:
                        return _gnutls_openpgp_cert_verify_peers( state);
+#endif /* HAVE_LIBOPENCDK */
                default:
                        return GNUTLS_E_INVALID_REQUEST;
        }

diff --git a/lib/gnutls_openpgp.h b/lib/gnutls_openpgp.h
index 877d8802e9bf3546f815742480c11bccff2dc67d..04c7f905d95c09fae8f6454ccbdb76f11bac46f7 100644 (file)
--- a/lib/gnutls_openpgp.h
+++ b/lib/gnutls_openpgp.h
@@ -1,6 +1,8 @@
 #ifndef GNUTLS_OPENPGP_H
 #define GNUTLS_OPENPGP_H
 
+#ifdef HAVE_LIBOPENCDK
+
 int gnutls_certificate_set_openpgp_key_file(
                                             GNUTLS_CERTIFICATE_CREDENTIALS res,
                                             char* CERTFILE,
@@ -28,13 +30,6 @@ int gnutls_openpgp_add_keyring( const char *fname, int is_secret );
 /* internal */
 int _gnutls_openpgp_cert2gnutls_cert(gnutls_cert *cert, gnutls_datum raw);
 
-#endif /*GNUTLS_OPENPGP_H*/
-
-
-
-
-
-
-
-
+#endif /* HAVE_LIBOPENCDK */
 
+#endif /*GNUTLS_OPENPGP_H*/