From 34e951dd3f311126b0c00c85832cf72be8dce467 Mon Sep 17 00:00:00 2001 From: jsing Date: Fri, 16 Oct 2015 15:09:28 +0000 Subject: [PATCH] Remove pointless uses of DECLARE_ASN1_ENCODE_FUNCTIONS_const. DECLARE_ASN1_FUNCTIONS_const already includes this macro so using both means we end up with duplicate function prototypes and externs. --- lib/libcrypto/asn1/n_pkey.c | 4 +--- lib/libcrypto/ec/ec_asn1.c | 6 +++--- lib/libcrypto/ecdsa/ecs_asn1.c | 3 +-- lib/libssl/src/crypto/asn1/n_pkey.c | 4 +--- lib/libssl/src/crypto/ec/ec_asn1.c | 6 +++--- lib/libssl/src/crypto/ecdsa/ecs_asn1.c | 3 +-- 6 files changed, 10 insertions(+), 16 deletions(-) diff --git a/lib/libcrypto/asn1/n_pkey.c b/lib/libcrypto/asn1/n_pkey.c index 491f988e924..664d39216bd 100644 --- a/lib/libcrypto/asn1/n_pkey.c +++ b/lib/libcrypto/asn1/n_pkey.c @@ -1,4 +1,4 @@ -/* $OpenBSD: n_pkey.c,v 1.27 2015/09/10 15:56:24 jsing Exp $ */ +/* $OpenBSD: n_pkey.c,v 1.28 2015/10/16 15:09:28 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -114,7 +114,6 @@ const ASN1_ITEM NETSCAPE_ENCRYPTED_PKEY_it = { }; DECLARE_ASN1_FUNCTIONS_const(NETSCAPE_ENCRYPTED_PKEY) -DECLARE_ASN1_ENCODE_FUNCTIONS_const(NETSCAPE_ENCRYPTED_PKEY, NETSCAPE_ENCRYPTED_PKEY) NETSCAPE_ENCRYPTED_PKEY * d2i_NETSCAPE_ENCRYPTED_PKEY(NETSCAPE_ENCRYPTED_PKEY **a, const unsigned char **in, long len) @@ -169,7 +168,6 @@ const ASN1_ITEM NETSCAPE_PKEY_it = { }; DECLARE_ASN1_FUNCTIONS_const(NETSCAPE_PKEY) -DECLARE_ASN1_ENCODE_FUNCTIONS_const(NETSCAPE_PKEY, NETSCAPE_PKEY) NETSCAPE_PKEY * d2i_NETSCAPE_PKEY(NETSCAPE_PKEY **a, const unsigned char **in, long len) diff --git a/lib/libcrypto/ec/ec_asn1.c b/lib/libcrypto/ec/ec_asn1.c index 44f15978965..f937672d678 100644 --- a/lib/libcrypto/ec/ec_asn1.c +++ b/lib/libcrypto/ec/ec_asn1.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ec_asn1.c,v 1.18 2015/09/29 13:54:40 jsing Exp $ */ +/* $OpenBSD: ec_asn1.c,v 1.19 2015/10/16 15:09:28 jsing Exp $ */ /* * Written by Nils Larsch for the OpenSSL project. */ @@ -551,8 +551,8 @@ const ASN1_ITEM ECPKPARAMETERS_it = { .size = sizeof(ECPKPARAMETERS), .sname = "ECPKPARAMETERS", }; + DECLARE_ASN1_FUNCTIONS_const(ECPKPARAMETERS) -DECLARE_ASN1_ENCODE_FUNCTIONS_const(ECPKPARAMETERS, ECPKPARAMETERS) ECPKPARAMETERS * d2i_ECPKPARAMETERS(ECPKPARAMETERS **a, const unsigned char **in, long len) @@ -619,8 +619,8 @@ const ASN1_ITEM EC_PRIVATEKEY_it = { .size = sizeof(EC_PRIVATEKEY), .sname = "EC_PRIVATEKEY", }; + DECLARE_ASN1_FUNCTIONS_const(EC_PRIVATEKEY) -DECLARE_ASN1_ENCODE_FUNCTIONS_const(EC_PRIVATEKEY, EC_PRIVATEKEY) EC_PRIVATEKEY * d2i_EC_PRIVATEKEY(EC_PRIVATEKEY **a, const unsigned char **in, long len) diff --git a/lib/libcrypto/ecdsa/ecs_asn1.c b/lib/libcrypto/ecdsa/ecs_asn1.c index 34c3ce04974..7f2d646c442 100644 --- a/lib/libcrypto/ecdsa/ecs_asn1.c +++ b/lib/libcrypto/ecdsa/ecs_asn1.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ecs_asn1.c,v 1.5 2015/07/24 15:51:49 jsing Exp $ */ +/* $OpenBSD: ecs_asn1.c,v 1.6 2015/10/16 15:09:28 jsing Exp $ */ /* ==================================================================== * Copyright (c) 2000-2002 The OpenSSL Project. All rights reserved. * @@ -85,7 +85,6 @@ const ASN1_ITEM ECDSA_SIG_it = { }; DECLARE_ASN1_FUNCTIONS_const(ECDSA_SIG) -DECLARE_ASN1_ENCODE_FUNCTIONS_const(ECDSA_SIG, ECDSA_SIG) ECDSA_SIG * d2i_ECDSA_SIG(ECDSA_SIG **a, const unsigned char **in, long len) diff --git a/lib/libssl/src/crypto/asn1/n_pkey.c b/lib/libssl/src/crypto/asn1/n_pkey.c index 491f988e924..664d39216bd 100644 --- a/lib/libssl/src/crypto/asn1/n_pkey.c +++ b/lib/libssl/src/crypto/asn1/n_pkey.c @@ -1,4 +1,4 @@ -/* $OpenBSD: n_pkey.c,v 1.27 2015/09/10 15:56:24 jsing Exp $ */ +/* $OpenBSD: n_pkey.c,v 1.28 2015/10/16 15:09:28 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -114,7 +114,6 @@ const ASN1_ITEM NETSCAPE_ENCRYPTED_PKEY_it = { }; DECLARE_ASN1_FUNCTIONS_const(NETSCAPE_ENCRYPTED_PKEY) -DECLARE_ASN1_ENCODE_FUNCTIONS_const(NETSCAPE_ENCRYPTED_PKEY, NETSCAPE_ENCRYPTED_PKEY) NETSCAPE_ENCRYPTED_PKEY * d2i_NETSCAPE_ENCRYPTED_PKEY(NETSCAPE_ENCRYPTED_PKEY **a, const unsigned char **in, long len) @@ -169,7 +168,6 @@ const ASN1_ITEM NETSCAPE_PKEY_it = { }; DECLARE_ASN1_FUNCTIONS_const(NETSCAPE_PKEY) -DECLARE_ASN1_ENCODE_FUNCTIONS_const(NETSCAPE_PKEY, NETSCAPE_PKEY) NETSCAPE_PKEY * d2i_NETSCAPE_PKEY(NETSCAPE_PKEY **a, const unsigned char **in, long len) diff --git a/lib/libssl/src/crypto/ec/ec_asn1.c b/lib/libssl/src/crypto/ec/ec_asn1.c index 44f15978965..f937672d678 100644 --- a/lib/libssl/src/crypto/ec/ec_asn1.c +++ b/lib/libssl/src/crypto/ec/ec_asn1.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ec_asn1.c,v 1.18 2015/09/29 13:54:40 jsing Exp $ */ +/* $OpenBSD: ec_asn1.c,v 1.19 2015/10/16 15:09:28 jsing Exp $ */ /* * Written by Nils Larsch for the OpenSSL project. */ @@ -551,8 +551,8 @@ const ASN1_ITEM ECPKPARAMETERS_it = { .size = sizeof(ECPKPARAMETERS), .sname = "ECPKPARAMETERS", }; + DECLARE_ASN1_FUNCTIONS_const(ECPKPARAMETERS) -DECLARE_ASN1_ENCODE_FUNCTIONS_const(ECPKPARAMETERS, ECPKPARAMETERS) ECPKPARAMETERS * d2i_ECPKPARAMETERS(ECPKPARAMETERS **a, const unsigned char **in, long len) @@ -619,8 +619,8 @@ const ASN1_ITEM EC_PRIVATEKEY_it = { .size = sizeof(EC_PRIVATEKEY), .sname = "EC_PRIVATEKEY", }; + DECLARE_ASN1_FUNCTIONS_const(EC_PRIVATEKEY) -DECLARE_ASN1_ENCODE_FUNCTIONS_const(EC_PRIVATEKEY, EC_PRIVATEKEY) EC_PRIVATEKEY * d2i_EC_PRIVATEKEY(EC_PRIVATEKEY **a, const unsigned char **in, long len) diff --git a/lib/libssl/src/crypto/ecdsa/ecs_asn1.c b/lib/libssl/src/crypto/ecdsa/ecs_asn1.c index 34c3ce04974..7f2d646c442 100644 --- a/lib/libssl/src/crypto/ecdsa/ecs_asn1.c +++ b/lib/libssl/src/crypto/ecdsa/ecs_asn1.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ecs_asn1.c,v 1.5 2015/07/24 15:51:49 jsing Exp $ */ +/* $OpenBSD: ecs_asn1.c,v 1.6 2015/10/16 15:09:28 jsing Exp $ */ /* ==================================================================== * Copyright (c) 2000-2002 The OpenSSL Project. All rights reserved. * @@ -85,7 +85,6 @@ const ASN1_ITEM ECDSA_SIG_it = { }; DECLARE_ASN1_FUNCTIONS_const(ECDSA_SIG) -DECLARE_ASN1_ENCODE_FUNCTIONS_const(ECDSA_SIG, ECDSA_SIG) ECDSA_SIG * d2i_ECDSA_SIG(ECDSA_SIG **a, const unsigned char **in, long len) -- 2.20.1