From 8cf94abf37b701f0cd695afda663bf9c1750206c Mon Sep 17 00:00:00 2001 From: jsing Date: Fri, 16 Oct 2015 15:15:39 +0000 Subject: [PATCH] Remove pointless externs - the structs are declared in the same files a few lines above. --- lib/libcrypto/asn1/n_pkey.c | 4 +--- lib/libcrypto/ec/ec_asn1.c | 4 +--- lib/libcrypto/ecdsa/ecs_asn1.c | 3 +-- lib/libssl/src/crypto/asn1/n_pkey.c | 4 +--- lib/libssl/src/crypto/ec/ec_asn1.c | 4 +--- lib/libssl/src/crypto/ecdsa/ecs_asn1.c | 3 +-- 6 files changed, 6 insertions(+), 16 deletions(-) diff --git a/lib/libcrypto/asn1/n_pkey.c b/lib/libcrypto/asn1/n_pkey.c index bc78606d394..1e73c82d09e 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.29 2015/10/16 15:12:30 jsing Exp $ */ +/* $OpenBSD: n_pkey.c,v 1.30 2015/10/16 15:15:39 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -117,7 +117,6 @@ NETSCAPE_ENCRYPTED_PKEY *NETSCAPE_ENCRYPTED_PKEY_new(void); void NETSCAPE_ENCRYPTED_PKEY_free(NETSCAPE_ENCRYPTED_PKEY *a); NETSCAPE_ENCRYPTED_PKEY *d2i_NETSCAPE_ENCRYPTED_PKEY(NETSCAPE_ENCRYPTED_PKEY **a, const unsigned char **in, long len); int i2d_NETSCAPE_ENCRYPTED_PKEY(const NETSCAPE_ENCRYPTED_PKEY *a, unsigned char **out); -extern const ASN1_ITEM NETSCAPE_ENCRYPTED_PKEY_it; NETSCAPE_ENCRYPTED_PKEY * d2i_NETSCAPE_ENCRYPTED_PKEY(NETSCAPE_ENCRYPTED_PKEY **a, const unsigned char **in, long len) @@ -175,7 +174,6 @@ NETSCAPE_PKEY *NETSCAPE_PKEY_new(void); void NETSCAPE_PKEY_free(NETSCAPE_PKEY *a); NETSCAPE_PKEY *d2i_NETSCAPE_PKEY(NETSCAPE_PKEY **a, const unsigned char **in, long len); int i2d_NETSCAPE_PKEY(const NETSCAPE_PKEY *a, unsigned char **out); -extern const ASN1_ITEM NETSCAPE_PKEY_it; 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 5aeb5615311..adaff98b2f8 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.20 2015/10/16 15:12:30 jsing Exp $ */ +/* $OpenBSD: ec_asn1.c,v 1.21 2015/10/16 15:15:39 jsing Exp $ */ /* * Written by Nils Larsch for the OpenSSL project. */ @@ -559,7 +559,6 @@ ECPKPARAMETERS *ECPKPARAMETERS_new(void); void ECPKPARAMETERS_free(ECPKPARAMETERS *a); ECPKPARAMETERS *d2i_ECPKPARAMETERS(ECPKPARAMETERS **a, const unsigned char **in, long len); int i2d_ECPKPARAMETERS(const ECPKPARAMETERS *a, unsigned char **out); -extern const ASN1_ITEM ECPKPARAMETERS_it; ECPKPARAMETERS * d2i_ECPKPARAMETERS(ECPKPARAMETERS **a, const unsigned char **in, long len) @@ -631,7 +630,6 @@ EC_PRIVATEKEY *EC_PRIVATEKEY_new(void); void EC_PRIVATEKEY_free(EC_PRIVATEKEY *a); EC_PRIVATEKEY *d2i_EC_PRIVATEKEY(EC_PRIVATEKEY **a, const unsigned char **in, long len); int i2d_EC_PRIVATEKEY(const EC_PRIVATEKEY *a, unsigned char **out); -extern const ASN1_ITEM EC_PRIVATEKEY_it; 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 bb543072545..725fe44a367 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.7 2015/10/16 15:12:30 jsing Exp $ */ +/* $OpenBSD: ecs_asn1.c,v 1.8 2015/10/16 15:15:39 jsing Exp $ */ /* ==================================================================== * Copyright (c) 2000-2002 The OpenSSL Project. All rights reserved. * @@ -88,7 +88,6 @@ ECDSA_SIG *ECDSA_SIG_new(void); void ECDSA_SIG_free(ECDSA_SIG *a); ECDSA_SIG *d2i_ECDSA_SIG(ECDSA_SIG **a, const unsigned char **in, long len); int i2d_ECDSA_SIG(const ECDSA_SIG *a, unsigned char **out); -extern const ASN1_ITEM ECDSA_SIG_it; 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 bc78606d394..1e73c82d09e 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.29 2015/10/16 15:12:30 jsing Exp $ */ +/* $OpenBSD: n_pkey.c,v 1.30 2015/10/16 15:15:39 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -117,7 +117,6 @@ NETSCAPE_ENCRYPTED_PKEY *NETSCAPE_ENCRYPTED_PKEY_new(void); void NETSCAPE_ENCRYPTED_PKEY_free(NETSCAPE_ENCRYPTED_PKEY *a); NETSCAPE_ENCRYPTED_PKEY *d2i_NETSCAPE_ENCRYPTED_PKEY(NETSCAPE_ENCRYPTED_PKEY **a, const unsigned char **in, long len); int i2d_NETSCAPE_ENCRYPTED_PKEY(const NETSCAPE_ENCRYPTED_PKEY *a, unsigned char **out); -extern const ASN1_ITEM NETSCAPE_ENCRYPTED_PKEY_it; NETSCAPE_ENCRYPTED_PKEY * d2i_NETSCAPE_ENCRYPTED_PKEY(NETSCAPE_ENCRYPTED_PKEY **a, const unsigned char **in, long len) @@ -175,7 +174,6 @@ NETSCAPE_PKEY *NETSCAPE_PKEY_new(void); void NETSCAPE_PKEY_free(NETSCAPE_PKEY *a); NETSCAPE_PKEY *d2i_NETSCAPE_PKEY(NETSCAPE_PKEY **a, const unsigned char **in, long len); int i2d_NETSCAPE_PKEY(const NETSCAPE_PKEY *a, unsigned char **out); -extern const ASN1_ITEM NETSCAPE_PKEY_it; 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 5aeb5615311..adaff98b2f8 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.20 2015/10/16 15:12:30 jsing Exp $ */ +/* $OpenBSD: ec_asn1.c,v 1.21 2015/10/16 15:15:39 jsing Exp $ */ /* * Written by Nils Larsch for the OpenSSL project. */ @@ -559,7 +559,6 @@ ECPKPARAMETERS *ECPKPARAMETERS_new(void); void ECPKPARAMETERS_free(ECPKPARAMETERS *a); ECPKPARAMETERS *d2i_ECPKPARAMETERS(ECPKPARAMETERS **a, const unsigned char **in, long len); int i2d_ECPKPARAMETERS(const ECPKPARAMETERS *a, unsigned char **out); -extern const ASN1_ITEM ECPKPARAMETERS_it; ECPKPARAMETERS * d2i_ECPKPARAMETERS(ECPKPARAMETERS **a, const unsigned char **in, long len) @@ -631,7 +630,6 @@ EC_PRIVATEKEY *EC_PRIVATEKEY_new(void); void EC_PRIVATEKEY_free(EC_PRIVATEKEY *a); EC_PRIVATEKEY *d2i_EC_PRIVATEKEY(EC_PRIVATEKEY **a, const unsigned char **in, long len); int i2d_EC_PRIVATEKEY(const EC_PRIVATEKEY *a, unsigned char **out); -extern const ASN1_ITEM EC_PRIVATEKEY_it; 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 bb543072545..725fe44a367 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.7 2015/10/16 15:12:30 jsing Exp $ */ +/* $OpenBSD: ecs_asn1.c,v 1.8 2015/10/16 15:15:39 jsing Exp $ */ /* ==================================================================== * Copyright (c) 2000-2002 The OpenSSL Project. All rights reserved. * @@ -88,7 +88,6 @@ ECDSA_SIG *ECDSA_SIG_new(void); void ECDSA_SIG_free(ECDSA_SIG *a); ECDSA_SIG *d2i_ECDSA_SIG(ECDSA_SIG **a, const unsigned char **in, long len); int i2d_ECDSA_SIG(const ECDSA_SIG *a, unsigned char **out); -extern const ASN1_ITEM ECDSA_SIG_it; ECDSA_SIG * d2i_ECDSA_SIG(ECDSA_SIG **a, const unsigned char **in, long len) -- 2.20.1