Add -rsigopt option to ocsp command
[openssl.git] / crypto / ocsp / ocsp_srv.c
index 3ecbfc8..d31a3c0 100644 (file)
-/* ocsp_srv.c */
-/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
- * project 2001.
- */
-/* ====================================================================
- * Copyright (c) 1998-2001 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
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
+/*
+ * Copyright 2001-2016 The OpenSSL Project Authors. All Rights Reserved.
  *
+ * Licensed under the OpenSSL license (the "License").  You may not use
+ * this file except in compliance with the License.  You can obtain a copy
+ * in the file LICENSE in the source distribution or at
+ * https://www.openssl.org/source/license.html
  */
 
 #include <stdio.h>
-#include <cryptlib.h>
+#include "internal/cryptlib.h"
 #include <openssl/objects.h>
-#include <openssl/rand.h>
 #include <openssl/x509.h>
 #include <openssl/pem.h>
 #include <openssl/x509v3.h>
 #include <openssl/ocsp.h>
+#include "ocsp_lcl.h"
 
-/* Utility functions related to sending OCSP responses and extracting
+/*
+ * Utility functions related to sending OCSP responses and extracting
  * relevant information from the request.
  */
 
 int OCSP_request_onereq_count(OCSP_REQUEST *req)
-       {
-       return sk_OCSP_ONEREQ_num(req->tbsRequest->requestList);
-       }
+{
+    return sk_OCSP_ONEREQ_num(req->tbsRequest.requestList);
+}
 
 OCSP_ONEREQ *OCSP_request_onereq_get0(OCSP_REQUEST *req, int i)
-       {
-       return sk_OCSP_ONEREQ_value(req->tbsRequest->requestList, i);
-       }
+{
+    return sk_OCSP_ONEREQ_value(req->tbsRequest.requestList, i);
+}
 
 OCSP_CERTID *OCSP_onereq_get0_id(OCSP_ONEREQ *one)
-       {
-       return one->reqCert;
-       }
+{
+    return one->reqCert;
+}
 
 int OCSP_id_get0_info(ASN1_OCTET_STRING **piNameHash, ASN1_OBJECT **pmd,
-                       ASN1_OCTET_STRING **pikeyHash,
-                       ASN1_INTEGER **pserial, OCSP_CERTID *cid)
-       {
-       if (!cid) return 0;
-       if (pmd) *pmd = cid->hashAlgorithm->algorithm;
-       if(piNameHash) *piNameHash = cid->issuerNameHash;
-       if (pikeyHash) *pikeyHash = cid->issuerKeyHash;
-       if (pserial) *pserial = cid->serialNumber;
-       return 1;
-       }
+                      ASN1_OCTET_STRING **pikeyHash,
+                      ASN1_INTEGER **pserial, OCSP_CERTID *cid)
+{
+    if (!cid)
+        return 0;
+    if (pmd)
+        *pmd = cid->hashAlgorithm.algorithm;
+    if (piNameHash)
+        *piNameHash = &cid->issuerNameHash;
+    if (pikeyHash)
+        *pikeyHash = &cid->issuerKeyHash;
+    if (pserial)
+        *pserial = &cid->serialNumber;
+    return 1;
+}
+
+int OCSP_request_is_signed(OCSP_REQUEST *req)
+{
+    if (req->optionalSignature)
+        return 1;
+    return 0;
+}
 
 /* Create an OCSP response and encode an optional basic response */
 OCSP_RESPONSE *OCSP_response_create(int status, OCSP_BASICRESP *bs)
-        {
-        OCSP_RESPONSE *rsp = NULL;
-
-       if (!(rsp = OCSP_RESPONSE_new())) goto err;
-       if (!(ASN1_ENUMERATED_set(rsp->responseStatus, status))) goto err;
-       if (!bs) return rsp;
-       if (!(rsp->responseBytes = OCSP_RESPBYTES_new())) goto err;
-       rsp->responseBytes->responseType = OBJ_nid2obj(NID_id_pkix_OCSP_basic);
-       if (!ASN1_item_pack(bs, ASN1_ITEM_rptr(OCSP_BASICRESP), &rsp->responseBytes->response))
-                               goto err;
-       return rsp;
-err:
-       if (rsp) OCSP_RESPONSE_free(rsp);
-       return NULL;
-       }
-
+{
+    OCSP_RESPONSE *rsp = NULL;
+
+    if ((rsp = OCSP_RESPONSE_new()) == NULL)
+        goto err;
+    if (!(ASN1_ENUMERATED_set(rsp->responseStatus, status)))
+        goto err;
+    if (!bs)
+        return rsp;
+    if ((rsp->responseBytes = OCSP_RESPBYTES_new()) == NULL)
+        goto err;
+    rsp->responseBytes->responseType = OBJ_nid2obj(NID_id_pkix_OCSP_basic);
+    if (!ASN1_item_pack
+        (bs, ASN1_ITEM_rptr(OCSP_BASICRESP), &rsp->responseBytes->response))
+         goto err;
+    return rsp;
+ err:
+    OCSP_RESPONSE_free(rsp);
+    return NULL;
+}
 
 OCSP_SINGLERESP *OCSP_basic_add1_status(OCSP_BASICRESP *rsp,
-                                               OCSP_CERTID *cid,
-                                               int status, int reason,
-                                               ASN1_TIME *revtime,
-                                       ASN1_TIME *thisupd, ASN1_TIME *nextupd)
-       {
-       OCSP_SINGLERESP *single = NULL;
-       OCSP_CERTSTATUS *cs;
-       OCSP_REVOKEDINFO *ri;
-
-       if(!rsp->tbsResponseData->responses &&
-           !(rsp->tbsResponseData->responses = sk_OCSP_SINGLERESP_new_null()))
-               goto err;
-
-       if (!(single = OCSP_SINGLERESP_new()))
-               goto err;
-
-
-
-       if (!ASN1_TIME_to_generalizedtime(thisupd, &single->thisUpdate))
-               goto err;
-       if (nextupd &&
-               !ASN1_TIME_to_generalizedtime(nextupd, &single->nextUpdate))
-               goto err;
-
-       OCSP_CERTID_free(single->certId);
-
-       if(!(single->certId = OCSP_CERTID_dup(cid)))
-               goto err;
-
-       cs = single->certStatus;
-       switch(cs->type = status)
-               {
-       case V_OCSP_CERTSTATUS_REVOKED:
-               if (!revtime)
-                       {
-                       OCSPerr(OCSP_F_OCSP_BASIC_ADD1_STATUS,OCSP_R_NO_REVOKED_TIME);
-                       goto err;
-                       }
-               if (!(cs->value.revoked = ri = OCSP_REVOKEDINFO_new())) goto err;
-               if (!ASN1_TIME_to_generalizedtime(revtime, &ri->revocationTime))
-                       goto err;       
-               if (reason != OCSP_REVOKED_STATUS_NOSTATUS)
-                       {
-                       if (!(ri->revocationReason = ASN1_ENUMERATED_new())) 
-                               goto err;
-                       if (!(ASN1_ENUMERATED_set(ri->revocationReason, 
-                                                 reason)))
-                               goto err;       
-                       }
-               break;
-
-       case V_OCSP_CERTSTATUS_GOOD:
-               cs->value.good = ASN1_NULL_new();
-               break;
-
-       case V_OCSP_CERTSTATUS_UNKNOWN:
-               cs->value.unknown = ASN1_NULL_new();
-               break;
-
-       default:
-               goto err;
-
-               }
-       if (!(sk_OCSP_SINGLERESP_push(rsp->tbsResponseData->responses, single)))
-               goto err;
-       return single;
-err:
-       OCSP_SINGLERESP_free(single);
-       return NULL;
-       }
+                                        OCSP_CERTID *cid,
+                                        int status, int reason,
+                                        ASN1_TIME *revtime,
+                                        ASN1_TIME *thisupd,
+                                        ASN1_TIME *nextupd)
+{
+    OCSP_SINGLERESP *single = NULL;
+    OCSP_CERTSTATUS *cs;
+    OCSP_REVOKEDINFO *ri;
+
+    if (rsp->tbsResponseData.responses == NULL
+        && (rsp->tbsResponseData.responses
+                = sk_OCSP_SINGLERESP_new_null()) == NULL)
+        goto err;
+
+    if ((single = OCSP_SINGLERESP_new()) == NULL)
+        goto err;
+
+    if (!ASN1_TIME_to_generalizedtime(thisupd, &single->thisUpdate))
+        goto err;
+    if (nextupd &&
+        !ASN1_TIME_to_generalizedtime(nextupd, &single->nextUpdate))
+        goto err;
+
+    OCSP_CERTID_free(single->certId);
+
+    if ((single->certId = OCSP_CERTID_dup(cid)) == NULL)
+        goto err;
+
+    cs = single->certStatus;
+    switch (cs->type = status) {
+    case V_OCSP_CERTSTATUS_REVOKED:
+        if (!revtime) {
+            OCSPerr(OCSP_F_OCSP_BASIC_ADD1_STATUS, OCSP_R_NO_REVOKED_TIME);
+            goto err;
+        }
+        if ((cs->value.revoked = ri = OCSP_REVOKEDINFO_new()) == NULL)
+            goto err;
+        if (!ASN1_TIME_to_generalizedtime(revtime, &ri->revocationTime))
+            goto err;
+        if (reason != OCSP_REVOKED_STATUS_NOSTATUS) {
+            if ((ri->revocationReason = ASN1_ENUMERATED_new()) == NULL)
+                goto err;
+            if (!(ASN1_ENUMERATED_set(ri->revocationReason, reason)))
+                goto err;
+        }
+        break;
+
+    case V_OCSP_CERTSTATUS_GOOD:
+        if ((cs->value.good = ASN1_NULL_new()) == NULL)
+            goto err;
+        break;
+
+    case V_OCSP_CERTSTATUS_UNKNOWN:
+        if ((cs->value.unknown = ASN1_NULL_new()) == NULL)
+            goto err;
+        break;
+
+    default:
+        goto err;
+
+    }
+    if (!(sk_OCSP_SINGLERESP_push(rsp->tbsResponseData.responses, single)))
+        goto err;
+    return single;
+ err:
+    OCSP_SINGLERESP_free(single);
+    return NULL;
+}
 
 /* Add a certificate to an OCSP request */
 
 int OCSP_basic_add1_cert(OCSP_BASICRESP *resp, X509 *cert)
-       {
-       if (!resp->certs && !(resp->certs = sk_X509_new_null()))
-               return 0;
-
-       if(!sk_X509_push(resp->certs, cert)) return 0;
-       CRYPTO_add(&cert->references, 1, CRYPTO_LOCK_X509);
-       return 1;
-       }
-
-int OCSP_basic_sign(OCSP_BASICRESP *brsp, 
-                       X509 *signer, EVP_PKEY *key, const EVP_MD *dgst,
-                       STACK_OF(X509) *certs, unsigned long flags)
-        {
-       int i;
-       OCSP_RESPID *rid;
-
-       if (!X509_check_private_key(signer, key))
-               {
-               OCSPerr(OCSP_F_OCSP_BASIC_SIGN, OCSP_R_PRIVATE_KEY_DOES_NOT_MATCH_CERTIFICATE);
-               goto err;
-               }
-
-       if(!(flags & OCSP_NOCERTS))
-               {
-               if(!OCSP_basic_add1_cert(brsp, signer))
-                       goto err;
-               for (i = 0; i < sk_X509_num(certs); i++)
-                       {
-                       X509 *tmpcert = sk_X509_value(certs, i);
-                       if(!OCSP_basic_add1_cert(brsp, tmpcert))
-                               goto err;
-                       }
-               }
-
-       rid = brsp->tbsResponseData->responderId;
-       if (flags & OCSP_RESPID_KEY)
-               {
-               unsigned char md[SHA_DIGEST_LENGTH];
-               X509_pubkey_digest(signer, EVP_sha1(), md, NULL);
-               if (!(rid->value.byKey = ASN1_OCTET_STRING_new()))
-                       goto err;
-               if (!(ASN1_OCTET_STRING_set(rid->value.byKey, md, SHA_DIGEST_LENGTH)))
-                               goto err;
-               rid->type = V_OCSP_RESPID_KEY;
-               }
-       else
-               {
-               if (!X509_NAME_set(&rid->value.byName,
-                                       X509_get_subject_name(signer)))
-                               goto err;
-               rid->type = V_OCSP_RESPID_NAME;
-               }
-
-       if (!(flags & OCSP_NOTIME) &&
-               !X509_gmtime_adj(brsp->tbsResponseData->producedAt, 0))
-               goto err;
-
-       /* Right now, I think that not doing double hashing is the right
-          thing.       -- Richard Levitte */
-
-       if (!OCSP_BASICRESP_sign(brsp, key, dgst, 0)) goto err;
-
-       return 1;
-err:
-       return 0;
-       }
+{
+    if (resp->certs == NULL
+        && (resp->certs = sk_X509_new_null()) == NULL)
+        return 0;
+
+    if (!sk_X509_push(resp->certs, cert))
+        return 0;
+    X509_up_ref(cert);
+    return 1;
+}
+
+int OCSP_basic_sign_ctx(OCSP_BASICRESP *brsp,
+                    X509 *signer, EVP_MD_CTX *ctx,
+                    STACK_OF(X509) *certs, unsigned long flags)
+{
+    int i;
+    OCSP_RESPID *rid;
+
+    if (!ctx || !EVP_MD_CTX_pkey_ctx(ctx) || !EVP_PKEY_CTX_get0_pkey(EVP_MD_CTX_pkey_ctx(ctx)) ||
+        !X509_check_private_key(signer, EVP_PKEY_CTX_get0_pkey(EVP_MD_CTX_pkey_ctx(ctx)))) {
+        OCSPerr(OCSP_F_OCSP_BASIC_SIGN_CTX,
+                OCSP_R_PRIVATE_KEY_DOES_NOT_MATCH_CERTIFICATE);
+        goto err;
+    }
+
+    if (!(flags & OCSP_NOCERTS)) {
+        if (!OCSP_basic_add1_cert(brsp, signer))
+            goto err;
+        for (i = 0; i < sk_X509_num(certs); i++) {
+            X509 *tmpcert = sk_X509_value(certs, i);
+            if (!OCSP_basic_add1_cert(brsp, tmpcert))
+                goto err;
+        }
+    }
+
+    rid = &brsp->tbsResponseData.responderId;
+    if (flags & OCSP_RESPID_KEY) {
+        if (!OCSP_RESPID_set_by_key(rid, signer))
+            goto err;
+    } else if (!OCSP_RESPID_set_by_name(rid, signer)) {
+        goto err;
+    }
+
+    if (!(flags & OCSP_NOTIME) &&
+        !X509_gmtime_adj(brsp->tbsResponseData.producedAt, 0))
+        goto err;
+
+    /*
+     * Right now, I think that not doing double hashing is the right thing.
+     * -- Richard Levitte
+     */
+
+    if (!OCSP_BASICRESP_sign_ctx(brsp, ctx, 0))
+        goto err;
+
+    return 1;
+ err:
+    return 0;
+}
+
+int OCSP_basic_sign(OCSP_BASICRESP *brsp,
+                    X509 *signer, EVP_PKEY *key, const EVP_MD *dgst,
+                    STACK_OF(X509) *certs, unsigned long flags)
+{
+    EVP_MD_CTX *ctx = EVP_MD_CTX_new();
+    EVP_PKEY_CTX *pkctx = NULL;
+    int i;
+
+    if (!EVP_DigestSignInit(ctx, &pkctx, dgst, NULL, key)) {
+        EVP_MD_CTX_free(ctx);
+        return 1;
+    }
+    i = OCSP_basic_sign_ctx(brsp, signer, ctx, certs, flags);
+    EVP_MD_CTX_free(ctx);
+    return i;
+}
+
+int OCSP_RESPID_set_by_name(OCSP_RESPID *respid, X509 *cert)
+{
+    if (!X509_NAME_set(&respid->value.byName, X509_get_subject_name(cert)))
+        return 0;
+
+    respid->type = V_OCSP_RESPID_NAME;
+
+    return 1;
+}
+
+int OCSP_RESPID_set_by_key(OCSP_RESPID *respid, X509 *cert)
+{
+    ASN1_OCTET_STRING *byKey = NULL;
+    unsigned char md[SHA_DIGEST_LENGTH];
+
+    /* RFC2560 requires SHA1 */
+    if (!X509_pubkey_digest(cert, EVP_sha1(), md, NULL))
+        return 0;
+
+    byKey = ASN1_OCTET_STRING_new();
+    if (byKey == NULL)
+        return 0;
+
+    if (!(ASN1_OCTET_STRING_set(byKey, md, SHA_DIGEST_LENGTH))) {
+        ASN1_OCTET_STRING_free(byKey);
+        return 0;
+    }
+
+    respid->type = V_OCSP_RESPID_KEY;
+    respid->value.byKey = byKey;
+
+    return 1;
+}
+
+int OCSP_RESPID_match(OCSP_RESPID *respid, X509 *cert)
+{
+    if (respid->type == V_OCSP_RESPID_KEY) {
+        unsigned char md[SHA_DIGEST_LENGTH];
+
+        if (respid->value.byKey == NULL)
+            return 0;
+
+        /* RFC2560 requires SHA1 */
+        if (!X509_pubkey_digest(cert, EVP_sha1(), md, NULL))
+            return 0;
+
+        return (ASN1_STRING_length(respid->value.byKey) == SHA_DIGEST_LENGTH)
+            && (memcmp(ASN1_STRING_get0_data(respid->value.byKey), md,
+                       SHA_DIGEST_LENGTH) == 0);
+    } else if (respid->type == V_OCSP_RESPID_NAME) {
+        if (respid->value.byName == NULL)
+            return 0;
+
+        return X509_NAME_cmp(respid->value.byName,
+                             X509_get_subject_name(cert)) == 0;
+    }
+
+    return 0;
+}