diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/libcrypto/asn1/n_pkey.c | 4 | ||||
-rw-r--r-- | src/lib/libcrypto/ec/ec_asn1.c | 4 | ||||
-rw-r--r-- | src/lib/libcrypto/ecdsa/ecs_asn1.c | 3 | ||||
-rw-r--r-- | src/lib/libssl/src/crypto/asn1/n_pkey.c | 4 | ||||
-rw-r--r-- | src/lib/libssl/src/crypto/ec/ec_asn1.c | 4 | ||||
-rw-r--r-- | src/lib/libssl/src/crypto/ecdsa/ecs_asn1.c | 3 |
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); | |||
117 | void NETSCAPE_ENCRYPTED_PKEY_free(NETSCAPE_ENCRYPTED_PKEY *a); | 117 | void NETSCAPE_ENCRYPTED_PKEY_free(NETSCAPE_ENCRYPTED_PKEY *a); |
118 | NETSCAPE_ENCRYPTED_PKEY *d2i_NETSCAPE_ENCRYPTED_PKEY(NETSCAPE_ENCRYPTED_PKEY **a, const unsigned char **in, long len); | 118 | NETSCAPE_ENCRYPTED_PKEY *d2i_NETSCAPE_ENCRYPTED_PKEY(NETSCAPE_ENCRYPTED_PKEY **a, const unsigned char **in, long len); |
119 | int i2d_NETSCAPE_ENCRYPTED_PKEY(const NETSCAPE_ENCRYPTED_PKEY *a, unsigned char **out); | 119 | int i2d_NETSCAPE_ENCRYPTED_PKEY(const NETSCAPE_ENCRYPTED_PKEY *a, unsigned char **out); |
120 | extern const ASN1_ITEM NETSCAPE_ENCRYPTED_PKEY_it; | ||
121 | 120 | ||
122 | NETSCAPE_ENCRYPTED_PKEY * | 121 | NETSCAPE_ENCRYPTED_PKEY * |
123 | d2i_NETSCAPE_ENCRYPTED_PKEY(NETSCAPE_ENCRYPTED_PKEY **a, const unsigned char **in, long len) | 122 | d2i_NETSCAPE_ENCRYPTED_PKEY(NETSCAPE_ENCRYPTED_PKEY **a, const unsigned char **in, long len) |
@@ -175,7 +174,6 @@ NETSCAPE_PKEY *NETSCAPE_PKEY_new(void); | |||
175 | void NETSCAPE_PKEY_free(NETSCAPE_PKEY *a); | 174 | void NETSCAPE_PKEY_free(NETSCAPE_PKEY *a); |
176 | NETSCAPE_PKEY *d2i_NETSCAPE_PKEY(NETSCAPE_PKEY **a, const unsigned char **in, long len); | 175 | NETSCAPE_PKEY *d2i_NETSCAPE_PKEY(NETSCAPE_PKEY **a, const unsigned char **in, long len); |
177 | int i2d_NETSCAPE_PKEY(const NETSCAPE_PKEY *a, unsigned char **out); | 176 | int i2d_NETSCAPE_PKEY(const NETSCAPE_PKEY *a, unsigned char **out); |
178 | extern const ASN1_ITEM NETSCAPE_PKEY_it; | ||
179 | 177 | ||
180 | NETSCAPE_PKEY * | 178 | NETSCAPE_PKEY * |
181 | d2i_NETSCAPE_PKEY(NETSCAPE_PKEY **a, const unsigned char **in, long len) | 179 | d2i_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); | |||
559 | void ECPKPARAMETERS_free(ECPKPARAMETERS *a); | 559 | void ECPKPARAMETERS_free(ECPKPARAMETERS *a); |
560 | ECPKPARAMETERS *d2i_ECPKPARAMETERS(ECPKPARAMETERS **a, const unsigned char **in, long len); | 560 | ECPKPARAMETERS *d2i_ECPKPARAMETERS(ECPKPARAMETERS **a, const unsigned char **in, long len); |
561 | int i2d_ECPKPARAMETERS(const ECPKPARAMETERS *a, unsigned char **out); | 561 | int i2d_ECPKPARAMETERS(const ECPKPARAMETERS *a, unsigned char **out); |
562 | extern const ASN1_ITEM ECPKPARAMETERS_it; | ||
563 | 562 | ||
564 | ECPKPARAMETERS * | 563 | ECPKPARAMETERS * |
565 | d2i_ECPKPARAMETERS(ECPKPARAMETERS **a, const unsigned char **in, long len) | 564 | d2i_ECPKPARAMETERS(ECPKPARAMETERS **a, const unsigned char **in, long len) |
@@ -631,7 +630,6 @@ EC_PRIVATEKEY *EC_PRIVATEKEY_new(void); | |||
631 | void EC_PRIVATEKEY_free(EC_PRIVATEKEY *a); | 630 | void EC_PRIVATEKEY_free(EC_PRIVATEKEY *a); |
632 | EC_PRIVATEKEY *d2i_EC_PRIVATEKEY(EC_PRIVATEKEY **a, const unsigned char **in, long len); | 631 | EC_PRIVATEKEY *d2i_EC_PRIVATEKEY(EC_PRIVATEKEY **a, const unsigned char **in, long len); |
633 | int i2d_EC_PRIVATEKEY(const EC_PRIVATEKEY *a, unsigned char **out); | 632 | int i2d_EC_PRIVATEKEY(const EC_PRIVATEKEY *a, unsigned char **out); |
634 | extern const ASN1_ITEM EC_PRIVATEKEY_it; | ||
635 | 633 | ||
636 | EC_PRIVATEKEY * | 634 | EC_PRIVATEKEY * |
637 | d2i_EC_PRIVATEKEY(EC_PRIVATEKEY **a, const unsigned char **in, long len) | 635 | d2i_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); | |||
88 | void ECDSA_SIG_free(ECDSA_SIG *a); | 88 | void ECDSA_SIG_free(ECDSA_SIG *a); |
89 | ECDSA_SIG *d2i_ECDSA_SIG(ECDSA_SIG **a, const unsigned char **in, long len); | 89 | ECDSA_SIG *d2i_ECDSA_SIG(ECDSA_SIG **a, const unsigned char **in, long len); |
90 | int i2d_ECDSA_SIG(const ECDSA_SIG *a, unsigned char **out); | 90 | int i2d_ECDSA_SIG(const ECDSA_SIG *a, unsigned char **out); |
91 | extern const ASN1_ITEM ECDSA_SIG_it; | ||
92 | 91 | ||
93 | ECDSA_SIG * | 92 | ECDSA_SIG * |
94 | d2i_ECDSA_SIG(ECDSA_SIG **a, const unsigned char **in, long len) | 93 | d2i_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); | |||
117 | void NETSCAPE_ENCRYPTED_PKEY_free(NETSCAPE_ENCRYPTED_PKEY *a); | 117 | void NETSCAPE_ENCRYPTED_PKEY_free(NETSCAPE_ENCRYPTED_PKEY *a); |
118 | NETSCAPE_ENCRYPTED_PKEY *d2i_NETSCAPE_ENCRYPTED_PKEY(NETSCAPE_ENCRYPTED_PKEY **a, const unsigned char **in, long len); | 118 | NETSCAPE_ENCRYPTED_PKEY *d2i_NETSCAPE_ENCRYPTED_PKEY(NETSCAPE_ENCRYPTED_PKEY **a, const unsigned char **in, long len); |
119 | int i2d_NETSCAPE_ENCRYPTED_PKEY(const NETSCAPE_ENCRYPTED_PKEY *a, unsigned char **out); | 119 | int i2d_NETSCAPE_ENCRYPTED_PKEY(const NETSCAPE_ENCRYPTED_PKEY *a, unsigned char **out); |
120 | extern const ASN1_ITEM NETSCAPE_ENCRYPTED_PKEY_it; | ||
121 | 120 | ||
122 | NETSCAPE_ENCRYPTED_PKEY * | 121 | NETSCAPE_ENCRYPTED_PKEY * |
123 | d2i_NETSCAPE_ENCRYPTED_PKEY(NETSCAPE_ENCRYPTED_PKEY **a, const unsigned char **in, long len) | 122 | d2i_NETSCAPE_ENCRYPTED_PKEY(NETSCAPE_ENCRYPTED_PKEY **a, const unsigned char **in, long len) |
@@ -175,7 +174,6 @@ NETSCAPE_PKEY *NETSCAPE_PKEY_new(void); | |||
175 | void NETSCAPE_PKEY_free(NETSCAPE_PKEY *a); | 174 | void NETSCAPE_PKEY_free(NETSCAPE_PKEY *a); |
176 | NETSCAPE_PKEY *d2i_NETSCAPE_PKEY(NETSCAPE_PKEY **a, const unsigned char **in, long len); | 175 | NETSCAPE_PKEY *d2i_NETSCAPE_PKEY(NETSCAPE_PKEY **a, const unsigned char **in, long len); |
177 | int i2d_NETSCAPE_PKEY(const NETSCAPE_PKEY *a, unsigned char **out); | 176 | int i2d_NETSCAPE_PKEY(const NETSCAPE_PKEY *a, unsigned char **out); |
178 | extern const ASN1_ITEM NETSCAPE_PKEY_it; | ||
179 | 177 | ||
180 | NETSCAPE_PKEY * | 178 | NETSCAPE_PKEY * |
181 | d2i_NETSCAPE_PKEY(NETSCAPE_PKEY **a, const unsigned char **in, long len) | 179 | d2i_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); | |||
559 | void ECPKPARAMETERS_free(ECPKPARAMETERS *a); | 559 | void ECPKPARAMETERS_free(ECPKPARAMETERS *a); |
560 | ECPKPARAMETERS *d2i_ECPKPARAMETERS(ECPKPARAMETERS **a, const unsigned char **in, long len); | 560 | ECPKPARAMETERS *d2i_ECPKPARAMETERS(ECPKPARAMETERS **a, const unsigned char **in, long len); |
561 | int i2d_ECPKPARAMETERS(const ECPKPARAMETERS *a, unsigned char **out); | 561 | int i2d_ECPKPARAMETERS(const ECPKPARAMETERS *a, unsigned char **out); |
562 | extern const ASN1_ITEM ECPKPARAMETERS_it; | ||
563 | 562 | ||
564 | ECPKPARAMETERS * | 563 | ECPKPARAMETERS * |
565 | d2i_ECPKPARAMETERS(ECPKPARAMETERS **a, const unsigned char **in, long len) | 564 | d2i_ECPKPARAMETERS(ECPKPARAMETERS **a, const unsigned char **in, long len) |
@@ -631,7 +630,6 @@ EC_PRIVATEKEY *EC_PRIVATEKEY_new(void); | |||
631 | void EC_PRIVATEKEY_free(EC_PRIVATEKEY *a); | 630 | void EC_PRIVATEKEY_free(EC_PRIVATEKEY *a); |
632 | EC_PRIVATEKEY *d2i_EC_PRIVATEKEY(EC_PRIVATEKEY **a, const unsigned char **in, long len); | 631 | EC_PRIVATEKEY *d2i_EC_PRIVATEKEY(EC_PRIVATEKEY **a, const unsigned char **in, long len); |
633 | int i2d_EC_PRIVATEKEY(const EC_PRIVATEKEY *a, unsigned char **out); | 632 | int i2d_EC_PRIVATEKEY(const EC_PRIVATEKEY *a, unsigned char **out); |
634 | extern const ASN1_ITEM EC_PRIVATEKEY_it; | ||
635 | 633 | ||
636 | EC_PRIVATEKEY * | 634 | EC_PRIVATEKEY * |
637 | d2i_EC_PRIVATEKEY(EC_PRIVATEKEY **a, const unsigned char **in, long len) | 635 | d2i_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); | |||
88 | void ECDSA_SIG_free(ECDSA_SIG *a); | 88 | void ECDSA_SIG_free(ECDSA_SIG *a); |
89 | ECDSA_SIG *d2i_ECDSA_SIG(ECDSA_SIG **a, const unsigned char **in, long len); | 89 | ECDSA_SIG *d2i_ECDSA_SIG(ECDSA_SIG **a, const unsigned char **in, long len); |
90 | int i2d_ECDSA_SIG(const ECDSA_SIG *a, unsigned char **out); | 90 | int i2d_ECDSA_SIG(const ECDSA_SIG *a, unsigned char **out); |
91 | extern const ASN1_ITEM ECDSA_SIG_it; | ||
92 | 91 | ||
93 | ECDSA_SIG * | 92 | ECDSA_SIG * |
94 | d2i_ECDSA_SIG(ECDSA_SIG **a, const unsigned char **in, long len) | 93 | d2i_ECDSA_SIG(ECDSA_SIG **a, const unsigned char **in, long len) |