From 35dfd9080d99d680c91e6b62428638e8f9582ad8 Mon Sep 17 00:00:00 2001 From: jsing <> Date: Fri, 30 Dec 2016 16:19:24 +0000 Subject: Expand ASN1_ITEM_rptr macros - no change in preprocessor output. --- src/lib/libcrypto/ocsp/ocsp.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/lib/libcrypto/ocsp') diff --git a/src/lib/libcrypto/ocsp/ocsp.h b/src/lib/libcrypto/ocsp/ocsp.h index 9e3e9304c1..e3fa6f5a3d 100644 --- a/src/lib/libcrypto/ocsp/ocsp.h +++ b/src/lib/libcrypto/ocsp/ocsp.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ocsp.h,v 1.10 2016/12/27 16:05:56 jsing Exp $ */ +/* $OpenBSD: ocsp.h,v 1.11 2016/12/30 16:19:04 jsing Exp $ */ /* Written by Tom Titchener for the OpenSSL * project. */ @@ -358,25 +358,25 @@ typedef struct ocsp_service_locator_st { bp,(char *)o, NULL,NULL,0,NULL,NULL) #define OCSP_REQUEST_sign(o,pkey,md) \ - ASN1_item_sign(ASN1_ITEM_rptr(OCSP_REQINFO), \ + ASN1_item_sign(&OCSP_REQINFO_it, \ o->optionalSignature->signatureAlgorithm,NULL, \ o->optionalSignature->signature,o->tbsRequest,pkey,md) #define OCSP_BASICRESP_sign(o,pkey,md,d) \ - ASN1_item_sign(ASN1_ITEM_rptr(OCSP_RESPDATA),o->signatureAlgorithm,NULL, \ + ASN1_item_sign(&OCSP_RESPDATA_it,o->signatureAlgorithm,NULL, \ o->signature,o->tbsResponseData,pkey,md) #define OCSP_REQUEST_verify(a,r) \ - ASN1_item_verify(ASN1_ITEM_rptr(OCSP_REQINFO), \ + ASN1_item_verify(&OCSP_REQINFO_it, \ a->optionalSignature->signatureAlgorithm, \ a->optionalSignature->signature,a->tbsRequest,r) #define OCSP_BASICRESP_verify(a,r,d) \ - ASN1_item_verify(ASN1_ITEM_rptr(OCSP_RESPDATA), \ + ASN1_item_verify(&OCSP_RESPDATA_it, \ a->signatureAlgorithm,a->signature,a->tbsResponseData,r) #define ASN1_BIT_STRING_digest(data,type,md,len) \ - ASN1_item_digest(ASN1_ITEM_rptr(ASN1_BIT_STRING),type,data,md,len) + ASN1_item_digest(&ASN1_BIT_STRING_it,type,data,md,len) #define OCSP_CERTSTATUS_dup(cs) \ ASN1_item_dup(&OCSP_CERTSTATUS_it, cs) -- cgit v1.2.3-55-g6feb