diff options
| -rw-r--r-- | crypto/asn1/tasn_prn.c | 2 | ||||
| -rw-r--r-- | crypto/crypto.c | 2 | ||||
| -rw-r--r-- | crypto/dh/params.c | 2 | ||||
| -rw-r--r-- | crypto/evp/evp.c | 4 | ||||
| -rw-r--r-- | crypto/evp/evp_ctx.c | 3 | ||||
| -rw-r--r-- | crypto/evp/internal.h | 7 | ||||
| -rw-r--r-- | crypto/x509/by_dir.c | 2 | ||||
| -rw-r--r-- | crypto/x509/by_file.c | 2 | ||||
| -rw-r--r-- | crypto/x509/x509_vfy.c | 1 | ||||
| -rw-r--r-- | crypto/x509/x_name.c | 2 | ||||
| -rw-r--r-- | crypto/x509v3/ext_dat.h | 22 | ||||
| -rw-r--r-- | decrepit/cast/cast.c | 10 | ||||
| -rw-r--r-- | decrepit/cast/cast_tables.c | 3 | ||||
| -rw-r--r-- | decrepit/cast/internal.h | 81 | ||||
| -rw-r--r-- | ssl/ssl_cipher.c | 2 |
15 files changed, 111 insertions, 34 deletions
diff --git a/crypto/asn1/tasn_prn.c b/crypto/asn1/tasn_prn.c index 6a097a18..a5740554 100644 --- a/crypto/asn1/tasn_prn.c +++ b/crypto/asn1/tasn_prn.c @@ -72,7 +72,7 @@ /* ASN1_PCTX routines */ -ASN1_PCTX default_pctx = +static ASN1_PCTX default_pctx = { ASN1_PCTX_FLAGS_SHOW_ABSENT, /* flags */ 0, /* nm_flags */ diff --git a/crypto/crypto.c b/crypto/crypto.c index d70c8c77..9d2e616c 100644 --- a/crypto/crypto.c +++ b/crypto/crypto.c @@ -14,6 +14,8 @@ #include <openssl/crypto.h> +#include <openssl/cpu.h> + #include "internal.h" diff --git a/crypto/dh/params.c b/crypto/dh/params.c index 6b30036e..a6481530 100644 --- a/crypto/dh/params.c +++ b/crypto/dh/params.c @@ -260,7 +260,7 @@ static const BIGNUM dh1024_safe_prime[] = { STATIC_BIGNUM(dh1024_safe_prime_4) }; -BIGNUM bn_two = STATIC_BIGNUM(bn_two_data); +static BIGNUM bn_two = STATIC_BIGNUM(bn_two_data); static DH *get_standard_parameters(const struct standard_parameters *params, const ENGINE *engine) { diff --git a/crypto/evp/evp.c b/crypto/evp/evp.c index 5822379e..188a368b 100644 --- a/crypto/evp/evp.c +++ b/crypto/evp/evp.c @@ -73,10 +73,6 @@ #include "../internal.h" -extern const EVP_PKEY_ASN1_METHOD dsa_asn1_meth; -extern const EVP_PKEY_ASN1_METHOD ec_asn1_meth; -extern const EVP_PKEY_ASN1_METHOD rsa_asn1_meth; - EVP_PKEY *EVP_PKEY_new(void) { EVP_PKEY *ret; diff --git a/crypto/evp/evp_ctx.c b/crypto/evp/evp_ctx.c index a8e71fea..9e038cd2 100644 --- a/crypto/evp/evp_ctx.c +++ b/crypto/evp/evp_ctx.c @@ -66,9 +66,6 @@ #include "internal.h" -extern const EVP_PKEY_METHOD rsa_pkey_meth; -extern const EVP_PKEY_METHOD ec_pkey_meth; - static const EVP_PKEY_METHOD *const evp_methods[] = { &rsa_pkey_meth, &ec_pkey_meth, diff --git a/crypto/evp/internal.h b/crypto/evp/internal.h index 60881e3b..aa52d535 100644 --- a/crypto/evp/internal.h +++ b/crypto/evp/internal.h @@ -263,6 +263,13 @@ struct evp_pkey_method_st { int (*ctrl)(EVP_PKEY_CTX *ctx, int type, int p1, void *p2); } /* EVP_PKEY_METHOD */; +extern const EVP_PKEY_ASN1_METHOD dsa_asn1_meth; +extern const EVP_PKEY_ASN1_METHOD ec_asn1_meth; +extern const EVP_PKEY_ASN1_METHOD rsa_asn1_meth; + +extern const EVP_PKEY_METHOD rsa_pkey_meth; +extern const EVP_PKEY_METHOD ec_pkey_meth; + #if defined(__cplusplus) } /* extern C */ diff --git a/crypto/x509/by_dir.c b/crypto/x509/by_dir.c index 3393dfa4..ae50ae1e 100644 --- a/crypto/x509/by_dir.c +++ b/crypto/x509/by_dir.c @@ -98,7 +98,7 @@ static void free_dir(X509_LOOKUP *lu); static int add_cert_dir(BY_DIR *ctx,const char *dir,int type); static int get_cert_by_subject(X509_LOOKUP *xl,int type,X509_NAME *name, X509_OBJECT *ret); -X509_LOOKUP_METHOD x509_dir_lookup= +static X509_LOOKUP_METHOD x509_dir_lookup= { "Load certs from files in a directory", new_dir, /* new */ diff --git a/crypto/x509/by_file.c b/crypto/x509/by_file.c index f1d6194c..3460b570 100644 --- a/crypto/x509/by_file.c +++ b/crypto/x509/by_file.c @@ -68,7 +68,7 @@ static int by_file_ctrl(X509_LOOKUP *ctx, int cmd, const char *argc, long argl, char **ret); -X509_LOOKUP_METHOD x509_file_lookup= +static X509_LOOKUP_METHOD x509_file_lookup= { "Load file into cache", NULL, /* new */ diff --git a/crypto/x509/x509_vfy.c b/crypto/x509/x509_vfy.c index 695793e1..b15ebfed 100644 --- a/crypto/x509/x509_vfy.c +++ b/crypto/x509/x509_vfy.c @@ -141,7 +141,6 @@ static int check_crl_chain(X509_STORE_CTX *ctx, STACK_OF(X509) *crl_path); static int internal_verify(X509_STORE_CTX *ctx); -const char X509_version[]="X.509"; static int null_callback(int ok, X509_STORE_CTX *e) diff --git a/crypto/x509/x_name.c b/crypto/x509/x_name.c index 762756bf..a1dcd167 100644 --- a/crypto/x509/x_name.c +++ b/crypto/x509/x_name.c @@ -120,7 +120,7 @@ ASN1_ITEM_TEMPLATE_END(X509_NAME_INTERNAL) * to the external form. */ -const ASN1_EXTERN_FUNCS x509_name_ff = { +static const ASN1_EXTERN_FUNCS x509_name_ff = { NULL, x509_name_ex_new, x509_name_ex_free, diff --git a/crypto/x509v3/ext_dat.h b/crypto/x509v3/ext_dat.h index 8b2c123b..f1fb8ef3 100644 --- a/crypto/x509v3/ext_dat.h +++ b/crypto/x509v3/ext_dat.h @@ -55,17 +55,17 @@ /* This file contains a table of "standard" extensions */ -extern X509V3_EXT_METHOD v3_bcons, v3_nscert, v3_key_usage, v3_ext_ku; -extern X509V3_EXT_METHOD v3_pkey_usage_period, v3_sxnet, v3_info, v3_sinfo; -extern X509V3_EXT_METHOD v3_ns_ia5_list[], v3_alt[], v3_skey_id, v3_akey_id; -extern X509V3_EXT_METHOD v3_crl_num, v3_crl_reason, v3_crl_invdate; -extern X509V3_EXT_METHOD v3_delta_crl, v3_cpols, v3_crld, v3_freshest_crl; -extern X509V3_EXT_METHOD v3_ocsp_nonce, v3_ocsp_accresp, v3_ocsp_acutoff; -extern X509V3_EXT_METHOD v3_ocsp_crlid, v3_ocsp_nocheck, v3_ocsp_serviceloc; -extern X509V3_EXT_METHOD v3_crl_hold, v3_pci; -extern X509V3_EXT_METHOD v3_policy_mappings, v3_policy_constraints; -extern X509V3_EXT_METHOD v3_name_constraints, v3_inhibit_anyp, v3_idp; -extern X509V3_EXT_METHOD v3_addr, v3_asid; +extern const X509V3_EXT_METHOD v3_bcons, v3_nscert, v3_key_usage, v3_ext_ku; +extern const X509V3_EXT_METHOD v3_pkey_usage_period, v3_sxnet, v3_info, v3_sinfo; +extern const X509V3_EXT_METHOD v3_ns_ia5_list[], v3_alt[], v3_skey_id, v3_akey_id; +extern const X509V3_EXT_METHOD v3_crl_num, v3_crl_reason, v3_crl_invdate; +extern const X509V3_EXT_METHOD v3_delta_crl, v3_cpols, v3_crld, v3_freshest_crl; +extern const X509V3_EXT_METHOD v3_ocsp_nonce, v3_ocsp_accresp, v3_ocsp_acutoff; +extern const X509V3_EXT_METHOD v3_ocsp_crlid, v3_ocsp_nocheck, v3_ocsp_serviceloc; +extern const X509V3_EXT_METHOD v3_crl_hold, v3_pci; +extern const X509V3_EXT_METHOD v3_policy_mappings, v3_policy_constraints; +extern const X509V3_EXT_METHOD v3_name_constraints, v3_inhibit_anyp, v3_idp; +extern const X509V3_EXT_METHOD v3_addr, v3_asid; /* This table will be searched using OBJ_bsearch so it *must* kept in * order of the ext_nid values. diff --git a/decrepit/cast/cast.c b/decrepit/cast/cast.c index 68bcbe32..94b07106 100644 --- a/decrepit/cast/cast.c +++ b/decrepit/cast/cast.c @@ -62,6 +62,7 @@ #pragma warning(pop) #endif +#include "internal.h" #include "../macros.h" @@ -80,15 +81,6 @@ void CAST_ecb_encrypt(const uint8_t *in, uint8_t *out, const CAST_KEY *ks, l2n(d[1], out); } -extern const uint32_t CAST_S_table0[256]; -extern const uint32_t CAST_S_table1[256]; -extern const uint32_t CAST_S_table2[256]; -extern const uint32_t CAST_S_table3[256]; -extern const uint32_t CAST_S_table4[256]; -extern const uint32_t CAST_S_table5[256]; -extern const uint32_t CAST_S_table6[256]; -extern const uint32_t CAST_S_table7[256]; - #if defined(OPENSSL_WINDOWS) && defined(_MSC_VER) #define ROTL(a, n) (_lrotl(a, n)) #else diff --git a/decrepit/cast/cast_tables.c b/decrepit/cast/cast_tables.c index a00acd84..6808aa89 100644 --- a/decrepit/cast/cast_tables.c +++ b/decrepit/cast/cast_tables.c @@ -56,6 +56,9 @@ #include <openssl/base.h> +#include "internal.h" + + const uint32_t CAST_S_table0[256] = { 0x30fb40d4, 0x9fa0ff0b, 0x6beccd2f, 0x3f258c7a, 0x1e213f2f, 0x9c004dd3, 0x6003e540, 0xcf9fc949, 0xbfd4af27, 0x88bbbdb5, 0xe2034090, 0x98d09675, diff --git a/decrepit/cast/internal.h b/decrepit/cast/internal.h new file mode 100644 index 00000000..15e22226 --- /dev/null +++ b/decrepit/cast/internal.h @@ -0,0 +1,81 @@ +/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) + * All rights reserved. + * + * This package is an SSL implementation written + * by Eric Young (eay@cryptsoft.com). + * The implementation was written so as to conform with Netscapes SSL. + * + * This library is free for commercial and non-commercial use as long as + * the following conditions are aheared to. The following conditions + * apply to all code found in this distribution, be it the RC4, RSA, + * lhash, DES, etc., code; not just the SSL code. The SSL documentation + * included with this distribution is covered by the same copyright terms + * except that the holder is Tim Hudson (tjh@cryptsoft.com). + * + * Copyright remains Eric Young's, and as such any Copyright notices in + * the code are not to be removed. + * If this package is used in a product, Eric Young should be given attribution + * as the author of the parts of the library used. + * This can be in the form of a textual message at program startup or + * in documentation (online or textual) provided with the package. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * "This product includes cryptographic software written by + * Eric Young (eay@cryptsoft.com)" + * The word 'cryptographic' can be left out if the rouines from the library + * being used are not cryptographic related :-). + * 4. If you include any Windows specific code (or a derivative thereof) from + * the apps directory (application code) you must include an acknowledgement: + * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" + * + * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * The licence and distribution terms for any publically available version or + * derivative of this code cannot be changed. i.e. this code cannot simply be + * copied and put under another distribution licence + * [including the GNU Public Licence.] */ + +#ifndef OPENSSL_HEADER_CAST_INTERNAL_H +#define OPENSSL_HEADER_CAST_INTERNAL_H + +#include <openssl/base.h> + +#if defined(__cplusplus) +extern "C" { +#endif + + +extern const uint32_t CAST_S_table0[256]; +extern const uint32_t CAST_S_table1[256]; +extern const uint32_t CAST_S_table2[256]; +extern const uint32_t CAST_S_table3[256]; +extern const uint32_t CAST_S_table4[256]; +extern const uint32_t CAST_S_table5[256]; +extern const uint32_t CAST_S_table6[256]; +extern const uint32_t CAST_S_table7[256]; + + +#if defined(__cplusplus) +} /* extern C */ +#endif + +#endif /* OPENSSL_HEADER_CAST_INTERNAL_H */ diff --git a/ssl/ssl_cipher.c b/ssl/ssl_cipher.c index e87835f0..9365e6c9 100644 --- a/ssl/ssl_cipher.c +++ b/ssl/ssl_cipher.c @@ -155,7 +155,7 @@ /* kCiphers is an array of all supported ciphers, sorted by id. */ -const SSL_CIPHER kCiphers[] = { +static const SSL_CIPHER kCiphers[] = { /* The RSA ciphers */ /* Cipher 02 */ { |