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

This reverts commit efaa2ee176568fcd009ff2ca9daa1b7fdac4c491.

Conflicts:

	lib/x509/ocsp.c

2 files changed, 6 insertions, 29 deletions

diff --git a/lib/x509/ocsp.c b/lib/x509/ocsp.c
index cf9b08a948..1a0fa094cd 100644
--- 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 737b227a37..0a0601fee3 100644
--- 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,