diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/libcrypto/asn1/x_algor.c | 4 | ||||
-rw-r--r-- | src/lib/libcrypto/asn1/x_attrib.c | 4 | ||||
-rw-r--r-- | src/lib/libcrypto/asn1/x_crl.c | 4 | ||||
-rw-r--r-- | src/lib/libcrypto/asn1/x_exten.c | 4 | ||||
-rw-r--r-- | src/lib/libcrypto/asn1/x_name.c | 6 | ||||
-rw-r--r-- | src/lib/libcrypto/asn1/x_req.c | 4 | ||||
-rw-r--r-- | src/lib/libcrypto/asn1/x_x509.c | 4 | ||||
-rw-r--r-- | src/lib/libcrypto/ocsp/ocsp_lib.c | 4 | ||||
-rw-r--r-- | src/lib/libcrypto/pkcs7/pk7_asn1.c | 4 | ||||
-rw-r--r-- | src/lib/libcrypto/ts/ts_asn1.c | 20 | ||||
-rw-r--r-- | src/lib/libssl/src/crypto/asn1/x_algor.c | 4 | ||||
-rw-r--r-- | src/lib/libssl/src/crypto/asn1/x_attrib.c | 4 | ||||
-rw-r--r-- | src/lib/libssl/src/crypto/asn1/x_crl.c | 4 | ||||
-rw-r--r-- | src/lib/libssl/src/crypto/asn1/x_exten.c | 4 | ||||
-rw-r--r-- | src/lib/libssl/src/crypto/asn1/x_name.c | 6 | ||||
-rw-r--r-- | src/lib/libssl/src/crypto/asn1/x_req.c | 4 | ||||
-rw-r--r-- | src/lib/libssl/src/crypto/asn1/x_x509.c | 4 | ||||
-rw-r--r-- | src/lib/libssl/src/crypto/ocsp/ocsp_lib.c | 4 | ||||
-rw-r--r-- | src/lib/libssl/src/crypto/pkcs7/pk7_asn1.c | 4 | ||||
-rw-r--r-- | src/lib/libssl/src/crypto/ts/ts_asn1.c | 20 |
20 files changed, 58 insertions, 58 deletions
diff --git a/src/lib/libcrypto/asn1/x_algor.c b/src/lib/libcrypto/asn1/x_algor.c index 63c4e028a6..7768c27eea 100644 --- a/src/lib/libcrypto/asn1/x_algor.c +++ b/src/lib/libcrypto/asn1/x_algor.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: x_algor.c,v 1.15 2015/02/10 04:21:50 jsing Exp $ */ | 1 | /* $OpenBSD: x_algor.c,v 1.16 2015/02/10 05:25:45 jsing Exp $ */ |
2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
3 | * project 2000. | 3 | * project 2000. |
4 | */ | 4 | */ |
@@ -100,7 +100,7 @@ IMPLEMENT_ASN1_ENCODE_FUNCTIONS_fname(X509_ALGORS, X509_ALGORS, X509_ALGORS) | |||
100 | X509_ALGOR * | 100 | X509_ALGOR * |
101 | X509_ALGOR_dup(X509_ALGOR *x) | 101 | X509_ALGOR_dup(X509_ALGOR *x) |
102 | { | 102 | { |
103 | return ASN1_item_dup(ASN1_ITEM_rptr(X509_ALGOR), x); | 103 | return ASN1_item_dup(&X509_ALGOR_it, x); |
104 | } | 104 | } |
105 | 105 | ||
106 | IMPLEMENT_STACK_OF(X509_ALGOR) | 106 | IMPLEMENT_STACK_OF(X509_ALGOR) |
diff --git a/src/lib/libcrypto/asn1/x_attrib.c b/src/lib/libcrypto/asn1/x_attrib.c index 4306bd6240..9c00906ded 100644 --- a/src/lib/libcrypto/asn1/x_attrib.c +++ b/src/lib/libcrypto/asn1/x_attrib.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: x_attrib.c,v 1.11 2015/02/10 04:21:50 jsing Exp $ */ | 1 | /* $OpenBSD: x_attrib.c,v 1.12 2015/02/10 05:25:45 jsing Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -122,7 +122,7 @@ X509_ATTRIBUTE_free(X509_ATTRIBUTE *a) | |||
122 | X509_ATTRIBUTE * | 122 | X509_ATTRIBUTE * |
123 | X509_ATTRIBUTE_dup(X509_ATTRIBUTE *x) | 123 | X509_ATTRIBUTE_dup(X509_ATTRIBUTE *x) |
124 | { | 124 | { |
125 | return ASN1_item_dup(ASN1_ITEM_rptr(X509_ATTRIBUTE), x); | 125 | return ASN1_item_dup(&X509_ATTRIBUTE_it, x); |
126 | } | 126 | } |
127 | 127 | ||
128 | X509_ATTRIBUTE * | 128 | X509_ATTRIBUTE * |
diff --git a/src/lib/libcrypto/asn1/x_crl.c b/src/lib/libcrypto/asn1/x_crl.c index 9919d576e4..6e743b15ae 100644 --- a/src/lib/libcrypto/asn1/x_crl.c +++ b/src/lib/libcrypto/asn1/x_crl.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: x_crl.c,v 1.20 2015/02/10 04:21:50 jsing Exp $ */ | 1 | /* $OpenBSD: x_crl.c,v 1.21 2015/02/10 05:25:45 jsing Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -416,7 +416,7 @@ X509_CRL_free(X509_CRL *a) | |||
416 | X509_CRL * | 416 | X509_CRL * |
417 | X509_CRL_dup(X509_CRL *x) | 417 | X509_CRL_dup(X509_CRL *x) |
418 | { | 418 | { |
419 | return ASN1_item_dup(ASN1_ITEM_rptr(X509_CRL), x); | 419 | return ASN1_item_dup(&X509_CRL_it, x); |
420 | } | 420 | } |
421 | 421 | ||
422 | static int | 422 | static int |
diff --git a/src/lib/libcrypto/asn1/x_exten.c b/src/lib/libcrypto/asn1/x_exten.c index ad26a9e851..f0ec29ea4f 100644 --- a/src/lib/libcrypto/asn1/x_exten.c +++ b/src/lib/libcrypto/asn1/x_exten.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: x_exten.c,v 1.11 2015/02/10 04:21:50 jsing Exp $ */ | 1 | /* $OpenBSD: x_exten.c,v 1.12 2015/02/10 05:25:45 jsing Exp $ */ |
2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
3 | * project 2000. | 3 | * project 2000. |
4 | */ | 4 | */ |
@@ -101,5 +101,5 @@ IMPLEMENT_ASN1_ENCODE_FUNCTIONS_fname(X509_EXTENSIONS, X509_EXTENSIONS, X509_EXT | |||
101 | X509_EXTENSION * | 101 | X509_EXTENSION * |
102 | X509_EXTENSION_dup(X509_EXTENSION *x) | 102 | X509_EXTENSION_dup(X509_EXTENSION *x) |
103 | { | 103 | { |
104 | return ASN1_item_dup(ASN1_ITEM_rptr(X509_EXTENSION), x); | 104 | return ASN1_item_dup(&X509_EXTENSION_it, x); |
105 | } | 105 | } |
diff --git a/src/lib/libcrypto/asn1/x_name.c b/src/lib/libcrypto/asn1/x_name.c index d77702e473..3bcd172973 100644 --- a/src/lib/libcrypto/asn1/x_name.c +++ b/src/lib/libcrypto/asn1/x_name.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: x_name.c,v 1.22 2015/02/10 04:21:50 jsing Exp $ */ | 1 | /* $OpenBSD: x_name.c,v 1.23 2015/02/10 05:25:45 jsing Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -121,7 +121,7 @@ X509_NAME_ENTRY_free(X509_NAME_ENTRY *a) | |||
121 | X509_NAME_ENTRY * | 121 | X509_NAME_ENTRY * |
122 | X509_NAME_ENTRY_dup(X509_NAME_ENTRY *x) | 122 | X509_NAME_ENTRY_dup(X509_NAME_ENTRY *x) |
123 | { | 123 | { |
124 | return ASN1_item_dup(ASN1_ITEM_rptr(X509_NAME_ENTRY), x); | 124 | return ASN1_item_dup(&X509_NAME_ENTRY_it, x); |
125 | } | 125 | } |
126 | 126 | ||
127 | /* For the "Name" type we need a SEQUENCE OF { SET OF X509_NAME_ENTRY } | 127 | /* For the "Name" type we need a SEQUENCE OF { SET OF X509_NAME_ENTRY } |
@@ -183,7 +183,7 @@ X509_NAME_free(X509_NAME *a) | |||
183 | X509_NAME * | 183 | X509_NAME * |
184 | X509_NAME_dup(X509_NAME *x) | 184 | X509_NAME_dup(X509_NAME *x) |
185 | { | 185 | { |
186 | return ASN1_item_dup(ASN1_ITEM_rptr(X509_NAME), x); | 186 | return ASN1_item_dup(&X509_NAME_it, x); |
187 | } | 187 | } |
188 | 188 | ||
189 | static int | 189 | static int |
diff --git a/src/lib/libcrypto/asn1/x_req.c b/src/lib/libcrypto/asn1/x_req.c index 42c7adb298..6ffcb9d03c 100644 --- a/src/lib/libcrypto/asn1/x_req.c +++ b/src/lib/libcrypto/asn1/x_req.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: x_req.c,v 1.12 2015/02/10 04:21:50 jsing Exp $ */ | 1 | /* $OpenBSD: x_req.c,v 1.13 2015/02/10 05:25:45 jsing Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -163,5 +163,5 @@ X509_REQ_free(X509_REQ *a) | |||
163 | X509_REQ * | 163 | X509_REQ * |
164 | X509_REQ_dup(X509_REQ *x) | 164 | X509_REQ_dup(X509_REQ *x) |
165 | { | 165 | { |
166 | return ASN1_item_dup(ASN1_ITEM_rptr(X509_REQ), x); | 166 | return ASN1_item_dup(&X509_REQ_it, x); |
167 | } | 167 | } |
diff --git a/src/lib/libcrypto/asn1/x_x509.c b/src/lib/libcrypto/asn1/x_x509.c index a2778911cd..77ec8c41cf 100644 --- a/src/lib/libcrypto/asn1/x_x509.c +++ b/src/lib/libcrypto/asn1/x_x509.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: x_x509.c,v 1.19 2015/02/10 04:21:50 jsing Exp $ */ | 1 | /* $OpenBSD: x_x509.c,v 1.20 2015/02/10 05:25:45 jsing Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -191,7 +191,7 @@ X509_free(X509 *a) | |||
191 | X509 * | 191 | X509 * |
192 | X509_dup(X509 *x) | 192 | X509_dup(X509 *x) |
193 | { | 193 | { |
194 | return ASN1_item_dup(ASN1_ITEM_rptr(X509), x); | 194 | return ASN1_item_dup(&X509_it, x); |
195 | } | 195 | } |
196 | 196 | ||
197 | int | 197 | int |
diff --git a/src/lib/libcrypto/ocsp/ocsp_lib.c b/src/lib/libcrypto/ocsp/ocsp_lib.c index 099cc26cd7..be5bf7dab5 100644 --- a/src/lib/libcrypto/ocsp/ocsp_lib.c +++ b/src/lib/libcrypto/ocsp/ocsp_lib.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ocsp_lib.c,v 1.17 2015/02/10 04:21:50 jsing Exp $ */ | 1 | /* $OpenBSD: ocsp_lib.c,v 1.18 2015/02/10 05:25:45 jsing Exp $ */ |
2 | /* Written by Tom Titchener <Tom_Titchener@groove.net> for the OpenSSL | 2 | /* Written by Tom Titchener <Tom_Titchener@groove.net> for the OpenSSL |
3 | * project. */ | 3 | * project. */ |
4 | 4 | ||
@@ -278,5 +278,5 @@ err: | |||
278 | OCSP_CERTID * | 278 | OCSP_CERTID * |
279 | OCSP_CERTID_dup(OCSP_CERTID *x) | 279 | OCSP_CERTID_dup(OCSP_CERTID *x) |
280 | { | 280 | { |
281 | return ASN1_item_dup(ASN1_ITEM_rptr(OCSP_CERTID), x); | 281 | return ASN1_item_dup(&OCSP_CERTID_it, x); |
282 | } | 282 | } |
diff --git a/src/lib/libcrypto/pkcs7/pk7_asn1.c b/src/lib/libcrypto/pkcs7/pk7_asn1.c index 5e8d69413f..6a1046bcb8 100644 --- a/src/lib/libcrypto/pkcs7/pk7_asn1.c +++ b/src/lib/libcrypto/pkcs7/pk7_asn1.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: pk7_asn1.c,v 1.9 2015/02/10 04:21:50 jsing Exp $ */ | 1 | /* $OpenBSD: pk7_asn1.c,v 1.10 2015/02/10 05:25:45 jsing Exp $ */ |
2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
3 | * project 2000. | 3 | * project 2000. |
4 | */ | 4 | */ |
@@ -146,7 +146,7 @@ IMPLEMENT_ASN1_NDEF_FUNCTION(PKCS7) | |||
146 | PKCS7 * | 146 | PKCS7 * |
147 | PKCS7_dup(PKCS7 *x) | 147 | PKCS7_dup(PKCS7 *x) |
148 | { | 148 | { |
149 | return ASN1_item_dup(ASN1_ITEM_rptr(PKCS7), x); | 149 | return ASN1_item_dup(&PKCS7_it, x); |
150 | } | 150 | } |
151 | 151 | ||
152 | ASN1_NDEF_SEQUENCE(PKCS7_SIGNED) = { | 152 | ASN1_NDEF_SEQUENCE(PKCS7_SIGNED) = { |
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. */ |
diff --git a/src/lib/libssl/src/crypto/asn1/x_algor.c b/src/lib/libssl/src/crypto/asn1/x_algor.c index 63c4e028a6..7768c27eea 100644 --- a/src/lib/libssl/src/crypto/asn1/x_algor.c +++ b/src/lib/libssl/src/crypto/asn1/x_algor.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: x_algor.c,v 1.15 2015/02/10 04:21:50 jsing Exp $ */ | 1 | /* $OpenBSD: x_algor.c,v 1.16 2015/02/10 05:25:45 jsing Exp $ */ |
2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
3 | * project 2000. | 3 | * project 2000. |
4 | */ | 4 | */ |
@@ -100,7 +100,7 @@ IMPLEMENT_ASN1_ENCODE_FUNCTIONS_fname(X509_ALGORS, X509_ALGORS, X509_ALGORS) | |||
100 | X509_ALGOR * | 100 | X509_ALGOR * |
101 | X509_ALGOR_dup(X509_ALGOR *x) | 101 | X509_ALGOR_dup(X509_ALGOR *x) |
102 | { | 102 | { |
103 | return ASN1_item_dup(ASN1_ITEM_rptr(X509_ALGOR), x); | 103 | return ASN1_item_dup(&X509_ALGOR_it, x); |
104 | } | 104 | } |
105 | 105 | ||
106 | IMPLEMENT_STACK_OF(X509_ALGOR) | 106 | IMPLEMENT_STACK_OF(X509_ALGOR) |
diff --git a/src/lib/libssl/src/crypto/asn1/x_attrib.c b/src/lib/libssl/src/crypto/asn1/x_attrib.c index 4306bd6240..9c00906ded 100644 --- a/src/lib/libssl/src/crypto/asn1/x_attrib.c +++ b/src/lib/libssl/src/crypto/asn1/x_attrib.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: x_attrib.c,v 1.11 2015/02/10 04:21:50 jsing Exp $ */ | 1 | /* $OpenBSD: x_attrib.c,v 1.12 2015/02/10 05:25:45 jsing Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -122,7 +122,7 @@ X509_ATTRIBUTE_free(X509_ATTRIBUTE *a) | |||
122 | X509_ATTRIBUTE * | 122 | X509_ATTRIBUTE * |
123 | X509_ATTRIBUTE_dup(X509_ATTRIBUTE *x) | 123 | X509_ATTRIBUTE_dup(X509_ATTRIBUTE *x) |
124 | { | 124 | { |
125 | return ASN1_item_dup(ASN1_ITEM_rptr(X509_ATTRIBUTE), x); | 125 | return ASN1_item_dup(&X509_ATTRIBUTE_it, x); |
126 | } | 126 | } |
127 | 127 | ||
128 | X509_ATTRIBUTE * | 128 | X509_ATTRIBUTE * |
diff --git a/src/lib/libssl/src/crypto/asn1/x_crl.c b/src/lib/libssl/src/crypto/asn1/x_crl.c index 9919d576e4..6e743b15ae 100644 --- a/src/lib/libssl/src/crypto/asn1/x_crl.c +++ b/src/lib/libssl/src/crypto/asn1/x_crl.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: x_crl.c,v 1.20 2015/02/10 04:21:50 jsing Exp $ */ | 1 | /* $OpenBSD: x_crl.c,v 1.21 2015/02/10 05:25:45 jsing Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -416,7 +416,7 @@ X509_CRL_free(X509_CRL *a) | |||
416 | X509_CRL * | 416 | X509_CRL * |
417 | X509_CRL_dup(X509_CRL *x) | 417 | X509_CRL_dup(X509_CRL *x) |
418 | { | 418 | { |
419 | return ASN1_item_dup(ASN1_ITEM_rptr(X509_CRL), x); | 419 | return ASN1_item_dup(&X509_CRL_it, x); |
420 | } | 420 | } |
421 | 421 | ||
422 | static int | 422 | static int |
diff --git a/src/lib/libssl/src/crypto/asn1/x_exten.c b/src/lib/libssl/src/crypto/asn1/x_exten.c index ad26a9e851..f0ec29ea4f 100644 --- a/src/lib/libssl/src/crypto/asn1/x_exten.c +++ b/src/lib/libssl/src/crypto/asn1/x_exten.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: x_exten.c,v 1.11 2015/02/10 04:21:50 jsing Exp $ */ | 1 | /* $OpenBSD: x_exten.c,v 1.12 2015/02/10 05:25:45 jsing Exp $ */ |
2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
3 | * project 2000. | 3 | * project 2000. |
4 | */ | 4 | */ |
@@ -101,5 +101,5 @@ IMPLEMENT_ASN1_ENCODE_FUNCTIONS_fname(X509_EXTENSIONS, X509_EXTENSIONS, X509_EXT | |||
101 | X509_EXTENSION * | 101 | X509_EXTENSION * |
102 | X509_EXTENSION_dup(X509_EXTENSION *x) | 102 | X509_EXTENSION_dup(X509_EXTENSION *x) |
103 | { | 103 | { |
104 | return ASN1_item_dup(ASN1_ITEM_rptr(X509_EXTENSION), x); | 104 | return ASN1_item_dup(&X509_EXTENSION_it, x); |
105 | } | 105 | } |
diff --git a/src/lib/libssl/src/crypto/asn1/x_name.c b/src/lib/libssl/src/crypto/asn1/x_name.c index d77702e473..3bcd172973 100644 --- a/src/lib/libssl/src/crypto/asn1/x_name.c +++ b/src/lib/libssl/src/crypto/asn1/x_name.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: x_name.c,v 1.22 2015/02/10 04:21:50 jsing Exp $ */ | 1 | /* $OpenBSD: x_name.c,v 1.23 2015/02/10 05:25:45 jsing Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -121,7 +121,7 @@ X509_NAME_ENTRY_free(X509_NAME_ENTRY *a) | |||
121 | X509_NAME_ENTRY * | 121 | X509_NAME_ENTRY * |
122 | X509_NAME_ENTRY_dup(X509_NAME_ENTRY *x) | 122 | X509_NAME_ENTRY_dup(X509_NAME_ENTRY *x) |
123 | { | 123 | { |
124 | return ASN1_item_dup(ASN1_ITEM_rptr(X509_NAME_ENTRY), x); | 124 | return ASN1_item_dup(&X509_NAME_ENTRY_it, x); |
125 | } | 125 | } |
126 | 126 | ||
127 | /* For the "Name" type we need a SEQUENCE OF { SET OF X509_NAME_ENTRY } | 127 | /* For the "Name" type we need a SEQUENCE OF { SET OF X509_NAME_ENTRY } |
@@ -183,7 +183,7 @@ X509_NAME_free(X509_NAME *a) | |||
183 | X509_NAME * | 183 | X509_NAME * |
184 | X509_NAME_dup(X509_NAME *x) | 184 | X509_NAME_dup(X509_NAME *x) |
185 | { | 185 | { |
186 | return ASN1_item_dup(ASN1_ITEM_rptr(X509_NAME), x); | 186 | return ASN1_item_dup(&X509_NAME_it, x); |
187 | } | 187 | } |
188 | 188 | ||
189 | static int | 189 | static int |
diff --git a/src/lib/libssl/src/crypto/asn1/x_req.c b/src/lib/libssl/src/crypto/asn1/x_req.c index 42c7adb298..6ffcb9d03c 100644 --- a/src/lib/libssl/src/crypto/asn1/x_req.c +++ b/src/lib/libssl/src/crypto/asn1/x_req.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: x_req.c,v 1.12 2015/02/10 04:21:50 jsing Exp $ */ | 1 | /* $OpenBSD: x_req.c,v 1.13 2015/02/10 05:25:45 jsing Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -163,5 +163,5 @@ X509_REQ_free(X509_REQ *a) | |||
163 | X509_REQ * | 163 | X509_REQ * |
164 | X509_REQ_dup(X509_REQ *x) | 164 | X509_REQ_dup(X509_REQ *x) |
165 | { | 165 | { |
166 | return ASN1_item_dup(ASN1_ITEM_rptr(X509_REQ), x); | 166 | return ASN1_item_dup(&X509_REQ_it, x); |
167 | } | 167 | } |
diff --git a/src/lib/libssl/src/crypto/asn1/x_x509.c b/src/lib/libssl/src/crypto/asn1/x_x509.c index a2778911cd..77ec8c41cf 100644 --- a/src/lib/libssl/src/crypto/asn1/x_x509.c +++ b/src/lib/libssl/src/crypto/asn1/x_x509.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: x_x509.c,v 1.19 2015/02/10 04:21:50 jsing Exp $ */ | 1 | /* $OpenBSD: x_x509.c,v 1.20 2015/02/10 05:25:45 jsing Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -191,7 +191,7 @@ X509_free(X509 *a) | |||
191 | X509 * | 191 | X509 * |
192 | X509_dup(X509 *x) | 192 | X509_dup(X509 *x) |
193 | { | 193 | { |
194 | return ASN1_item_dup(ASN1_ITEM_rptr(X509), x); | 194 | return ASN1_item_dup(&X509_it, x); |
195 | } | 195 | } |
196 | 196 | ||
197 | int | 197 | int |
diff --git a/src/lib/libssl/src/crypto/ocsp/ocsp_lib.c b/src/lib/libssl/src/crypto/ocsp/ocsp_lib.c index 099cc26cd7..be5bf7dab5 100644 --- a/src/lib/libssl/src/crypto/ocsp/ocsp_lib.c +++ b/src/lib/libssl/src/crypto/ocsp/ocsp_lib.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ocsp_lib.c,v 1.17 2015/02/10 04:21:50 jsing Exp $ */ | 1 | /* $OpenBSD: ocsp_lib.c,v 1.18 2015/02/10 05:25:45 jsing Exp $ */ |
2 | /* Written by Tom Titchener <Tom_Titchener@groove.net> for the OpenSSL | 2 | /* Written by Tom Titchener <Tom_Titchener@groove.net> for the OpenSSL |
3 | * project. */ | 3 | * project. */ |
4 | 4 | ||
@@ -278,5 +278,5 @@ err: | |||
278 | OCSP_CERTID * | 278 | OCSP_CERTID * |
279 | OCSP_CERTID_dup(OCSP_CERTID *x) | 279 | OCSP_CERTID_dup(OCSP_CERTID *x) |
280 | { | 280 | { |
281 | return ASN1_item_dup(ASN1_ITEM_rptr(OCSP_CERTID), x); | 281 | return ASN1_item_dup(&OCSP_CERTID_it, x); |
282 | } | 282 | } |
diff --git a/src/lib/libssl/src/crypto/pkcs7/pk7_asn1.c b/src/lib/libssl/src/crypto/pkcs7/pk7_asn1.c index 5e8d69413f..6a1046bcb8 100644 --- a/src/lib/libssl/src/crypto/pkcs7/pk7_asn1.c +++ b/src/lib/libssl/src/crypto/pkcs7/pk7_asn1.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: pk7_asn1.c,v 1.9 2015/02/10 04:21:50 jsing Exp $ */ | 1 | /* $OpenBSD: pk7_asn1.c,v 1.10 2015/02/10 05:25:45 jsing Exp $ */ |
2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
3 | * project 2000. | 3 | * project 2000. |
4 | */ | 4 | */ |
@@ -146,7 +146,7 @@ IMPLEMENT_ASN1_NDEF_FUNCTION(PKCS7) | |||
146 | PKCS7 * | 146 | PKCS7 * |
147 | PKCS7_dup(PKCS7 *x) | 147 | PKCS7_dup(PKCS7 *x) |
148 | { | 148 | { |
149 | return ASN1_item_dup(ASN1_ITEM_rptr(PKCS7), x); | 149 | return ASN1_item_dup(&PKCS7_it, x); |
150 | } | 150 | } |
151 | 151 | ||
152 | ASN1_NDEF_SEQUENCE(PKCS7_SIGNED) = { | 152 | ASN1_NDEF_SEQUENCE(PKCS7_SIGNED) = { |
diff --git a/src/lib/libssl/src/crypto/ts/ts_asn1.c b/src/lib/libssl/src/crypto/ts/ts_asn1.c index 888f8e3d98..d85f3690c0 100644 --- a/src/lib/libssl/src/crypto/ts/ts_asn1.c +++ b/src/lib/libssl/src/crypto/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. */ |