Revert "Added gnutls_ocsp_resp_verify() and some sign fixes."

This reverts commit efaa2ee176568fcd009ff2ca9daa1b7fdac4c491.

Conflicts:

	lib/x509/ocsp.c

diff --git a/lib/auth/cert.h b/lib/auth/cert.h
index 55ff0bdf3c6c5e2c2b4b50c4a69db0efa7f07b6b..b0931fb9f8e3fbaa43959c4a905e489557695993 100644 (file)
--- a/lib/auth/cert.h
+++ b/lib/auth/cert.h
@@ -24,8 +24,8 @@
 #define AUTH_CERT_H
 #include "gnutls_auth.h"
 #include <auth/dh_common.h>
-#include <x509/x509_int.h>
-#include <openpgp/openpgp_int.h>
+#include "x509/x509_int.h"
+#include "openpgp/openpgp_int.h"
 #include <gnutls/abstract.h>
 #include <gnutls/compat.h>
 #include <gnutls_str_array.h>

diff --git a/lib/includes/gnutls/ocsp.h b/lib/includes/gnutls/ocsp.h
index f2703c0655a0a068bf9d2282e22d814463593b8f..89eb673f7564ee8dd8ab806bb70ad5bc25be99ef 100644 (file)
--- a/lib/includes/gnutls/ocsp.h
+++ b/lib/includes/gnutls/ocsp.h
@@ -220,11 +220,11 @@ extern "C"
                                   gnutls_datum_t *issuer_name_hash,
                                   gnutls_datum_t *issuer_key_hash,
                                   gnutls_datum_t *serial_number,
-                                  unsigned int *cert_status,
+                                  int *cert_status,
                                   time_t *this_update,
                                   time_t *next_update,
                                   time_t *revocation_time,
-                                  unsigned int *revocation_reason);
+                                  int *revocation_reason);
   int gnutls_ocsp_resp_get_extension (gnutls_ocsp_resp_t resp,
                                      unsigned indx,
                                      gnutls_datum_t *oid,
@@ -243,15 +243,11 @@ extern "C"
   int gnutls_ocsp_resp_verify_direct (gnutls_ocsp_resp_t resp,
                                      gnutls_x509_crt_t signercert,
                                      unsigned *verify,
-                                     unsigned int flags);
+                                     int flags);
   int gnutls_ocsp_resp_verify (gnutls_ocsp_resp_t resp,
                               gnutls_x509_trust_list_t trustlist,
                               unsigned *verify,
-                              unsigned int flags);
-  int gnutls_ocsp_resp_verify_cred (gnutls_ocsp_resp_t resp,
-                        gnutls_certificate_credentials_t cred,
-                        unsigned *verify,
-                        unsigned int flags);
+                              int flags);
 
 #ifdef __cplusplus
 }

diff --git a/lib/libgnutls.map b/lib/libgnutls.map
index 98afb7456b3e131a90f90a8c2ea1d7f52e2c0d68..40765f8d54d64dda061200eaf298b7e550526b1c 100644 (file)
--- a/lib/libgnutls.map
+++ b/lib/libgnutls.map
@@ -773,7 +773,6 @@ GNUTLS_3_0_0 {
        gnutls_priority_ecc_curve_list;
        gnutls_verify_stored_pubkey;
        gnutls_store_pubkey;
-       gnutls_ocsp_resp_verify_cred;
 } GNUTLS_2_12;
 
 GNUTLS_PRIVATE {

diff --git a/lib/openpgp/openpgp_int.h b/lib/openpgp/openpgp_int.h
index 9f6b3a5212691dec415c6dcb5f4c3d952e797a25..c412e1ed9bd1ed036700c4ef76d4e09fe5aecc31 100644 (file)
--- a/lib/openpgp/openpgp_int.h
+++ b/lib/openpgp/openpgp_int.h
@@ -29,7 +29,7 @@
 
 #ifdef ENABLE_OPENPGP
 
-#include <opencdk/opencdk.h>
+#include <opencdk.h>
 #include <gnutls/openpgp.h>
 
 #define KEYID_IMPORT(dst, src) { \

diff --git a/lib/x509/ocsp.c b/lib/x509/ocsp.c
index cf9b08a948442691eefa2a7d74e86129994b97d4..1a0fa094cd5ae4508b85d26f420238e28f5a196e 100644 (file)
--- a/lib/x509/ocsp.c
+++ b/lib/x509/ocsp.c
@@ -32,7 +32,6 @@
 #include "verify-high.h"
 
 #include <gnutls/ocsp.h>
-#include <auth/cert.h>
 
 typedef struct gnutls_ocsp_req_int
 {
@@ -1332,11 +1331,11 @@ gnutls_ocsp_resp_get_single (gnutls_ocsp_resp_t resp,
                             gnutls_datum_t *issuer_name_hash,
                             gnutls_datum_t *issuer_key_hash,
                             gnutls_datum_t *serial_number,
-                            unsigned int *cert_status,
+                            int *cert_status,
                             time_t *this_update,
                             time_t *next_update,
                             time_t *revocation_time,
-                            unsigned int *revocation_reason)
+                            int *revocation_reason)
 {
   gnutls_datum_t sa;
   char name[ASN1_MAX_NAME_SIZE];
@@ -2158,8 +2157,8 @@ gnutls_ocsp_resp_verify_direct (gnutls_ocsp_resp_t resp,
 int
 gnutls_ocsp_resp_verify (gnutls_ocsp_resp_t resp,
                         gnutls_x509_trust_list_t trustlist,
-                        unsigned int *verify,
-                        unsigned int flags)
+                        unsigned *verify,
+                        int flags)
 {
   gnutls_x509_crt_t signercert = NULL;
   int rc;
@@ -2243,25 +2242,3 @@ gnutls_ocsp_resp_verify (gnutls_ocsp_resp_t resp,
 
   return rc;
 }
-
-/**
- * gnutls_ocsp_resp_verify_cred:
- * @resp: should contain a #gnutls_ocsp_resp_t structure
- * @trustlist: the certificate credentials structure
- * @verify: output variable with verification status, an #gnutls_ocsp_cert_status_t
- * @flags: verification flags, 0 for now.
- *
- * This function is identical to gnutls_ocsp_resp_verify() but would
- * use the trusted anchors from the certificate credentials structure.
- *
- * Returns: On success, %GNUTLS_E_SUCCESS (0) is returned, otherwise a
- *   negative error value.
- **/
-int
-gnutls_ocsp_resp_verify_cred (gnutls_ocsp_resp_t resp,
-                        gnutls_certificate_credentials_t cred,
-                        unsigned int*verify,
-                        unsigned int flags)
-{
-  return gnutls_ocsp_resp_verify( resp, cred->tlist, verify, flags);
-}

diff --git a/lib/x509/ocsp_output.c b/lib/x509/ocsp_output.c
index 737b227a37828b90ad8e877cf07f8333b3baad05..0a0601fee3a3872030970ef350c4ce16a27e774f 100644 (file)
--- a/lib/x509/ocsp_output.c
+++ b/lib/x509/ocsp_output.c
@@ -321,11 +321,11 @@ print_resp (gnutls_buffer_st * str, gnutls_ocsp_resp_t resp,
     {
       gnutls_digest_algorithm_t digest;
       gnutls_datum_t in, ik, sn;
-      unsigned int cert_status;
+      int cert_status;
       time_t this_update;
       time_t next_update;
       time_t revocation_time;
-      unsigned int revocation_reason;
+      int revocation_reason;
 
       ret = gnutls_ocsp_resp_get_single (resp,
                                         indx,