diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2012-01-29 16:09:08 +0100 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2012-01-29 16:09:08 +0100 |
| commit | dc3505746d464b1bbb309c44abebe734b64b19ff (patch) | |
| tree | 2f06bcb7065c37abe6c9f5a2bd9323002abf39e6 | |
| parent | 870a8a1cbb5276ce08aacec27b4fbe5540e39bcd (diff) | |
| download | gnutls-dc3505746d464b1bbb309c44abebe734b64b19ff.tar.gz | |
small fixes
| -rw-r--r-- | lib/auth/cert.h | 4 | ||||
| -rw-r--r-- | lib/includes/gnutls/ocsp.h | 12 | ||||
| -rw-r--r-- | lib/openpgp/openpgp_int.h | 2 | ||||
| -rw-r--r-- | lib/x509/ocsp.c | 9 | ||||
| -rw-r--r-- | lib/x509/ocsp_output.c | 4 |
5 files changed, 16 insertions, 15 deletions
diff --git a/lib/auth/cert.h b/lib/auth/cert.h index b0931fb9f8..55ff0bdf3c 100644 --- 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 89eb673f75..3c125569cc 100644 --- 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, - int *cert_status, + unsigned int *cert_status, time_t *this_update, time_t *next_update, time_t *revocation_time, - int *revocation_reason); + unsigned int *revocation_reason); int gnutls_ocsp_resp_get_extension (gnutls_ocsp_resp_t resp, unsigned indx, gnutls_datum_t *oid, @@ -242,12 +242,12 @@ extern "C" int gnutls_ocsp_resp_verify_direct (gnutls_ocsp_resp_t resp, gnutls_x509_crt_t signercert, - unsigned *verify, - int flags); + unsigned int*verify, + unsigned int flags); int gnutls_ocsp_resp_verify (gnutls_ocsp_resp_t resp, gnutls_x509_trust_list_t trustlist, - unsigned *verify, - int flags); + unsigned int*verify, + unsigned int flags); #ifdef __cplusplus } diff --git a/lib/openpgp/openpgp_int.h b/lib/openpgp/openpgp_int.h index c412e1ed9b..9f6b3a5212 100644 --- a/lib/openpgp/openpgp_int.h +++ b/lib/openpgp/openpgp_int.h @@ -29,7 +29,7 @@ #ifdef ENABLE_OPENPGP -#include <opencdk.h> +#include <opencdk/opencdk.h> #include <gnutls/openpgp.h> #define KEYID_IMPORT(dst, src) { \ diff --git a/lib/x509/ocsp.c b/lib/x509/ocsp.c index 1a0fa094cd..229a4376c2 100644 --- a/lib/x509/ocsp.c +++ b/lib/x509/ocsp.c @@ -32,6 +32,7 @@ #include "verify-high.h" #include <gnutls/ocsp.h> +#include <auth/cert.h> typedef struct gnutls_ocsp_req_int { @@ -1331,11 +1332,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, - int *cert_status, + unsigned int *cert_status, time_t *this_update, time_t *next_update, time_t *revocation_time, - int *revocation_reason) + unsigned int *revocation_reason) { gnutls_datum_t sa; char name[ASN1_MAX_NAME_SIZE]; @@ -2157,8 +2158,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 *verify, - int flags) + unsigned int *verify, + unsigned int flags) { gnutls_x509_crt_t signercert = NULL; int rc; diff --git a/lib/x509/ocsp_output.c b/lib/x509/ocsp_output.c index 0a0601fee3..737b227a37 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; - int cert_status; + unsigned int cert_status; time_t this_update; time_t next_update; time_t revocation_time; - int revocation_reason; + unsigned int revocation_reason; ret = gnutls_ocsp_resp_get_single (resp, indx, |