diff options
| author | Joel Sing <jsing@cvs.openbsd.org> | 2016-12-30 16:19:25 +0000 |
|---|---|---|
| committer | Joel Sing <jsing@cvs.openbsd.org> | 2016-12-30 16:19:25 +0000 |
| commit | 692f984624e48550b2f8607c84f71a0f01c53210 (patch) | |
| tree | 8af4e883e8df6332b6f8c96cedec4cfc07d05f38 /lib | |
| parent | 57cb0248226d36a5449332a55be39a4cab6512ba (diff) | |
Expand ASN1_ITEM_rptr macros - no change in preprocessor output.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libcrypto/ocsp/ocsp.h | 12 | ||||
| -rw-r--r-- | lib/libcrypto/x509v3/x509v3.h | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/lib/libcrypto/ocsp/ocsp.h b/lib/libcrypto/ocsp/ocsp.h index 9e3e9304c1d..e3fa6f5a3de 100644 --- a/lib/libcrypto/ocsp/ocsp.h +++ b/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 <Tom_Titchener@groove.net> 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) diff --git a/lib/libcrypto/x509v3/x509v3.h b/lib/libcrypto/x509v3/x509v3.h index c0a543d406d..0a8f66f9179 100644 --- a/lib/libcrypto/x509v3/x509v3.h +++ b/lib/libcrypto/x509v3/x509v3.h @@ -1,4 +1,4 @@ -/* $OpenBSD: x509v3.h,v 1.20 2016/12/27 16:05:57 jsing Exp $ */ +/* $OpenBSD: x509v3.h,v 1.21 2016/12/30 16:19:24 jsing Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 1999. */ @@ -391,7 +391,7 @@ struct ISSUING_DIST_POINT_st X509V3_set_ctx(ctx, NULL, NULL, NULL, NULL, CTX_TEST) #define X509V3_set_ctx_nodb(ctx) (ctx)->db = NULL; -#define EXT_BITSTRING(nid, table) { nid, 0, ASN1_ITEM_ref(ASN1_BIT_STRING), \ +#define EXT_BITSTRING(nid, table) { nid, 0, &ASN1_BIT_STRING_it, \ 0,0,0,0, \ 0,0, \ (X509V3_EXT_I2V)i2v_ASN1_BIT_STRING, \ @@ -399,7 +399,7 @@ struct ISSUING_DIST_POINT_st NULL, NULL, \ table} -#define EXT_IA5STRING(nid) { nid, 0, ASN1_ITEM_ref(ASN1_IA5STRING), \ +#define EXT_IA5STRING(nid) { nid, 0, &ASN1_IA5STRING_it, \ 0,0,0,0, \ (X509V3_EXT_I2S)i2s_ASN1_IA5STRING, \ (X509V3_EXT_S2I)s2i_ASN1_IA5STRING, \ |