summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorjsing <>2015-10-16 15:15:39 +0000
committerjsing <>2015-10-16 15:15:39 +0000
commit5119a4e310cb05088a42e3a19446f977e0e8c48b (patch)
treedb46925a9b8444c9e5670fd2dff3523c548294f9 /src
parentfe7a74ab075d619393e624cc3430865b7b172e15 (diff)
downloadopenbsd-5119a4e310cb05088a42e3a19446f977e0e8c48b.tar.gz
openbsd-5119a4e310cb05088a42e3a19446f977e0e8c48b.tar.bz2
openbsd-5119a4e310cb05088a42e3a19446f977e0e8c48b.zip
Remove pointless externs - the structs are declared in the same files a
few lines above.
Diffstat (limited to 'src')
-rw-r--r--src/lib/libcrypto/asn1/n_pkey.c4
-rw-r--r--src/lib/libcrypto/ec/ec_asn1.c4
-rw-r--r--src/lib/libcrypto/ecdsa/ecs_asn1.c3
-rw-r--r--src/lib/libssl/src/crypto/asn1/n_pkey.c4
-rw-r--r--src/lib/libssl/src/crypto/ec/ec_asn1.c4
-rw-r--r--src/lib/libssl/src/crypto/ecdsa/ecs_asn1.c3
6 files changed, 6 insertions, 16 deletions
diff --git a/src/lib/libcrypto/asn1/n_pkey.c b/src/lib/libcrypto/asn1/n_pkey.c
index bc78606d39..1e73c82d09 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.29 2015/10/16 15:12:30 jsing Exp $ */ 1/* $OpenBSD: n_pkey.c,v 1.30 2015/10/16 15:15:39 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,6 @@ NETSCAPE_ENCRYPTED_PKEY *NETSCAPE_ENCRYPTED_PKEY_new(void);
117void NETSCAPE_ENCRYPTED_PKEY_free(NETSCAPE_ENCRYPTED_PKEY *a); 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); 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); 119int i2d_NETSCAPE_ENCRYPTED_PKEY(const NETSCAPE_ENCRYPTED_PKEY *a, unsigned char **out);
120extern const ASN1_ITEM NETSCAPE_ENCRYPTED_PKEY_it;
121 120
122NETSCAPE_ENCRYPTED_PKEY * 121NETSCAPE_ENCRYPTED_PKEY *
123d2i_NETSCAPE_ENCRYPTED_PKEY(NETSCAPE_ENCRYPTED_PKEY **a, const unsigned char **in, long len) 122d2i_NETSCAPE_ENCRYPTED_PKEY(NETSCAPE_ENCRYPTED_PKEY **a, const unsigned char **in, long len)
@@ -175,7 +174,6 @@ NETSCAPE_PKEY *NETSCAPE_PKEY_new(void);
175void NETSCAPE_PKEY_free(NETSCAPE_PKEY *a); 174void NETSCAPE_PKEY_free(NETSCAPE_PKEY *a);
176NETSCAPE_PKEY *d2i_NETSCAPE_PKEY(NETSCAPE_PKEY **a, const unsigned char **in, long len); 175NETSCAPE_PKEY *d2i_NETSCAPE_PKEY(NETSCAPE_PKEY **a, const unsigned char **in, long len);
177int i2d_NETSCAPE_PKEY(const NETSCAPE_PKEY *a, unsigned char **out); 176int i2d_NETSCAPE_PKEY(const NETSCAPE_PKEY *a, unsigned char **out);
178extern const ASN1_ITEM NETSCAPE_PKEY_it;
179 177
180NETSCAPE_PKEY * 178NETSCAPE_PKEY *
181d2i_NETSCAPE_PKEY(NETSCAPE_PKEY **a, const unsigned char **in, long len) 179d2i_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 5aeb561531..adaff98b2f 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.20 2015/10/16 15:12:30 jsing Exp $ */ 1/* $OpenBSD: ec_asn1.c,v 1.21 2015/10/16 15:15:39 jsing Exp $ */
2/* 2/*
3 * Written by Nils Larsch for the OpenSSL project. 3 * Written by Nils Larsch for the OpenSSL project.
4 */ 4 */
@@ -559,7 +559,6 @@ ECPKPARAMETERS *ECPKPARAMETERS_new(void);
559void ECPKPARAMETERS_free(ECPKPARAMETERS *a); 559void ECPKPARAMETERS_free(ECPKPARAMETERS *a);
560ECPKPARAMETERS *d2i_ECPKPARAMETERS(ECPKPARAMETERS **a, const unsigned char **in, long len); 560ECPKPARAMETERS *d2i_ECPKPARAMETERS(ECPKPARAMETERS **a, const unsigned char **in, long len);
561int i2d_ECPKPARAMETERS(const ECPKPARAMETERS *a, unsigned char **out); 561int i2d_ECPKPARAMETERS(const ECPKPARAMETERS *a, unsigned char **out);
562extern const ASN1_ITEM ECPKPARAMETERS_it;
563 562
564ECPKPARAMETERS * 563ECPKPARAMETERS *
565d2i_ECPKPARAMETERS(ECPKPARAMETERS **a, const unsigned char **in, long len) 564d2i_ECPKPARAMETERS(ECPKPARAMETERS **a, const unsigned char **in, long len)
@@ -631,7 +630,6 @@ EC_PRIVATEKEY *EC_PRIVATEKEY_new(void);
631void EC_PRIVATEKEY_free(EC_PRIVATEKEY *a); 630void EC_PRIVATEKEY_free(EC_PRIVATEKEY *a);
632EC_PRIVATEKEY *d2i_EC_PRIVATEKEY(EC_PRIVATEKEY **a, const unsigned char **in, long len); 631EC_PRIVATEKEY *d2i_EC_PRIVATEKEY(EC_PRIVATEKEY **a, const unsigned char **in, long len);
633int i2d_EC_PRIVATEKEY(const EC_PRIVATEKEY *a, unsigned char **out); 632int i2d_EC_PRIVATEKEY(const EC_PRIVATEKEY *a, unsigned char **out);
634extern const ASN1_ITEM EC_PRIVATEKEY_it;
635 633
636EC_PRIVATEKEY * 634EC_PRIVATEKEY *
637d2i_EC_PRIVATEKEY(EC_PRIVATEKEY **a, const unsigned char **in, long len) 635d2i_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 bb54307254..725fe44a36 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.7 2015/10/16 15:12:30 jsing Exp $ */ 1/* $OpenBSD: ecs_asn1.c,v 1.8 2015/10/16 15:15:39 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 *
@@ -88,7 +88,6 @@ ECDSA_SIG *ECDSA_SIG_new(void);
88void ECDSA_SIG_free(ECDSA_SIG *a); 88void ECDSA_SIG_free(ECDSA_SIG *a);
89ECDSA_SIG *d2i_ECDSA_SIG(ECDSA_SIG **a, const unsigned char **in, long len); 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); 90int i2d_ECDSA_SIG(const ECDSA_SIG *a, unsigned char **out);
91extern const ASN1_ITEM ECDSA_SIG_it;
92 91
93ECDSA_SIG * 92ECDSA_SIG *
94d2i_ECDSA_SIG(ECDSA_SIG **a, const unsigned char **in, long len) 93d2i_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 bc78606d39..1e73c82d09 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.29 2015/10/16 15:12:30 jsing Exp $ */ 1/* $OpenBSD: n_pkey.c,v 1.30 2015/10/16 15:15:39 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,6 @@ NETSCAPE_ENCRYPTED_PKEY *NETSCAPE_ENCRYPTED_PKEY_new(void);
117void NETSCAPE_ENCRYPTED_PKEY_free(NETSCAPE_ENCRYPTED_PKEY *a); 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); 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); 119int i2d_NETSCAPE_ENCRYPTED_PKEY(const NETSCAPE_ENCRYPTED_PKEY *a, unsigned char **out);
120extern const ASN1_ITEM NETSCAPE_ENCRYPTED_PKEY_it;
121 120
122NETSCAPE_ENCRYPTED_PKEY * 121NETSCAPE_ENCRYPTED_PKEY *
123d2i_NETSCAPE_ENCRYPTED_PKEY(NETSCAPE_ENCRYPTED_PKEY **a, const unsigned char **in, long len) 122d2i_NETSCAPE_ENCRYPTED_PKEY(NETSCAPE_ENCRYPTED_PKEY **a, const unsigned char **in, long len)
@@ -175,7 +174,6 @@ NETSCAPE_PKEY *NETSCAPE_PKEY_new(void);
175void NETSCAPE_PKEY_free(NETSCAPE_PKEY *a); 174void NETSCAPE_PKEY_free(NETSCAPE_PKEY *a);
176NETSCAPE_PKEY *d2i_NETSCAPE_PKEY(NETSCAPE_PKEY **a, const unsigned char **in, long len); 175NETSCAPE_PKEY *d2i_NETSCAPE_PKEY(NETSCAPE_PKEY **a, const unsigned char **in, long len);
177int i2d_NETSCAPE_PKEY(const NETSCAPE_PKEY *a, unsigned char **out); 176int i2d_NETSCAPE_PKEY(const NETSCAPE_PKEY *a, unsigned char **out);
178extern const ASN1_ITEM NETSCAPE_PKEY_it;
179 177
180NETSCAPE_PKEY * 178NETSCAPE_PKEY *
181d2i_NETSCAPE_PKEY(NETSCAPE_PKEY **a, const unsigned char **in, long len) 179d2i_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 5aeb561531..adaff98b2f 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.20 2015/10/16 15:12:30 jsing Exp $ */ 1/* $OpenBSD: ec_asn1.c,v 1.21 2015/10/16 15:15:39 jsing Exp $ */
2/* 2/*
3 * Written by Nils Larsch for the OpenSSL project. 3 * Written by Nils Larsch for the OpenSSL project.
4 */ 4 */
@@ -559,7 +559,6 @@ ECPKPARAMETERS *ECPKPARAMETERS_new(void);
559void ECPKPARAMETERS_free(ECPKPARAMETERS *a); 559void ECPKPARAMETERS_free(ECPKPARAMETERS *a);
560ECPKPARAMETERS *d2i_ECPKPARAMETERS(ECPKPARAMETERS **a, const unsigned char **in, long len); 560ECPKPARAMETERS *d2i_ECPKPARAMETERS(ECPKPARAMETERS **a, const unsigned char **in, long len);
561int i2d_ECPKPARAMETERS(const ECPKPARAMETERS *a, unsigned char **out); 561int i2d_ECPKPARAMETERS(const ECPKPARAMETERS *a, unsigned char **out);
562extern const ASN1_ITEM ECPKPARAMETERS_it;
563 562
564ECPKPARAMETERS * 563ECPKPARAMETERS *
565d2i_ECPKPARAMETERS(ECPKPARAMETERS **a, const unsigned char **in, long len) 564d2i_ECPKPARAMETERS(ECPKPARAMETERS **a, const unsigned char **in, long len)
@@ -631,7 +630,6 @@ EC_PRIVATEKEY *EC_PRIVATEKEY_new(void);
631void EC_PRIVATEKEY_free(EC_PRIVATEKEY *a); 630void EC_PRIVATEKEY_free(EC_PRIVATEKEY *a);
632EC_PRIVATEKEY *d2i_EC_PRIVATEKEY(EC_PRIVATEKEY **a, const unsigned char **in, long len); 631EC_PRIVATEKEY *d2i_EC_PRIVATEKEY(EC_PRIVATEKEY **a, const unsigned char **in, long len);
633int i2d_EC_PRIVATEKEY(const EC_PRIVATEKEY *a, unsigned char **out); 632int i2d_EC_PRIVATEKEY(const EC_PRIVATEKEY *a, unsigned char **out);
634extern const ASN1_ITEM EC_PRIVATEKEY_it;
635 633
636EC_PRIVATEKEY * 634EC_PRIVATEKEY *
637d2i_EC_PRIVATEKEY(EC_PRIVATEKEY **a, const unsigned char **in, long len) 635d2i_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 bb54307254..725fe44a36 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.7 2015/10/16 15:12:30 jsing Exp $ */ 1/* $OpenBSD: ecs_asn1.c,v 1.8 2015/10/16 15:15:39 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 *
@@ -88,7 +88,6 @@ ECDSA_SIG *ECDSA_SIG_new(void);
88void ECDSA_SIG_free(ECDSA_SIG *a); 88void ECDSA_SIG_free(ECDSA_SIG *a);
89ECDSA_SIG *d2i_ECDSA_SIG(ECDSA_SIG **a, const unsigned char **in, long len); 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); 90int i2d_ECDSA_SIG(const ECDSA_SIG *a, unsigned char **out);
91extern const ASN1_ITEM ECDSA_SIG_it;
92 91
93ECDSA_SIG * 92ECDSA_SIG *
94d2i_ECDSA_SIG(ECDSA_SIG **a, const unsigned char **in, long len) 93d2i_ECDSA_SIG(ECDSA_SIG **a, const unsigned char **in, long len)