denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use crl_reason_t definition from <credentials/certificates/crl.h>

Browse Source
This commit is contained in:
Andreas Steffen
2009-08-31 23:05:45 +02:00
parent a63f62c03b
commit dc4aadc3f2
5 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pluto/crl.c
+4 -4
View File
@@ -374,7 +374,7 @@ void load_crls(void)
*/ */
static crl_reason_t parse_crl_reasonCode(chunk_t object) static crl_reason_t parse_crl_reasonCode(chunk_t object)
{ {
crl_reason_t reason = REASON_UNSPECIFIED; crl_reason_t reason = CRL_UNSPECIFIED;
if (*object.ptr == ASN1_ENUMERATED if (*object.ptr == ASN1_ENUMERATED
&& asn1_length(&object) == 1) && asn1_length(&object) == 1)
@@ -448,7 +448,7 @@ bool parse_x509crl(chunk_t blob, u_int level0, x509crl_t *crl)
revokedCert_t *revokedCert = malloc_thing(revokedCert_t); revokedCert_t *revokedCert = malloc_thing(revokedCert_t);
revokedCert->userCertificate = userCertificate; revokedCert->userCertificate = userCertificate;
revokedCert->revocationDate = asn1_parse_time(object, level); revokedCert->revocationDate = asn1_parse_time(object, level);
revokedCert->revocationReason = REASON_UNSPECIFIED; revokedCert->revocationReason = CRL_UNSPECIFIED;
revokedCert->next = crl->revokedCertificates; revokedCert->next = crl->revokedCertificates;
crl->revokedCertificates = revokedCert; crl->revokedCertificates = revokedCert;
} }
@@ -519,7 +519,7 @@ check_revocation(const x509crl_t *crl, chunk_t serial
revokedCert_t *revokedCert = crl->revokedCertificates; revokedCert_t *revokedCert = crl->revokedCertificates;
*revocationDate = UNDEFINED_TIME; *revocationDate = UNDEFINED_TIME;
*revocationReason = REASON_UNSPECIFIED; *revocationReason = CRL_UNSPECIFIED;
DBG(DBG_CONTROL, DBG(DBG_CONTROL,
DBG_dump_chunk("serial number:", serial) DBG_dump_chunk("serial number:", serial)
@@ -594,7 +594,7 @@ verify_by_crl(const x509cert_t *cert, time_t *until, time_t *revocationDate
generalName_t *crluri = (ca == NULL)? NULL : ca->crluri; generalName_t *crluri = (ca == NULL)? NULL : ca->crluri;
*revocationDate = UNDEFINED_TIME; *revocationDate = UNDEFINED_TIME;
*revocationReason = REASON_UNSPECIFIED; *revocationReason = CRL_UNSPECIFIED;
lock_crl_list("verify_by_crl"); lock_crl_list("verify_by_crl");
crl = get_x509crl(cert->issuer, cert->authKeySerialNumber, cert->authKeyID); crl = get_x509crl(cert->issuer, cert->authKeySerialNumber, cert->authKeyID);
src/pluto/crl.h
+2
View File
@@ -14,6 +14,8 @@
#include "constants.h" #include "constants.h"
#include <credentials/certificates/crl.h>
/* access structure for a revoked serial number */ /* access structure for a revoked serial number */
typedef struct revokedCert revokedCert_t; typedef struct revokedCert revokedCert_t;
src/pluto/ocsp.c
+3 -3
View File
@@ -112,7 +112,7 @@ const single_response_t empty_single_response = {
{ NULL, 0 } , /* serial_number */ { NULL, 0 } , /* serial_number */
CERT_UNDEFINED , /* status */ CERT_UNDEFINED , /* status */
UNDEFINED_TIME , /* revocationTime */ UNDEFINED_TIME , /* revocationTime */
REASON_UNSPECIFIED, /* revocationReason */ CRL_UNSPECIFIED , /* revocationReason */
UNDEFINED_TIME , /* this_update */ UNDEFINED_TIME , /* this_update */
UNDEFINED_TIME /* next_update */ UNDEFINED_TIME /* next_update */
}; };
@@ -425,7 +425,7 @@ cert_status_t verify_by_ocsp(const x509cert_t *cert, time_t *until,
time_t nextUpdate = 0; time_t nextUpdate = 0;
*revocationDate = UNDEFINED_TIME; *revocationDate = UNDEFINED_TIME;
*revocationReason = REASON_UNSPECIFIED; *revocationReason = CRL_UNSPECIFIED;
/* is an ocsp location defined? */ /* is an ocsp location defined? */
if (!build_ocsp_location(cert, &location)) if (!build_ocsp_location(cert, &location))
@@ -1292,7 +1292,7 @@ static bool parse_ocsp_single_response(chunk_t blob, int level0,
break; break;
case SINGLE_RESPONSE_CERT_STATUS_CRL_REASON: case SINGLE_RESPONSE_CERT_STATUS_CRL_REASON:
sres->revocationReason = (object.len == 1) sres->revocationReason = (object.len == 1)
? *object.ptr : REASON_UNSPECIFIED; ? *object.ptr : CRL_UNSPECIFIED;
break; break;
case SINGLE_RESPONSE_CERT_STATUS_UNKNOWN: case SINGLE_RESPONSE_CERT_STATUS_UNKNOWN:
sres->status = CERT_UNKNOWN; sres->status = CERT_UNKNOWN;
src/pluto/ocsp.h
+2
View File
@@ -15,6 +15,8 @@
#include "constants.h" #include "constants.h"
#include <credentials/certificates/crl.h>
/* constants */ /* constants */
#define OCSP_BASIC_RESPONSE_VERSION 1 #define OCSP_BASIC_RESPONSE_VERSION 1
src/pluto/x509.c
+1 -1
View File
@@ -1986,7 +1986,7 @@ bool verify_x509cert(const x509cert_t *cert, bool strict, time_t *until)
{ {
time_t nextUpdate = *until; time_t nextUpdate = *until;
time_t revocationDate = UNDEFINED_TIME; time_t revocationDate = UNDEFINED_TIME;
crl_reason_t revocationReason = REASON_UNSPECIFIED; crl_reason_t revocationReason = CRL_UNSPECIFIED;
/* first check certificate revocation using ocsp */ /* first check certificate revocation using ocsp */
cert_status_t status = verify_by_ocsp(cert, &nextUpdate cert_status_t status = verify_by_ocsp(cert, &nextUpdate