summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/asn1
diff options
context:
space:
mode:
authorjsing <>2015-02-10 04:21:50 +0000
committerjsing <>2015-02-10 04:21:50 +0000
commit9bd525742fa9bbaf8f56cda1167eb91c447404a5 (patch)
tree08b1f7d61accebd33520532c3d344995d3a51ea4 /src/lib/libcrypto/asn1
parent0e4218e3e293b3085109f78bed8948a0bf9f1511 (diff)
downloadopenbsd-9bd525742fa9bbaf8f56cda1167eb91c447404a5.tar.gz
openbsd-9bd525742fa9bbaf8f56cda1167eb91c447404a5.tar.bz2
openbsd-9bd525742fa9bbaf8f56cda1167eb91c447404a5.zip
Expand the IMPLEMENT_ASN1_DUP_FUNCTION macro so that the code is visible
and functions can be readily located. Change has been scripted and the generated assembly only differs by changes to line numbers. Discussed with beck@ miod@ tedu@
Diffstat (limited to 'src/lib/libcrypto/asn1')
-rw-r--r--src/lib/libcrypto/asn1/x_algor.c9
-rw-r--r--src/lib/libcrypto/asn1/x_attrib.c9
-rw-r--r--src/lib/libcrypto/asn1/x_crl.c9
-rw-r--r--src/lib/libcrypto/asn1/x_exten.c9
-rw-r--r--src/lib/libcrypto/asn1/x_name.c16
-rw-r--r--src/lib/libcrypto/asn1/x_req.c9
-rw-r--r--src/lib/libcrypto/asn1/x_x509.c9
7 files changed, 55 insertions, 15 deletions
diff --git a/src/lib/libcrypto/asn1/x_algor.c b/src/lib/libcrypto/asn1/x_algor.c
index 7d264f9fd3..63c4e028a6 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.14 2015/02/09 15:05:59 jsing Exp $ */ 1/* $OpenBSD: x_algor.c,v 1.15 2015/02/10 04:21:50 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 */
@@ -96,7 +96,12 @@ X509_ALGOR_free(X509_ALGOR *a)
96 ASN1_item_free((ASN1_VALUE *)a, &X509_ALGOR_it); 96 ASN1_item_free((ASN1_VALUE *)a, &X509_ALGOR_it);
97} 97}
98IMPLEMENT_ASN1_ENCODE_FUNCTIONS_fname(X509_ALGORS, X509_ALGORS, X509_ALGORS) 98IMPLEMENT_ASN1_ENCODE_FUNCTIONS_fname(X509_ALGORS, X509_ALGORS, X509_ALGORS)
99IMPLEMENT_ASN1_DUP_FUNCTION(X509_ALGOR) 99
100X509_ALGOR *
101X509_ALGOR_dup(X509_ALGOR *x)
102{
103 return ASN1_item_dup(ASN1_ITEM_rptr(X509_ALGOR), x);
104}
100 105
101IMPLEMENT_STACK_OF(X509_ALGOR) 106IMPLEMENT_STACK_OF(X509_ALGOR)
102IMPLEMENT_ASN1_SET_OF(X509_ALGOR) 107IMPLEMENT_ASN1_SET_OF(X509_ALGOR)
diff --git a/src/lib/libcrypto/asn1/x_attrib.c b/src/lib/libcrypto/asn1/x_attrib.c
index aafd5dd485..4306bd6240 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.10 2015/02/09 15:05:59 jsing Exp $ */ 1/* $OpenBSD: x_attrib.c,v 1.11 2015/02/10 04:21:50 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 *
@@ -118,7 +118,12 @@ X509_ATTRIBUTE_free(X509_ATTRIBUTE *a)
118{ 118{
119 ASN1_item_free((ASN1_VALUE *)a, &X509_ATTRIBUTE_it); 119 ASN1_item_free((ASN1_VALUE *)a, &X509_ATTRIBUTE_it);
120} 120}
121IMPLEMENT_ASN1_DUP_FUNCTION(X509_ATTRIBUTE) 121
122X509_ATTRIBUTE *
123X509_ATTRIBUTE_dup(X509_ATTRIBUTE *x)
124{
125 return ASN1_item_dup(ASN1_ITEM_rptr(X509_ATTRIBUTE), x);
126}
122 127
123X509_ATTRIBUTE * 128X509_ATTRIBUTE *
124X509_ATTRIBUTE_create(int nid, int atrtype, void *value) 129X509_ATTRIBUTE_create(int nid, int atrtype, void *value)
diff --git a/src/lib/libcrypto/asn1/x_crl.c b/src/lib/libcrypto/asn1/x_crl.c
index 2539fd92c4..9919d576e4 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.19 2015/02/09 15:05:59 jsing Exp $ */ 1/* $OpenBSD: x_crl.c,v 1.20 2015/02/10 04:21:50 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 *
@@ -412,7 +412,12 @@ X509_CRL_free(X509_CRL *a)
412{ 412{
413 ASN1_item_free((ASN1_VALUE *)a, &X509_CRL_it); 413 ASN1_item_free((ASN1_VALUE *)a, &X509_CRL_it);
414} 414}
415IMPLEMENT_ASN1_DUP_FUNCTION(X509_CRL) 415
416X509_CRL *
417X509_CRL_dup(X509_CRL *x)
418{
419 return ASN1_item_dup(ASN1_ITEM_rptr(X509_CRL), x);
420}
416 421
417static int 422static int
418X509_REVOKED_cmp(const X509_REVOKED * const *a, const X509_REVOKED * const *b) 423X509_REVOKED_cmp(const X509_REVOKED * const *a, const X509_REVOKED * const *b)
diff --git a/src/lib/libcrypto/asn1/x_exten.c b/src/lib/libcrypto/asn1/x_exten.c
index 40c521ec80..ad26a9e851 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.10 2015/02/09 15:05:59 jsing Exp $ */ 1/* $OpenBSD: x_exten.c,v 1.11 2015/02/10 04:21:50 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 */
@@ -97,4 +97,9 @@ X509_EXTENSION_free(X509_EXTENSION *a)
97 ASN1_item_free((ASN1_VALUE *)a, &X509_EXTENSION_it); 97 ASN1_item_free((ASN1_VALUE *)a, &X509_EXTENSION_it);
98} 98}
99IMPLEMENT_ASN1_ENCODE_FUNCTIONS_fname(X509_EXTENSIONS, X509_EXTENSIONS, X509_EXTENSIONS) 99IMPLEMENT_ASN1_ENCODE_FUNCTIONS_fname(X509_EXTENSIONS, X509_EXTENSIONS, X509_EXTENSIONS)
100IMPLEMENT_ASN1_DUP_FUNCTION(X509_EXTENSION) 100
101X509_EXTENSION *
102X509_EXTENSION_dup(X509_EXTENSION *x)
103{
104 return ASN1_item_dup(ASN1_ITEM_rptr(X509_EXTENSION), x);
105}
diff --git a/src/lib/libcrypto/asn1/x_name.c b/src/lib/libcrypto/asn1/x_name.c
index a7f0e14d13..d77702e473 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.21 2015/02/09 15:05:59 jsing Exp $ */ 1/* $OpenBSD: x_name.c,v 1.22 2015/02/10 04:21:50 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 *
@@ -117,7 +117,12 @@ X509_NAME_ENTRY_free(X509_NAME_ENTRY *a)
117{ 117{
118 ASN1_item_free((ASN1_VALUE *)a, &X509_NAME_ENTRY_it); 118 ASN1_item_free((ASN1_VALUE *)a, &X509_NAME_ENTRY_it);
119} 119}
120IMPLEMENT_ASN1_DUP_FUNCTION(X509_NAME_ENTRY) 120
121X509_NAME_ENTRY *
122X509_NAME_ENTRY_dup(X509_NAME_ENTRY *x)
123{
124 return ASN1_item_dup(ASN1_ITEM_rptr(X509_NAME_ENTRY), x);
125}
121 126
122/* 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 }
123 * so declare two template wrappers for this 128 * so declare two template wrappers for this
@@ -174,7 +179,12 @@ X509_NAME_free(X509_NAME *a)
174{ 179{
175 ASN1_item_free((ASN1_VALUE *)a, &X509_NAME_it); 180 ASN1_item_free((ASN1_VALUE *)a, &X509_NAME_it);
176} 181}
177IMPLEMENT_ASN1_DUP_FUNCTION(X509_NAME) 182
183X509_NAME *
184X509_NAME_dup(X509_NAME *x)
185{
186 return ASN1_item_dup(ASN1_ITEM_rptr(X509_NAME), x);
187}
178 188
179static int 189static int
180x509_name_ex_new(ASN1_VALUE **val, const ASN1_ITEM *it) 190x509_name_ex_new(ASN1_VALUE **val, const ASN1_ITEM *it)
diff --git a/src/lib/libcrypto/asn1/x_req.c b/src/lib/libcrypto/asn1/x_req.c
index 89b2d88d15..42c7adb298 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.11 2015/02/09 15:05:59 jsing Exp $ */ 1/* $OpenBSD: x_req.c,v 1.12 2015/02/10 04:21:50 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 *
@@ -159,4 +159,9 @@ X509_REQ_free(X509_REQ *a)
159{ 159{
160 ASN1_item_free((ASN1_VALUE *)a, &X509_REQ_it); 160 ASN1_item_free((ASN1_VALUE *)a, &X509_REQ_it);
161} 161}
162IMPLEMENT_ASN1_DUP_FUNCTION(X509_REQ) 162
163X509_REQ *
164X509_REQ_dup(X509_REQ *x)
165{
166 return ASN1_item_dup(ASN1_ITEM_rptr(X509_REQ), x);
167}
diff --git a/src/lib/libcrypto/asn1/x_x509.c b/src/lib/libcrypto/asn1/x_x509.c
index 8fd2d7684b..a2778911cd 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.18 2015/02/09 15:05:59 jsing Exp $ */ 1/* $OpenBSD: x_x509.c,v 1.19 2015/02/10 04:21:50 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 *
@@ -187,7 +187,12 @@ X509_free(X509 *a)
187{ 187{
188 ASN1_item_free((ASN1_VALUE *)a, &X509_it); 188 ASN1_item_free((ASN1_VALUE *)a, &X509_it);
189} 189}
190IMPLEMENT_ASN1_DUP_FUNCTION(X509) 190
191X509 *
192X509_dup(X509 *x)
193{
194 return ASN1_item_dup(ASN1_ITEM_rptr(X509), x);
195}
191 196
192int 197int
193X509_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func, 198X509_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func,