summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorjsing <>2015-10-16 15:12:30 +0000
committerjsing <>2015-10-16 15:12:30 +0000
commitfe7a74ab075d619393e624cc3430865b7b172e15 (patch)
tree67463dbd0a4cdf7d101b056d0143b834e82cd830 /src
parent347b8ec58659d39fe107b7425448fc5de0eeab85 (diff)
downloadopenbsd-fe7a74ab075d619393e624cc3430865b7b172e15.tar.gz
openbsd-fe7a74ab075d619393e624cc3430865b7b172e15.tar.bz2
openbsd-fe7a74ab075d619393e624cc3430865b7b172e15.zip
Expand DECLARE_ASN1_ALLOC_FUNCTIONS and DECLARE_ASN1_FUNCTIONS_const
macros. The only change in the generated assembly is due to line numbering.
Diffstat (limited to 'src')
-rw-r--r--src/lib/libcrypto/asn1/n_pkey.c14
-rw-r--r--src/lib/libcrypto/ec/ec_asn1.c23
-rw-r--r--src/lib/libcrypto/ecdsa/ecs_asn1.c8
-rw-r--r--src/lib/libssl/src/crypto/asn1/n_pkey.c14
-rw-r--r--src/lib/libssl/src/crypto/ec/ec_asn1.c23
-rw-r--r--src/lib/libssl/src/crypto/ecdsa/ecs_asn1.c8
6 files changed, 68 insertions, 22 deletions
diff --git a/src/lib/libcrypto/asn1/n_pkey.c b/src/lib/libcrypto/asn1/n_pkey.c
index 664d39216b..bc78606d39 100644
--- a/src/lib/libcrypto/asn1/n_pkey.c
+++ b/src/lib/libcrypto/asn1/n_pkey.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: n_pkey.c,v 1.28 2015/10/16 15:09:28 jsing Exp $ */ 1/* $OpenBSD: n_pkey.c,v 1.29 2015/10/16 15:12:30 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 *
@@ -113,7 +113,11 @@ const ASN1_ITEM NETSCAPE_ENCRYPTED_PKEY_it = {
113 .sname = "NETSCAPE_ENCRYPTED_PKEY", 113 .sname = "NETSCAPE_ENCRYPTED_PKEY",
114}; 114};
115 115
116DECLARE_ASN1_FUNCTIONS_const(NETSCAPE_ENCRYPTED_PKEY) 116NETSCAPE_ENCRYPTED_PKEY *NETSCAPE_ENCRYPTED_PKEY_new(void);
117void NETSCAPE_ENCRYPTED_PKEY_free(NETSCAPE_ENCRYPTED_PKEY *a);
118NETSCAPE_ENCRYPTED_PKEY *d2i_NETSCAPE_ENCRYPTED_PKEY(NETSCAPE_ENCRYPTED_PKEY **a, const unsigned char **in, long len);
119int i2d_NETSCAPE_ENCRYPTED_PKEY(const NETSCAPE_ENCRYPTED_PKEY *a, unsigned char **out);
120extern const ASN1_ITEM NETSCAPE_ENCRYPTED_PKEY_it;
117 121
118NETSCAPE_ENCRYPTED_PKEY * 122NETSCAPE_ENCRYPTED_PKEY *
119d2i_NETSCAPE_ENCRYPTED_PKEY(NETSCAPE_ENCRYPTED_PKEY **a, const unsigned char **in, long len) 123d2i_NETSCAPE_ENCRYPTED_PKEY(NETSCAPE_ENCRYPTED_PKEY **a, const unsigned char **in, long len)
@@ -167,7 +171,11 @@ const ASN1_ITEM NETSCAPE_PKEY_it = {
167 .sname = "NETSCAPE_PKEY", 171 .sname = "NETSCAPE_PKEY",
168}; 172};
169 173
170DECLARE_ASN1_FUNCTIONS_const(NETSCAPE_PKEY) 174NETSCAPE_PKEY *NETSCAPE_PKEY_new(void);
175void NETSCAPE_PKEY_free(NETSCAPE_PKEY *a);
176NETSCAPE_PKEY *d2i_NETSCAPE_PKEY(NETSCAPE_PKEY **a, const unsigned char **in, long len);
177int i2d_NETSCAPE_PKEY(const NETSCAPE_PKEY *a, unsigned char **out);
178extern const ASN1_ITEM NETSCAPE_PKEY_it;
171 179
172NETSCAPE_PKEY * 180NETSCAPE_PKEY *
173d2i_NETSCAPE_PKEY(NETSCAPE_PKEY **a, const unsigned char **in, long len) 181d2i_NETSCAPE_PKEY(NETSCAPE_PKEY **a, const unsigned char **in, long len)
diff --git a/src/lib/libcrypto/ec/ec_asn1.c b/src/lib/libcrypto/ec/ec_asn1.c
index f937672d67..5aeb561531 100644
--- a/src/lib/libcrypto/ec/ec_asn1.c
+++ b/src/lib/libcrypto/ec/ec_asn1.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ec_asn1.c,v 1.19 2015/10/16 15:09:28 jsing Exp $ */ 1/* $OpenBSD: ec_asn1.c,v 1.20 2015/10/16 15:12:30 jsing Exp $ */
2/* 2/*
3 * Written by Nils Larsch for the OpenSSL project. 3 * Written by Nils Larsch for the OpenSSL project.
4 */ 4 */
@@ -232,7 +232,8 @@ const ASN1_ITEM X9_62_PENTANOMIAL_it = {
232 .sname = "X9_62_PENTANOMIAL", 232 .sname = "X9_62_PENTANOMIAL",
233}; 233};
234 234
235DECLARE_ASN1_ALLOC_FUNCTIONS(X9_62_PENTANOMIAL) 235X9_62_PENTANOMIAL *X9_62_PENTANOMIAL_new(void);
236void X9_62_PENTANOMIAL_free(X9_62_PENTANOMIAL *a);
236 237
237X9_62_PENTANOMIAL * 238X9_62_PENTANOMIAL *
238X9_62_PENTANOMIAL_new(void) 239X9_62_PENTANOMIAL_new(void)
@@ -333,7 +334,8 @@ const ASN1_ITEM X9_62_CHARACTERISTIC_TWO_it = {
333 .size = sizeof(X9_62_CHARACTERISTIC_TWO), 334 .size = sizeof(X9_62_CHARACTERISTIC_TWO),
334 .sname = "X9_62_CHARACTERISTIC_TWO", 335 .sname = "X9_62_CHARACTERISTIC_TWO",
335}; 336};
336DECLARE_ASN1_ALLOC_FUNCTIONS(X9_62_CHARACTERISTIC_TWO) 337X9_62_CHARACTERISTIC_TWO *X9_62_CHARACTERISTIC_TWO_new(void);
338void X9_62_CHARACTERISTIC_TWO_free(X9_62_CHARACTERISTIC_TWO *a);
337 339
338X9_62_CHARACTERISTIC_TWO * 340X9_62_CHARACTERISTIC_TWO *
339X9_62_CHARACTERISTIC_TWO_new(void) 341X9_62_CHARACTERISTIC_TWO_new(void)
@@ -504,7 +506,8 @@ const ASN1_ITEM ECPARAMETERS_it = {
504 .size = sizeof(ECPARAMETERS), 506 .size = sizeof(ECPARAMETERS),
505 .sname = "ECPARAMETERS", 507 .sname = "ECPARAMETERS",
506}; 508};
507DECLARE_ASN1_ALLOC_FUNCTIONS(ECPARAMETERS) 509ECPARAMETERS *ECPARAMETERS_new(void);
510void ECPARAMETERS_free(ECPARAMETERS *a);
508 511
509ECPARAMETERS * 512ECPARAMETERS *
510ECPARAMETERS_new(void) 513ECPARAMETERS_new(void)
@@ -552,7 +555,11 @@ const ASN1_ITEM ECPKPARAMETERS_it = {
552 .sname = "ECPKPARAMETERS", 555 .sname = "ECPKPARAMETERS",
553}; 556};
554 557
555DECLARE_ASN1_FUNCTIONS_const(ECPKPARAMETERS) 558ECPKPARAMETERS *ECPKPARAMETERS_new(void);
559void ECPKPARAMETERS_free(ECPKPARAMETERS *a);
560ECPKPARAMETERS *d2i_ECPKPARAMETERS(ECPKPARAMETERS **a, const unsigned char **in, long len);
561int i2d_ECPKPARAMETERS(const ECPKPARAMETERS *a, unsigned char **out);
562extern const ASN1_ITEM ECPKPARAMETERS_it;
556 563
557ECPKPARAMETERS * 564ECPKPARAMETERS *
558d2i_ECPKPARAMETERS(ECPKPARAMETERS **a, const unsigned char **in, long len) 565d2i_ECPKPARAMETERS(ECPKPARAMETERS **a, const unsigned char **in, long len)
@@ -620,7 +627,11 @@ const ASN1_ITEM EC_PRIVATEKEY_it = {
620 .sname = "EC_PRIVATEKEY", 627 .sname = "EC_PRIVATEKEY",
621}; 628};
622 629
623DECLARE_ASN1_FUNCTIONS_const(EC_PRIVATEKEY) 630EC_PRIVATEKEY *EC_PRIVATEKEY_new(void);
631void EC_PRIVATEKEY_free(EC_PRIVATEKEY *a);
632EC_PRIVATEKEY *d2i_EC_PRIVATEKEY(EC_PRIVATEKEY **a, const unsigned char **in, long len);
633int i2d_EC_PRIVATEKEY(const EC_PRIVATEKEY *a, unsigned char **out);
634extern const ASN1_ITEM EC_PRIVATEKEY_it;
624 635
625EC_PRIVATEKEY * 636EC_PRIVATEKEY *
626d2i_EC_PRIVATEKEY(EC_PRIVATEKEY **a, const unsigned char **in, long len) 637d2i_EC_PRIVATEKEY(EC_PRIVATEKEY **a, const unsigned char **in, long len)
diff --git a/src/lib/libcrypto/ecdsa/ecs_asn1.c b/src/lib/libcrypto/ecdsa/ecs_asn1.c
index 7f2d646c44..bb54307254 100644
--- a/src/lib/libcrypto/ecdsa/ecs_asn1.c
+++ b/src/lib/libcrypto/ecdsa/ecs_asn1.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ecs_asn1.c,v 1.6 2015/10/16 15:09:28 jsing Exp $ */ 1/* $OpenBSD: ecs_asn1.c,v 1.7 2015/10/16 15:12:30 jsing Exp $ */
2/* ==================================================================== 2/* ====================================================================
3 * Copyright (c) 2000-2002 The OpenSSL Project. All rights reserved. 3 * Copyright (c) 2000-2002 The OpenSSL Project. All rights reserved.
4 * 4 *
@@ -84,7 +84,11 @@ const ASN1_ITEM ECDSA_SIG_it = {
84 .sname = "ECDSA_SIG", 84 .sname = "ECDSA_SIG",
85}; 85};
86 86
87DECLARE_ASN1_FUNCTIONS_const(ECDSA_SIG) 87ECDSA_SIG *ECDSA_SIG_new(void);
88void ECDSA_SIG_free(ECDSA_SIG *a);
89ECDSA_SIG *d2i_ECDSA_SIG(ECDSA_SIG **a, const unsigned char **in, long len);
90int i2d_ECDSA_SIG(const ECDSA_SIG *a, unsigned char **out);
91extern const ASN1_ITEM ECDSA_SIG_it;
88 92
89ECDSA_SIG * 93ECDSA_SIG *
90d2i_ECDSA_SIG(ECDSA_SIG **a, const unsigned char **in, long len) 94d2i_ECDSA_SIG(ECDSA_SIG **a, const unsigned char **in, long len)
diff --git a/src/lib/libssl/src/crypto/asn1/n_pkey.c b/src/lib/libssl/src/crypto/asn1/n_pkey.c
index 664d39216b..bc78606d39 100644
--- a/src/lib/libssl/src/crypto/asn1/n_pkey.c
+++ b/src/lib/libssl/src/crypto/asn1/n_pkey.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: n_pkey.c,v 1.28 2015/10/16 15:09:28 jsing Exp $ */ 1/* $OpenBSD: n_pkey.c,v 1.29 2015/10/16 15:12:30 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 *
@@ -113,7 +113,11 @@ const ASN1_ITEM NETSCAPE_ENCRYPTED_PKEY_it = {
113 .sname = "NETSCAPE_ENCRYPTED_PKEY", 113 .sname = "NETSCAPE_ENCRYPTED_PKEY",
114}; 114};
115 115
116DECLARE_ASN1_FUNCTIONS_const(NETSCAPE_ENCRYPTED_PKEY) 116NETSCAPE_ENCRYPTED_PKEY *NETSCAPE_ENCRYPTED_PKEY_new(void);
117void NETSCAPE_ENCRYPTED_PKEY_free(NETSCAPE_ENCRYPTED_PKEY *a);
118NETSCAPE_ENCRYPTED_PKEY *d2i_NETSCAPE_ENCRYPTED_PKEY(NETSCAPE_ENCRYPTED_PKEY **a, const unsigned char **in, long len);
119int i2d_NETSCAPE_ENCRYPTED_PKEY(const NETSCAPE_ENCRYPTED_PKEY *a, unsigned char **out);
120extern const ASN1_ITEM NETSCAPE_ENCRYPTED_PKEY_it;
117 121
118NETSCAPE_ENCRYPTED_PKEY * 122NETSCAPE_ENCRYPTED_PKEY *
119d2i_NETSCAPE_ENCRYPTED_PKEY(NETSCAPE_ENCRYPTED_PKEY **a, const unsigned char **in, long len) 123d2i_NETSCAPE_ENCRYPTED_PKEY(NETSCAPE_ENCRYPTED_PKEY **a, const unsigned char **in, long len)
@@ -167,7 +171,11 @@ const ASN1_ITEM NETSCAPE_PKEY_it = {
167 .sname = "NETSCAPE_PKEY", 171 .sname = "NETSCAPE_PKEY",
168}; 172};
169 173
170DECLARE_ASN1_FUNCTIONS_const(NETSCAPE_PKEY) 174NETSCAPE_PKEY *NETSCAPE_PKEY_new(void);
175void NETSCAPE_PKEY_free(NETSCAPE_PKEY *a);
176NETSCAPE_PKEY *d2i_NETSCAPE_PKEY(NETSCAPE_PKEY **a, const unsigned char **in, long len);
177int i2d_NETSCAPE_PKEY(const NETSCAPE_PKEY *a, unsigned char **out);
178extern const ASN1_ITEM NETSCAPE_PKEY_it;
171 179
172NETSCAPE_PKEY * 180NETSCAPE_PKEY *
173d2i_NETSCAPE_PKEY(NETSCAPE_PKEY **a, const unsigned char **in, long len) 181d2i_NETSCAPE_PKEY(NETSCAPE_PKEY **a, const unsigned char **in, long len)
diff --git a/src/lib/libssl/src/crypto/ec/ec_asn1.c b/src/lib/libssl/src/crypto/ec/ec_asn1.c
index f937672d67..5aeb561531 100644
--- a/src/lib/libssl/src/crypto/ec/ec_asn1.c
+++ b/src/lib/libssl/src/crypto/ec/ec_asn1.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ec_asn1.c,v 1.19 2015/10/16 15:09:28 jsing Exp $ */ 1/* $OpenBSD: ec_asn1.c,v 1.20 2015/10/16 15:12:30 jsing Exp $ */
2/* 2/*
3 * Written by Nils Larsch for the OpenSSL project. 3 * Written by Nils Larsch for the OpenSSL project.
4 */ 4 */
@@ -232,7 +232,8 @@ const ASN1_ITEM X9_62_PENTANOMIAL_it = {
232 .sname = "X9_62_PENTANOMIAL", 232 .sname = "X9_62_PENTANOMIAL",
233}; 233};
234 234
235DECLARE_ASN1_ALLOC_FUNCTIONS(X9_62_PENTANOMIAL) 235X9_62_PENTANOMIAL *X9_62_PENTANOMIAL_new(void);
236void X9_62_PENTANOMIAL_free(X9_62_PENTANOMIAL *a);
236 237
237X9_62_PENTANOMIAL * 238X9_62_PENTANOMIAL *
238X9_62_PENTANOMIAL_new(void) 239X9_62_PENTANOMIAL_new(void)
@@ -333,7 +334,8 @@ const ASN1_ITEM X9_62_CHARACTERISTIC_TWO_it = {
333 .size = sizeof(X9_62_CHARACTERISTIC_TWO), 334 .size = sizeof(X9_62_CHARACTERISTIC_TWO),
334 .sname = "X9_62_CHARACTERISTIC_TWO", 335 .sname = "X9_62_CHARACTERISTIC_TWO",
335}; 336};
336DECLARE_ASN1_ALLOC_FUNCTIONS(X9_62_CHARACTERISTIC_TWO) 337X9_62_CHARACTERISTIC_TWO *X9_62_CHARACTERISTIC_TWO_new(void);
338void X9_62_CHARACTERISTIC_TWO_free(X9_62_CHARACTERISTIC_TWO *a);
337 339
338X9_62_CHARACTERISTIC_TWO * 340X9_62_CHARACTERISTIC_TWO *
339X9_62_CHARACTERISTIC_TWO_new(void) 341X9_62_CHARACTERISTIC_TWO_new(void)
@@ -504,7 +506,8 @@ const ASN1_ITEM ECPARAMETERS_it = {
504 .size = sizeof(ECPARAMETERS), 506 .size = sizeof(ECPARAMETERS),
505 .sname = "ECPARAMETERS", 507 .sname = "ECPARAMETERS",
506}; 508};
507DECLARE_ASN1_ALLOC_FUNCTIONS(ECPARAMETERS) 509ECPARAMETERS *ECPARAMETERS_new(void);
510void ECPARAMETERS_free(ECPARAMETERS *a);
508 511
509ECPARAMETERS * 512ECPARAMETERS *
510ECPARAMETERS_new(void) 513ECPARAMETERS_new(void)
@@ -552,7 +555,11 @@ const ASN1_ITEM ECPKPARAMETERS_it = {
552 .sname = "ECPKPARAMETERS", 555 .sname = "ECPKPARAMETERS",
553}; 556};
554 557
555DECLARE_ASN1_FUNCTIONS_const(ECPKPARAMETERS) 558ECPKPARAMETERS *ECPKPARAMETERS_new(void);
559void ECPKPARAMETERS_free(ECPKPARAMETERS *a);
560ECPKPARAMETERS *d2i_ECPKPARAMETERS(ECPKPARAMETERS **a, const unsigned char **in, long len);
561int i2d_ECPKPARAMETERS(const ECPKPARAMETERS *a, unsigned char **out);
562extern const ASN1_ITEM ECPKPARAMETERS_it;
556 563
557ECPKPARAMETERS * 564ECPKPARAMETERS *
558d2i_ECPKPARAMETERS(ECPKPARAMETERS **a, const unsigned char **in, long len) 565d2i_ECPKPARAMETERS(ECPKPARAMETERS **a, const unsigned char **in, long len)
@@ -620,7 +627,11 @@ const ASN1_ITEM EC_PRIVATEKEY_it = {
620 .sname = "EC_PRIVATEKEY", 627 .sname = "EC_PRIVATEKEY",
621}; 628};
622 629
623DECLARE_ASN1_FUNCTIONS_const(EC_PRIVATEKEY) 630EC_PRIVATEKEY *EC_PRIVATEKEY_new(void);
631void EC_PRIVATEKEY_free(EC_PRIVATEKEY *a);
632EC_PRIVATEKEY *d2i_EC_PRIVATEKEY(EC_PRIVATEKEY **a, const unsigned char **in, long len);
633int i2d_EC_PRIVATEKEY(const EC_PRIVATEKEY *a, unsigned char **out);
634extern const ASN1_ITEM EC_PRIVATEKEY_it;
624 635
625EC_PRIVATEKEY * 636EC_PRIVATEKEY *
626d2i_EC_PRIVATEKEY(EC_PRIVATEKEY **a, const unsigned char **in, long len) 637d2i_EC_PRIVATEKEY(EC_PRIVATEKEY **a, const unsigned char **in, long len)
diff --git a/src/lib/libssl/src/crypto/ecdsa/ecs_asn1.c b/src/lib/libssl/src/crypto/ecdsa/ecs_asn1.c
index 7f2d646c44..bb54307254 100644
--- a/src/lib/libssl/src/crypto/ecdsa/ecs_asn1.c
+++ b/src/lib/libssl/src/crypto/ecdsa/ecs_asn1.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ecs_asn1.c,v 1.6 2015/10/16 15:09:28 jsing Exp $ */ 1/* $OpenBSD: ecs_asn1.c,v 1.7 2015/10/16 15:12:30 jsing Exp $ */
2/* ==================================================================== 2/* ====================================================================
3 * Copyright (c) 2000-2002 The OpenSSL Project. All rights reserved. 3 * Copyright (c) 2000-2002 The OpenSSL Project. All rights reserved.
4 * 4 *
@@ -84,7 +84,11 @@ const ASN1_ITEM ECDSA_SIG_it = {
84 .sname = "ECDSA_SIG", 84 .sname = "ECDSA_SIG",
85}; 85};
86 86
87DECLARE_ASN1_FUNCTIONS_const(ECDSA_SIG) 87ECDSA_SIG *ECDSA_SIG_new(void);
88void ECDSA_SIG_free(ECDSA_SIG *a);
89ECDSA_SIG *d2i_ECDSA_SIG(ECDSA_SIG **a, const unsigned char **in, long len);
90int i2d_ECDSA_SIG(const ECDSA_SIG *a, unsigned char **out);
91extern const ASN1_ITEM ECDSA_SIG_it;
88 92
89ECDSA_SIG * 93ECDSA_SIG *
90d2i_ECDSA_SIG(ECDSA_SIG **a, const unsigned char **in, long len) 94d2i_ECDSA_SIG(ECDSA_SIG **a, const unsigned char **in, long len)
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-21 15:03:08 +0000