/* ocsp_vfy.c */
-/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
+/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
* project 2000.
*/
/* ====================================================================
- * Copyright (c) 2000 The OpenSSL Project. All rights reserved.
+ * Copyright (c) 2000-2004 The OpenSSL Project. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
{
X509 *signer, *x;
STACK_OF(X509) *chain = NULL;
+ STACK_OF(X509) *tmpchain = NULL;
+ X509_STORE *tmpstore = NULL;
X509_STORE_CTX ctx;
- int i, ret = 0;
+ int i, ret;
ret = ocsp_find_signer(&signer, bs, certs, st, flags);
if (!ret)
{
goto end;
}
if ((ret == 2) && (flags & OCSP_TRUSTOTHER))
- flags |= OCSP_NOVERIFY;
+ chain = certs;
if (!(flags & OCSP_NOSIGS))
{
EVP_PKEY *skey;
}
if (!(flags & OCSP_NOVERIFY))
{
+ int init_res;
+
+ /* If we trust the signer, we don't need to build a chain.
+ * (If the signer is a root certificate, X509_verify_cert()
+ * would fail anyway!)
+ */
+ if (chain == certs) goto verified_chain;
+
+ /* If we trust some "other" certificates, mark them as
+ * explicitly trusted (because some of them might be
+ * Intermediate CA Certificates), put them in a store and
+ * attempt to build a trusted chain.
+ */
+ if ((flags & OCSP_TRUSTOTHER) && (certs != NULL))
+ {
+ ASN1_OBJECT *objtmp = OBJ_nid2obj(NID_OCSP_sign);
+ tmpstore = X509_STORE_new();
+ if (!tmpstore)
+ {
+ ret = -1;
+ OCSPerr(OCSP_F_OCSP_BASIC_VERIFY, ERR_R_MALLOC_FAILURE);
+ goto end;
+ }
+ for (i = 0; i < sk_X509_num(certs); i++)
+ {
+ X509 *xother = sk_X509_value(certs, i);
+ X509_add1_trust_object(xother, objtmp);
+ if (!X509_STORE_add_cert(tmpstore, xother))
+ {
+ ret = -1;
+ goto end;
+ }
+ }
+
+ init_res = X509_STORE_CTX_init(&ctx, tmpstore, signer, NULL);
+ if (!init_res)
+ {
+ ret = -1;
+ OCSPerr(OCSP_F_OCSP_BASIC_VERIFY,ERR_R_X509_LIB);
+ goto end;
+ }
+ X509_STORE_CTX_set_purpose(&ctx, X509_PURPOSE_OCSP_HELPER);
+ ret = X509_verify_cert(&ctx);
+ if (ret == 1)
+ {
+ chain = tmpchain = X509_STORE_CTX_get1_chain(&ctx);
+ X509_STORE_CTX_cleanup(&ctx);
+ goto verified_chain;
+ }
+ X509_STORE_CTX_cleanup(&ctx);
+ }
+
+ /* Attempt to build a chain up to a Root Certificate in the
+ * trust store provided by the caller.
+ */
if(flags & OCSP_NOCHAIN)
- X509_STORE_CTX_init(&ctx, st, signer, NULL);
+ init_res = X509_STORE_CTX_init(&ctx, st, signer, NULL);
else
- X509_STORE_CTX_init(&ctx, st, signer, bs->certs);
+ init_res = X509_STORE_CTX_init(&ctx, st, signer, bs->certs);
+ if(!init_res)
+ {
+ ret = -1;
+ OCSPerr(OCSP_F_OCSP_BASIC_VERIFY,ERR_R_X509_LIB);
+ goto end;
+ }
X509_STORE_CTX_set_purpose(&ctx, X509_PURPOSE_OCSP_HELPER);
ret = X509_verify_cert(&ctx);
- chain = X509_STORE_CTX_get1_chain(&ctx);
+ chain = tmpchain = X509_STORE_CTX_get1_chain(&ctx);
X509_STORE_CTX_cleanup(&ctx);
- if (ret <= 0)
+ if (ret <= 0)
{
i = X509_STORE_CTX_get_error(&ctx);
OCSPerr(OCSP_F_OCSP_BASIC_VERIFY,OCSP_R_CERTIFICATE_VERIFY_ERROR);
ERR_add_error_data(2, "Verify error:",
X509_verify_cert_error_string(i));
- goto end;
- }
+ goto end;
+ }
+
+ verified_chain:
if(flags & OCSP_NOCHECKS)
{
ret = 1;
end:
- if(chain) sk_X509_pop_free(chain, X509_free);
+ if(tmpchain) sk_X509_pop_free(tmpchain, X509_free);
+ if(tmpstore) X509_STORE_free(tmpstore);
return ret;
}
for (i = 1; i < idcount; i++)
{
- tmpid = sk_OCSP_SINGLERESP_value(sresp, 0)->certId;
+ tmpid = sk_OCSP_SINGLERESP_value(sresp, i)->certId;
/* Check to see if IDs match */
if (OCSP_id_issuer_cmp(cid, tmpid))
{
}
mdlen = EVP_MD_size(dgst);
+ if (mdlen < 0)
+ return -1;
if ((cid->issuerNameHash->length != mdlen) ||
(cid->issuerKeyHash->length != mdlen))
return 0;
- iname = X509_get_issuer_name(cert);
+ iname = X509_get_subject_name(cert);
if (!X509_NAME_digest(iname, dgst, md, NULL))
return -1;
if (memcmp(md, cid->issuerNameHash->data, mdlen))
return 0;
- X509_pubkey_digest(cert, EVP_sha1(), md, NULL);
+ X509_pubkey_digest(cert, dgst, md, NULL);
if (memcmp(md, cid->issuerKeyHash->data, mdlen))
return 0;
OCSP_CERTID *tmpid;
for (i = 0; i < sk_OCSP_SINGLERESP_num(sresp); i++)
{
- tmpid = sk_OCSP_SINGLERESP_value(sresp, 0)->certId;
+ tmpid = sk_OCSP_SINGLERESP_value(sresp, i)->certId;
ret = ocsp_match_issuerid(cert, tmpid, NULL);
if (ret <= 0) return ret;
}
return 0;
}
gen = req->tbsRequest->requestorName;
- if (gen->type != GEN_DIRNAME)
+ if (!gen || gen->type != GEN_DIRNAME)
{
OCSPerr(OCSP_F_OCSP_REQUEST_VERIFY, OCSP_R_UNSUPPORTED_REQUESTORNAME_TYPE);
return 0;
}
if (!(flags & OCSP_NOVERIFY))
{
+ int init_res;
if(flags & OCSP_NOCHAIN)
- X509_STORE_CTX_init(&ctx, store, signer, NULL);
+ init_res = X509_STORE_CTX_init(&ctx, store, signer, NULL);
else
- X509_STORE_CTX_init(&ctx, store, signer, req->optionalSignature->certs);
+ init_res = X509_STORE_CTX_init(&ctx, store, signer,
+ req->optionalSignature->certs);
+ if(!init_res)
+ {
+ OCSPerr(OCSP_F_OCSP_REQUEST_VERIFY,ERR_R_X509_LIB);
+ return 0;
+ }
X509_STORE_CTX_set_purpose(&ctx, X509_PURPOSE_OCSP_HELPER);
X509_STORE_CTX_set_trust(&ctx, X509_TRUST_OCSP_REQUEST);
projects / openssl.git / blobdiff