diff options
author | jsing <> | 2015-02-10 05:25:45 +0000 |
---|---|---|
committer | jsing <> | 2015-02-10 05:25:45 +0000 |
commit | 2eecb536a9b8f1c8c2ea5f485be1748d475a131c (patch) | |
tree | a96c56e7d9c17b8f427e46811a048b0b099939e7 /src/lib/libcrypto/ts | |
parent | 420e4433e0663a16ac8ce2d0d644bc67b2ced591 (diff) | |
download | openbsd-2eecb536a9b8f1c8c2ea5f485be1748d475a131c.tar.gz openbsd-2eecb536a9b8f1c8c2ea5f485be1748d475a131c.tar.bz2 openbsd-2eecb536a9b8f1c8c2ea5f485be1748d475a131c.zip |
Manually expand ASN1_ITEM_rptr macros that should have been expanded with
the IMPLEMENT_ASN1_DUP_FUNCTION macro.
Diffstat (limited to 'src/lib/libcrypto/ts')
-rw-r--r-- | src/lib/libcrypto/ts/ts_asn1.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/lib/libcrypto/ts/ts_asn1.c b/src/lib/libcrypto/ts/ts_asn1.c index 888f8e3d98..d85f3690c0 100644 --- a/src/lib/libcrypto/ts/ts_asn1.c +++ b/src/lib/libcrypto/ts/ts_asn1.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ts_asn1.c,v 1.7 2015/02/10 04:21:50 jsing Exp $ */ | 1 | /* $OpenBSD: ts_asn1.c,v 1.8 2015/02/10 05:25:45 jsing Exp $ */ |
2 | /* Written by Nils Larsch for the OpenSSL project 2004. | 2 | /* Written by Nils Larsch for the OpenSSL project 2004. |
3 | */ | 3 | */ |
4 | /* ==================================================================== | 4 | /* ==================================================================== |
@@ -95,7 +95,7 @@ TS_MSG_IMPRINT_free(TS_MSG_IMPRINT *a) | |||
95 | TS_MSG_IMPRINT * | 95 | TS_MSG_IMPRINT * |
96 | TS_MSG_IMPRINT_dup(TS_MSG_IMPRINT *x) | 96 | TS_MSG_IMPRINT_dup(TS_MSG_IMPRINT *x) |
97 | { | 97 | { |
98 | return ASN1_item_dup(ASN1_ITEM_rptr(TS_MSG_IMPRINT), x); | 98 | return ASN1_item_dup(&TS_MSG_IMPRINT_it, x); |
99 | } | 99 | } |
100 | 100 | ||
101 | #ifndef OPENSSL_NO_BIO | 101 | #ifndef OPENSSL_NO_BIO |
@@ -164,7 +164,7 @@ TS_REQ_free(TS_REQ *a) | |||
164 | TS_REQ * | 164 | TS_REQ * |
165 | TS_REQ_dup(TS_REQ *x) | 165 | TS_REQ_dup(TS_REQ *x) |
166 | { | 166 | { |
167 | return ASN1_item_dup(ASN1_ITEM_rptr(TS_REQ), x); | 167 | return ASN1_item_dup(&TS_REQ_it, x); |
168 | } | 168 | } |
169 | 169 | ||
170 | #ifndef OPENSSL_NO_BIO | 170 | #ifndef OPENSSL_NO_BIO |
@@ -228,7 +228,7 @@ TS_ACCURACY_free(TS_ACCURACY *a) | |||
228 | TS_ACCURACY * | 228 | TS_ACCURACY * |
229 | TS_ACCURACY_dup(TS_ACCURACY *x) | 229 | TS_ACCURACY_dup(TS_ACCURACY *x) |
230 | { | 230 | { |
231 | return ASN1_item_dup(ASN1_ITEM_rptr(TS_ACCURACY), x); | 231 | return ASN1_item_dup(&TS_ACCURACY_it, x); |
232 | } | 232 | } |
233 | 233 | ||
234 | ASN1_SEQUENCE(TS_TST_INFO) = { | 234 | ASN1_SEQUENCE(TS_TST_INFO) = { |
@@ -273,7 +273,7 @@ TS_TST_INFO_free(TS_TST_INFO *a) | |||
273 | TS_TST_INFO * | 273 | TS_TST_INFO * |
274 | TS_TST_INFO_dup(TS_TST_INFO *x) | 274 | TS_TST_INFO_dup(TS_TST_INFO *x) |
275 | { | 275 | { |
276 | return ASN1_item_dup(ASN1_ITEM_rptr(TS_TST_INFO), x); | 276 | return ASN1_item_dup(&TS_TST_INFO_it, x); |
277 | } | 277 | } |
278 | 278 | ||
279 | #ifndef OPENSSL_NO_BIO | 279 | #ifndef OPENSSL_NO_BIO |
@@ -339,7 +339,7 @@ TS_STATUS_INFO_free(TS_STATUS_INFO *a) | |||
339 | TS_STATUS_INFO * | 339 | TS_STATUS_INFO * |
340 | TS_STATUS_INFO_dup(TS_STATUS_INFO *x) | 340 | TS_STATUS_INFO_dup(TS_STATUS_INFO *x) |
341 | { | 341 | { |
342 | return ASN1_item_dup(ASN1_ITEM_rptr(TS_STATUS_INFO), x); | 342 | return ASN1_item_dup(&TS_STATUS_INFO_it, x); |
343 | } | 343 | } |
344 | 344 | ||
345 | static int | 345 | static int |
@@ -421,7 +421,7 @@ TS_RESP_free(TS_RESP *a) | |||
421 | TS_RESP * | 421 | TS_RESP * |
422 | TS_RESP_dup(TS_RESP *x) | 422 | TS_RESP_dup(TS_RESP *x) |
423 | { | 423 | { |
424 | return ASN1_item_dup(ASN1_ITEM_rptr(TS_RESP), x); | 424 | return ASN1_item_dup(&TS_RESP_it, x); |
425 | } | 425 | } |
426 | 426 | ||
427 | #ifndef OPENSSL_NO_BIO | 427 | #ifndef OPENSSL_NO_BIO |
@@ -484,7 +484,7 @@ ESS_ISSUER_SERIAL_free(ESS_ISSUER_SERIAL *a) | |||
484 | ESS_ISSUER_SERIAL * | 484 | ESS_ISSUER_SERIAL * |
485 | ESS_ISSUER_SERIAL_dup(ESS_ISSUER_SERIAL *x) | 485 | ESS_ISSUER_SERIAL_dup(ESS_ISSUER_SERIAL *x) |
486 | { | 486 | { |
487 | return ASN1_item_dup(ASN1_ITEM_rptr(ESS_ISSUER_SERIAL), x); | 487 | return ASN1_item_dup(&ESS_ISSUER_SERIAL_it, x); |
488 | } | 488 | } |
489 | 489 | ||
490 | ASN1_SEQUENCE(ESS_CERT_ID) = { | 490 | ASN1_SEQUENCE(ESS_CERT_ID) = { |
@@ -521,7 +521,7 @@ ESS_CERT_ID_free(ESS_CERT_ID *a) | |||
521 | ESS_CERT_ID * | 521 | ESS_CERT_ID * |
522 | ESS_CERT_ID_dup(ESS_CERT_ID *x) | 522 | ESS_CERT_ID_dup(ESS_CERT_ID *x) |
523 | { | 523 | { |
524 | return ASN1_item_dup(ASN1_ITEM_rptr(ESS_CERT_ID), x); | 524 | return ASN1_item_dup(&ESS_CERT_ID_it, x); |
525 | } | 525 | } |
526 | 526 | ||
527 | ASN1_SEQUENCE(ESS_SIGNING_CERT) = { | 527 | ASN1_SEQUENCE(ESS_SIGNING_CERT) = { |
@@ -558,7 +558,7 @@ ESS_SIGNING_CERT_free(ESS_SIGNING_CERT *a) | |||
558 | ESS_SIGNING_CERT * | 558 | ESS_SIGNING_CERT * |
559 | ESS_SIGNING_CERT_dup(ESS_SIGNING_CERT *x) | 559 | ESS_SIGNING_CERT_dup(ESS_SIGNING_CERT *x) |
560 | { | 560 | { |
561 | return ASN1_item_dup(ASN1_ITEM_rptr(ESS_SIGNING_CERT), x); | 561 | return ASN1_item_dup(&ESS_SIGNING_CERT_it, x); |
562 | } | 562 | } |
563 | 563 | ||
564 | /* Getting encapsulated TS_TST_INFO object from PKCS7. */ | 564 | /* Getting encapsulated TS_TST_INFO object from PKCS7. */ |