diff options
author | Dr. Stephen Henson <steve@openssl.org> | 2000-12-13 18:21:51 +0000 |
---|---|---|
committer | Dr. Stephen Henson <steve@openssl.org> | 2000-12-13 18:21:51 +0000 |
commit | 36f554d43c51796aa0395e6cf087bb3c4ebb730c (patch) | |
tree | 444f2358cbc9650a6591df19e29b7922043b4c60 /crypto/ocsp/ocsp_lib.c | |
parent | 8d28d5f81b81f68a69db1c67e24bcfc092614346 (diff) |
Replace the old style OCSP ASN1 module.
Diffstat (limited to 'crypto/ocsp/ocsp_lib.c')
-rw-r--r-- | crypto/ocsp/ocsp_lib.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/crypto/ocsp/ocsp_lib.c b/crypto/ocsp/ocsp_lib.c index d04213df3f..f633ca749b 100644 --- a/crypto/ocsp/ocsp_lib.c +++ b/crypto/ocsp/ocsp_lib.c @@ -64,7 +64,6 @@ #include <stdio.h> #include <cryptlib.h> #include <openssl/objects.h> -#include <openssl/asn1_mac.h> #include <openssl/x509.h> #include <openssl/pem.h> #include <openssl/x509v3.h> @@ -142,14 +141,14 @@ OCSP_CERTSTATUS *OCSP_cert_status_new(int status, int reason, char *tim) OCSP_CERTSTATUS *cs = NULL; if (!(cs = OCSP_CERTSTATUS_new())) goto err; - if ((cs->tag = status) == V_OCSP_CERTSTATUS_REVOKED) + if ((cs->type = status) == V_OCSP_CERTSTATUS_REVOKED) { if (!time) { OCSPerr(OCSP_F_CERT_STATUS_NEW,OCSP_R_REVOKED_NO_TIME); goto err; } - if (!(cs->revoked = ri = OCSP_REVOKEDINFO_new())) goto err; + if (!(cs->value.revoked = ri = OCSP_REVOKEDINFO_new())) goto err; if (!ASN1_GENERALIZEDTIME_set_string(ri->revocationTime,tim)) goto err; if (reason != OCSP_REVOKED_STATUS_NOSTATUS) @@ -239,7 +238,7 @@ err: return 0; } -OCSP_BASICRESP *OCSP_basic_response_new(int tag, +OCSP_BASICRESP *OCSP_basic_response_new(int type, X509* cert, STACK_OF(X509_EXTENSION) *extensions) { @@ -251,7 +250,7 @@ OCSP_BASICRESP *OCSP_basic_response_new(int tag, if (!(rsp = OCSP_BASICRESP_new())) goto err; rid = rsp->tbsResponseData->responderId; - switch (rid->tag = tag) + switch (rid->type = type) { case V_OCSP_RESPID_NAME: /* cert is user cert */ @@ -601,11 +600,11 @@ int OCSP_RESPONSE_print(BIO *bp, OCSP_RESPONSE* o) goto err; cst = single->certStatus; if (BIO_printf(bp,"\n Cert Status: %s (0x%x)", - ocspCertStatus2string(cst->tag), cst->tag) <= 0) + ocspCertStatus2string(cst->type), cst->type) <= 0) goto err; - if (cst->tag == V_OCSP_CERTSTATUS_REVOKED) + if (cst->type == V_OCSP_CERTSTATUS_REVOKED) { - rev = cst->revoked; + rev = cst->value.revoked; if (BIO_printf(bp, "\n Revocation Time: ") <= 0) goto err; if (!ASN1_GENERALIZEDTIME_print(bp, |