Use an OCTET STRING for the encoding of an OCSP nonce value.
[openssl.git] / crypto / ocsp / ocsp_lib.c
index 4cdc5f0..3875af1 100644 (file)
@@ -80,8 +80,16 @@ OCSP_CERTID *OCSP_cert_to_id(const EVP_MD *dgst, X509 *subject, X509 *issuer)
 #ifndef OPENSSL_NO_SHA1
        if(!dgst) dgst = EVP_sha1();
 #endif
-       iname = X509_get_issuer_name(subject);
-       serial = X509_get_serialNumber(subject);
+       if (subject)
+               {
+               iname = X509_get_issuer_name(subject);
+               serial = X509_get_serialNumber(subject);
+               }
+       else
+               {
+               iname = X509_get_subject_name(issuer);
+               serial = NULL;
+               }
        ikey = X509_get0_pubkey_bitstr(issuer);
        return OCSP_cert_id_new(dgst, iname, ikey, serial);
 }
@@ -115,12 +123,15 @@ OCSP_CERTID *OCSP_cert_id_new(const EVP_MD *dgst,
        if (!(ASN1_OCTET_STRING_set(cid->issuerNameHash, md, i))) goto err;
 
        /* Calculate the issuerKey hash, excluding tag and length */
-       EVP_Digest(issuerKey->data, issuerKey->length, md, &i, dgst);
+       EVP_Digest(issuerKey->data, issuerKey->length, md, &i, dgst, NULL);
 
        if (!(ASN1_OCTET_STRING_set(cid->issuerKeyHash, md, i))) goto err;
-       
-       if (cid->serialNumber != NULL) ASN1_INTEGER_free(cid->serialNumber);
-       if (!(cid->serialNumber = ASN1_INTEGER_dup(serialNumber))) goto err;
+
+       if (serialNumber)
+               {
+               ASN1_INTEGER_free(cid->serialNumber);
+               if (!(cid->serialNumber = ASN1_INTEGER_dup(serialNumber))) goto err;
+               }
        return cid;
 digerr:
        OCSPerr(OCSP_F_CERT_ID_NEW,OCSP_R_DIGEST_ERR);
@@ -147,24 +158,6 @@ int OCSP_id_cmp(OCSP_CERTID *a, OCSP_CERTID *b)
        return ASN1_INTEGER_cmp(a->serialNumber, b->serialNumber);
        }
 
-/* XXX assumes certs in signature are sorted root to leaf XXX */
-int OCSP_request_verify(OCSP_REQUEST *req, EVP_PKEY *pkey)
-        {
-       STACK_OF(X509) *sk;
-
-       if (!req->optionalSignature) return 0;
-       if (pkey == NULL)
-               {
-               if (!(sk = req->optionalSignature->certs)) return 0;
-               if (!(pkey=X509_get_pubkey(sk_X509_value(sk, sk_X509_num(sk)-1))))
-                       {
-                       OCSPerr(OCSP_F_REQUEST_VERIFY,OCSP_R_NO_PUBLIC_KEY);
-                       return 0;
-                       }
-               }
-       return OCSP_REQUEST_verify(req, pkey);
-        }
-
 
 /* Parse a URL and split it up into host, port and path components and whether
  * it is SSL.