projects
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a6d799d
)
Constify version strings and some structures.
author
Dr. Stephen Henson
<steve@openssl.org>
Sun, 21 Jan 2007 13:07:17 +0000
(13:07 +0000)
committer
Dr. Stephen Henson
<steve@openssl.org>
Sun, 21 Jan 2007 13:07:17 +0000
(13:07 +0000)
56 files changed:
crypto/aes/aes_misc.c
patch
|
blob
|
history
crypto/asn1/asn1_lib.c
patch
|
blob
|
history
crypto/bf/bf_ecb.c
patch
|
blob
|
history
crypto/bn/bn_lib.c
patch
|
blob
|
history
crypto/camellia/cmll_misc.c
patch
|
blob
|
history
crypto/cast/c_ecb.c
patch
|
blob
|
history
crypto/conf/conf_def.c
patch
|
blob
|
history
crypto/conf/conf_lib.c
patch
|
blob
|
history
crypto/des/des_ver.h
patch
|
blob
|
history
crypto/des/ecb_enc.c
patch
|
blob
|
history
crypto/dh/dh_lib.c
patch
|
blob
|
history
crypto/dsa/dsa_lib.c
patch
|
blob
|
history
crypto/ec/ec_ameth.c
patch
|
blob
|
history
crypto/ecdh/ech_lib.c
patch
|
blob
|
history
crypto/ecdsa/ecs_lib.c
patch
|
blob
|
history
crypto/evp/evp_enc.c
patch
|
blob
|
history
crypto/evp/evp_pbe.c
patch
|
blob
|
history
crypto/idea/i_ecb.c
patch
|
blob
|
history
crypto/lhash/lhash.c
patch
|
blob
|
history
crypto/md2/md2_dgst.c
patch
|
blob
|
history
crypto/md4/md4_dgst.c
patch
|
blob
|
history
crypto/md5/md5_dgst.c
patch
|
blob
|
history
crypto/pem/pem_lib.c
patch
|
blob
|
history
crypto/rand/md_rand.c
patch
|
blob
|
history
crypto/rc2/rc2_ecb.c
patch
|
blob
|
history
crypto/rc4/rc4_skey.c
patch
|
blob
|
history
crypto/ripemd/rmd_dgst.c
patch
|
blob
|
history
crypto/rsa/rsa_lib.c
patch
|
blob
|
history
crypto/sha/sha1dgst.c
patch
|
blob
|
history
crypto/sha/sha256.c
patch
|
blob
|
history
crypto/sha/sha512.c
patch
|
blob
|
history
crypto/sha/sha_dgst.c
patch
|
blob
|
history
crypto/stack/stack.c
patch
|
blob
|
history
crypto/txt_db/txt_db.c
patch
|
blob
|
history
crypto/x509/x509_vfy.c
patch
|
blob
|
history
crypto/x509v3/v3_addr.c
patch
|
blob
|
history
crypto/x509v3/v3_akey.c
patch
|
blob
|
history
crypto/x509v3/v3_alt.c
patch
|
blob
|
history
crypto/x509v3/v3_asid.c
patch
|
blob
|
history
crypto/x509v3/v3_bcons.c
patch
|
blob
|
history
crypto/x509v3/v3_bitst.c
patch
|
blob
|
history
crypto/x509v3/v3_cpols.c
patch
|
blob
|
history
crypto/x509v3/v3_crld.c
patch
|
blob
|
history
crypto/x509v3/v3_enum.c
patch
|
blob
|
history
crypto/x509v3/v3_extku.c
patch
|
blob
|
history
crypto/x509v3/v3_ia5.c
patch
|
blob
|
history
crypto/x509v3/v3_info.c
patch
|
blob
|
history
crypto/x509v3/v3_int.c
patch
|
blob
|
history
crypto/x509v3/v3_ncons.c
patch
|
blob
|
history
crypto/x509v3/v3_ocsp.c
patch
|
blob
|
history
crypto/x509v3/v3_pci.c
patch
|
blob
|
history
crypto/x509v3/v3_pcons.c
patch
|
blob
|
history
crypto/x509v3/v3_pku.c
patch
|
blob
|
history
crypto/x509v3/v3_pmaps.c
patch
|
blob
|
history
crypto/x509v3/v3_skey.c
patch
|
blob
|
history
crypto/x509v3/v3_sxnet.c
patch
|
blob
|
history
diff --git
a/crypto/aes/aes_misc.c
b/crypto/aes/aes_misc.c
index 090def25d5ac4b70443d67554a26e170f7efccb2..4fead1b4c7c553b656c5d6eccdb527fdedfbd349 100644
(file)
--- a/
crypto/aes/aes_misc.c
+++ b/
crypto/aes/aes_misc.c
@@
-53,7
+53,7
@@
#include <openssl/aes.h>
#include "aes_locl.h"
#include <openssl/aes.h>
#include "aes_locl.h"
-const char
*AES_version
="AES" OPENSSL_VERSION_PTEXT;
+const char
AES_version[]
="AES" OPENSSL_VERSION_PTEXT;
const char *AES_options(void) {
#ifdef FULL_UNROLL
const char *AES_options(void) {
#ifdef FULL_UNROLL
diff --git
a/crypto/asn1/asn1_lib.c
b/crypto/asn1/asn1_lib.c
index 41e1126e7710423735e16d70eb04bb96786bcf7b..73fc4673319cd12c5b42cd5cd6511a7d7a9e14f0 100644
(file)
--- a/
crypto/asn1/asn1_lib.c
+++ b/
crypto/asn1/asn1_lib.c
@@
-64,7
+64,7
@@
static int asn1_get_length(const unsigned char **pp,int *inf,long *rl,int max);
static void asn1_put_length(unsigned char **pp, int length);
static int asn1_get_length(const unsigned char **pp,int *inf,long *rl,int max);
static void asn1_put_length(unsigned char **pp, int length);
-const char
*ASN1_version
="ASN.1" OPENSSL_VERSION_PTEXT;
+const char
ASN1_version[]
="ASN.1" OPENSSL_VERSION_PTEXT;
static int _asn1_check_infinite_end(const unsigned char **p, long len)
{
static int _asn1_check_infinite_end(const unsigned char **p, long len)
{
diff --git
a/crypto/bf/bf_ecb.c
b/crypto/bf/bf_ecb.c
index 341991636f4ab3634174df44717404a50c846db2..1607cefa32cb615418265add214fb92d0c73a29b 100644
(file)
--- a/
crypto/bf/bf_ecb.c
+++ b/
crypto/bf/bf_ecb.c
@@
-65,7
+65,7
@@
* CAMBRIDGE SECURITY WORKSHOP, CAMBRIDGE, U.K., DECEMBER 9-11, 1993)
*/
* CAMBRIDGE SECURITY WORKSHOP, CAMBRIDGE, U.K., DECEMBER 9-11, 1993)
*/
-const char
*BF_version
="Blowfish" OPENSSL_VERSION_PTEXT;
+const char
BF_version[]
="Blowfish" OPENSSL_VERSION_PTEXT;
const char *BF_options(void)
{
const char *BF_options(void)
{
diff --git
a/crypto/bn/bn_lib.c
b/crypto/bn/bn_lib.c
index 9e0a498bbcc684839c3b7bc06c86b7e3dadc45ef..244a430d7229dd1be92401fa888ac477aa42db75 100644
(file)
--- a/
crypto/bn/bn_lib.c
+++ b/
crypto/bn/bn_lib.c
@@
-67,7
+67,7
@@
#include "cryptlib.h"
#include "bn_lcl.h"
#include "cryptlib.h"
#include "bn_lcl.h"
-const char
*BN_version
="Big Number" OPENSSL_VERSION_PTEXT;
+const char
BN_version[]
="Big Number" OPENSSL_VERSION_PTEXT;
/* This stuff appears to be completely unused, so is deprecated */
#ifndef OPENSSL_NO_DEPRECATED
/* This stuff appears to be completely unused, so is deprecated */
#ifndef OPENSSL_NO_DEPRECATED
diff --git
a/crypto/camellia/cmll_misc.c
b/crypto/camellia/cmll_misc.c
index 63c7fd63fc4676b0d77f15446a9cdcbf6609ff8c..f1047b54e03b427981156f338eb40700c48bd9c4 100644
(file)
--- a/
crypto/camellia/cmll_misc.c
+++ b/
crypto/camellia/cmll_misc.c
@@
-53,7
+53,7
@@
#include <openssl/camellia.h>
#include "cmll_locl.h"
#include <openssl/camellia.h>
#include "cmll_locl.h"
-const char
*CAMELLIA_version
="CAMELLIA" OPENSSL_VERSION_PTEXT;
+const char
CAMELLIA_version[]
="CAMELLIA" OPENSSL_VERSION_PTEXT;
int Camellia_set_key(const unsigned char *userKey, const int bits,
CAMELLIA_KEY *key)
int Camellia_set_key(const unsigned char *userKey, const int bits,
CAMELLIA_KEY *key)
diff --git
a/crypto/cast/c_ecb.c
b/crypto/cast/c_ecb.c
index 0b3da9ad871784d0504396fdee3cc4aef19e9579..f2dc6062267f53c5da922df60ea938038cd43e3a 100644
(file)
--- a/
crypto/cast/c_ecb.c
+++ b/
crypto/cast/c_ecb.c
@@
-60,7
+60,7
@@
#include "cast_lcl.h"
#include <openssl/opensslv.h>
#include "cast_lcl.h"
#include <openssl/opensslv.h>
-const char
*CAST_version
="CAST" OPENSSL_VERSION_PTEXT;
+const char
CAST_version[]
="CAST" OPENSSL_VERSION_PTEXT;
void CAST_ecb_encrypt(const unsigned char *in, unsigned char *out,
CAST_KEY *ks, int enc)
void CAST_ecb_encrypt(const unsigned char *in, unsigned char *out,
CAST_KEY *ks, int enc)
diff --git
a/crypto/conf/conf_def.c
b/crypto/conf/conf_def.c
index 8083a009d71a27c9b11fc4564b305f9a15b2872b..d8bce8732a2ddff20d978ce9f49c8c3c95ba1d18 100644
(file)
--- a/
crypto/conf/conf_def.c
+++ b/
crypto/conf/conf_def.c
@@
-88,7
+88,7
@@
static int def_dump(const CONF *conf, BIO *bp);
static int def_is_number(const CONF *conf, char c);
static int def_to_int(const CONF *conf, char c);
static int def_is_number(const CONF *conf, char c);
static int def_to_int(const CONF *conf, char c);
-const char
*CONF_def_version
="CONF_def" OPENSSL_VERSION_PTEXT;
+const char
CONF_def_version[]
="CONF_def" OPENSSL_VERSION_PTEXT;
static CONF_METHOD default_method = {
"OpenSSL default",
static CONF_METHOD default_method = {
"OpenSSL default",
diff --git
a/crypto/conf/conf_lib.c
b/crypto/conf/conf_lib.c
index a55a5457c634998c070ddc0a7b087230f6d3aa6b..2a3399d269e46d25132349794879967971be6e7d 100644
(file)
--- a/
crypto/conf/conf_lib.c
+++ b/
crypto/conf/conf_lib.c
@@
-63,7
+63,7
@@
#include <openssl/conf_api.h>
#include <openssl/lhash.h>
#include <openssl/conf_api.h>
#include <openssl/lhash.h>
-const char
*CONF_version
="CONF" OPENSSL_VERSION_PTEXT;
+const char
CONF_version[]
="CONF" OPENSSL_VERSION_PTEXT;
static CONF_METHOD *default_CONF_method=NULL;
static CONF_METHOD *default_CONF_method=NULL;
diff --git
a/crypto/des/des_ver.h
b/crypto/des/des_ver.h
index 379bbadda2a7c16ff578df7f7d4169c67b97d797..d1ada258a65c288c1ff100eeab246ab787845c83 100644
(file)
--- a/
crypto/des/des_ver.h
+++ b/
crypto/des/des_ver.h
@@
-67,5
+67,5
@@
#define DES_version OSSL_DES_version
#define libdes_version OSSL_libdes_version
#define DES_version OSSL_DES_version
#define libdes_version OSSL_libdes_version
-OPENSSL_EXTERN const char
*OSSL_DES_version;
/* SSLeay version string */
-OPENSSL_EXTERN const char
*OSSL_libdes_version;
/* old libdes version string */
+OPENSSL_EXTERN const char
OSSL_DES_version[];
/* SSLeay version string */
+OPENSSL_EXTERN const char
OSSL_libdes_version[];
/* old libdes version string */
diff --git
a/crypto/des/ecb_enc.c
b/crypto/des/ecb_enc.c
index 15ef44ec5276103d93fe93c425ac2bd7b2eb72c0..0861988323c6063fb1bfc73aec476c71bdc32c59 100644
(file)
--- a/
crypto/des/ecb_enc.c
+++ b/
crypto/des/ecb_enc.c
@@
-61,8
+61,8
@@
#include <openssl/opensslv.h>
#include <openssl/bio.h>
#include <openssl/opensslv.h>
#include <openssl/bio.h>
-OPENSSL_GLOBAL const char
*libdes_version
="libdes" OPENSSL_VERSION_PTEXT;
-OPENSSL_GLOBAL const char
*DES_version
="DES" OPENSSL_VERSION_PTEXT;
+OPENSSL_GLOBAL const char
libdes_version[]
="libdes" OPENSSL_VERSION_PTEXT;
+OPENSSL_GLOBAL const char
DES_version[]
="DES" OPENSSL_VERSION_PTEXT;
const char *DES_options(void)
{
const char *DES_options(void)
{
diff --git
a/crypto/dh/dh_lib.c
b/crypto/dh/dh_lib.c
index 09965ee2ea8001e59679d6b8dd1fb0f3a5dfce2a..7aef080e7abb998eac1435000e60ea14c0f1414d 100644
(file)
--- a/
crypto/dh/dh_lib.c
+++ b/
crypto/dh/dh_lib.c
@@
-64,7
+64,7
@@
#include <openssl/engine.h>
#endif
#include <openssl/engine.h>
#endif
-const char
*DH_version
="Diffie-Hellman" OPENSSL_VERSION_PTEXT;
+const char
DH_version[]
="Diffie-Hellman" OPENSSL_VERSION_PTEXT;
static const DH_METHOD *default_DH_method = NULL;
static const DH_METHOD *default_DH_method = NULL;
diff --git
a/crypto/dsa/dsa_lib.c
b/crypto/dsa/dsa_lib.c
index b9825791bab46e8ea0358026c91e3a3631e14289..e9b75902dbc25e21ab9565855c33ccdadbc1a272 100644
(file)
--- a/
crypto/dsa/dsa_lib.c
+++ b/
crypto/dsa/dsa_lib.c
@@
-70,7
+70,7
@@
#include <openssl/dh.h>
#endif
#include <openssl/dh.h>
#endif
-const char
*DSA_version
="DSA" OPENSSL_VERSION_PTEXT;
+const char
DSA_version[]
="DSA" OPENSSL_VERSION_PTEXT;
static const DSA_METHOD *default_DSA_method = NULL;
static const DSA_METHOD *default_DSA_method = NULL;
diff --git
a/crypto/ec/ec_ameth.c
b/crypto/ec/ec_ameth.c
index 6c46afb5032f376e6a72f419039c785b769e664d..0b31edd48173b24ffd222abc3a09ed6cd38cfbf6 100644
(file)
--- a/
crypto/ec/ec_ameth.c
+++ b/
crypto/ec/ec_ameth.c
@@
-602,7
+602,7
@@
static int ec_pkey_ctrl(EVP_PKEY *pkey, int op, long arg1, void *arg2)
}
}
-EVP_PKEY_ASN1_METHOD eckey_asn1_meth =
+
const
EVP_PKEY_ASN1_METHOD eckey_asn1_meth =
{
EVP_PKEY_EC,
EVP_PKEY_EC,
{
EVP_PKEY_EC,
EVP_PKEY_EC,
diff --git
a/crypto/ecdh/ech_lib.c
b/crypto/ecdh/ech_lib.c
index 01e75e2a5c0c806d505ac0854bc05a1a5255a900..e89b1d477287ae47956fd48b02cfb0d1f5e4cbfe 100644
(file)
--- a/
crypto/ecdh/ech_lib.c
+++ b/
crypto/ecdh/ech_lib.c
@@
-74,7
+74,7
@@
#endif
#include <openssl/err.h>
#endif
#include <openssl/err.h>
-const char
*ECDH_version
="ECDH" OPENSSL_VERSION_PTEXT;
+const char
ECDH_version[]
="ECDH" OPENSSL_VERSION_PTEXT;
static const ECDH_METHOD *default_ECDH_method = NULL;
static const ECDH_METHOD *default_ECDH_method = NULL;
diff --git
a/crypto/ecdsa/ecs_lib.c
b/crypto/ecdsa/ecs_lib.c
index 1fb9bc9600c86434c43465578446cb27cc72fbd5..85e8a3a7ed9bbfad36d7b409b2e37f4d29090ae0 100644
(file)
--- a/
crypto/ecdsa/ecs_lib.c
+++ b/
crypto/ecdsa/ecs_lib.c
@@
-61,7
+61,7
@@
#include <openssl/err.h>
#include <openssl/bn.h>
#include <openssl/err.h>
#include <openssl/bn.h>
-const char
*ECDSA_version
="ECDSA" OPENSSL_VERSION_PTEXT;
+const char
ECDSA_version[]
="ECDSA" OPENSSL_VERSION_PTEXT;
static const ECDSA_METHOD *default_ECDSA_method = NULL;
static const ECDSA_METHOD *default_ECDSA_method = NULL;
diff --git
a/crypto/evp/evp_enc.c
b/crypto/evp/evp_enc.c
index f0b725def6dfed317dd216d91186a760f0bd4515..a1904993bf768ee37242eab523022e7aee451925 100644
(file)
--- a/
crypto/evp/evp_enc.c
+++ b/
crypto/evp/evp_enc.c
@@
-66,7
+66,7
@@
#endif
#include "evp_locl.h"
#endif
#include "evp_locl.h"
-const char
*EVP_version
="EVP" OPENSSL_VERSION_PTEXT;
+const char
EVP_version[]
="EVP" OPENSSL_VERSION_PTEXT;
void EVP_CIPHER_CTX_init(EVP_CIPHER_CTX *ctx)
{
void EVP_CIPHER_CTX_init(EVP_CIPHER_CTX *ctx)
{
diff --git
a/crypto/evp/evp_pbe.c
b/crypto/evp/evp_pbe.c
index 93217e202737d0e91907b937a472519c3375ab9f..97c8103ecda8051e4954d34b4ba2e18d0d4f92a7 100644
(file)
--- a/
crypto/evp/evp_pbe.c
+++ b/
crypto/evp/evp_pbe.c
@@
-77,7
+77,7
@@
typedef struct
EVP_PBE_KEYGEN *keygen;
} EVP_PBE_CTL;
EVP_PBE_KEYGEN *keygen;
} EVP_PBE_CTL;
-EVP_PBE_CTL builtin_pbe[] =
+
static const
EVP_PBE_CTL builtin_pbe[] =
{
{EVP_PBE_TYPE_OUTER, NID_pbeWithMD2AndDES_CBC,
NID_des_cbc, NID_md2, PKCS5_PBE_keyivgen},
{
{EVP_PBE_TYPE_OUTER, NID_pbeWithMD2AndDES_CBC,
NID_des_cbc, NID_md2, PKCS5_PBE_keyivgen},
diff --git
a/crypto/idea/i_ecb.c
b/crypto/idea/i_ecb.c
index fb613db595c438b6df9b501d42393d17a77100e7..fef38230a7d1ad30c25db3c1dfc0941ddf3cfe68 100644
(file)
--- a/
crypto/idea/i_ecb.c
+++ b/
crypto/idea/i_ecb.c
@@
-60,7
+60,7
@@
#include "idea_lcl.h"
#include <openssl/opensslv.h>
#include "idea_lcl.h"
#include <openssl/opensslv.h>
-const char
*IDEA_version
="IDEA" OPENSSL_VERSION_PTEXT;
+const char
IDEA_version[]
="IDEA" OPENSSL_VERSION_PTEXT;
const char *idea_options(void)
{
const char *idea_options(void)
{
diff --git
a/crypto/lhash/lhash.c
b/crypto/lhash/lhash.c
index 373c72dcb6f301c473cb1e35eae327dc3b1bd917..34a54f50d04fd2a5518547f71b9894437db074cd 100644
(file)
--- a/
crypto/lhash/lhash.c
+++ b/
crypto/lhash/lhash.c
@@
-100,7
+100,7
@@
#include <openssl/crypto.h>
#include <openssl/lhash.h>
#include <openssl/crypto.h>
#include <openssl/lhash.h>
-const char
*lh_version
="lhash" OPENSSL_VERSION_PTEXT;
+const char
lh_version[]
="lhash" OPENSSL_VERSION_PTEXT;
#undef MIN_NODES
#define MIN_NODES 16
#undef MIN_NODES
#define MIN_NODES 16
diff --git
a/crypto/md2/md2_dgst.c
b/crypto/md2/md2_dgst.c
index 15e77d60be1778b4eef116b70eaae7be40a6166c..6f68b25c6a8f0520a5e8c0ceeffc5543b21d917f 100644
(file)
--- a/
crypto/md2/md2_dgst.c
+++ b/
crypto/md2/md2_dgst.c
@@
-63,7
+63,7
@@
#include <openssl/opensslv.h>
#include <openssl/crypto.h>
#include <openssl/opensslv.h>
#include <openssl/crypto.h>
-const char
*MD2_version
="MD2" OPENSSL_VERSION_PTEXT;
+const char
MD2_version[]
="MD2" OPENSSL_VERSION_PTEXT;
/* Implemented from RFC1319 The MD2 Message-Digest Algorithm
*/
/* Implemented from RFC1319 The MD2 Message-Digest Algorithm
*/
diff --git
a/crypto/md4/md4_dgst.c
b/crypto/md4/md4_dgst.c
index e5b08f3fce039e5aabdb7a99ea2b1bd69cfb7731..e0c42e8596387d49212d7256c6180c77f46ccaa7 100644
(file)
--- a/
crypto/md4/md4_dgst.c
+++ b/
crypto/md4/md4_dgst.c
@@
-60,7
+60,7
@@
#include "md4_locl.h"
#include <openssl/opensslv.h>
#include "md4_locl.h"
#include <openssl/opensslv.h>
-const char
*MD4_version
="MD4" OPENSSL_VERSION_PTEXT;
+const char
MD4_version[]
="MD4" OPENSSL_VERSION_PTEXT;
/* Implemented from RFC1186 The MD4 Message-Digest Algorithm
*/
/* Implemented from RFC1186 The MD4 Message-Digest Algorithm
*/
diff --git
a/crypto/md5/md5_dgst.c
b/crypto/md5/md5_dgst.c
index 2708e167f7cce0f5893453182584d3394b2cf1fa..beace632e3a12593345260daa6500eceee20a325 100644
(file)
--- a/
crypto/md5/md5_dgst.c
+++ b/
crypto/md5/md5_dgst.c
@@
-60,7
+60,7
@@
#include "md5_locl.h"
#include <openssl/opensslv.h>
#include "md5_locl.h"
#include <openssl/opensslv.h>
-const char
*MD5_version
="MD5" OPENSSL_VERSION_PTEXT;
+const char
MD5_version[]
="MD5" OPENSSL_VERSION_PTEXT;
/* Implemented from RFC1321 The MD5 Message-Digest Algorithm
*/
/* Implemented from RFC1321 The MD5 Message-Digest Algorithm
*/
diff --git
a/crypto/pem/pem_lib.c
b/crypto/pem/pem_lib.c
index 89e41b7f94f112a6a251ee4923f612e8f805057f..20db5013f6d491cf083ed49f6a0bb2afbbefd393 100644
(file)
--- a/
crypto/pem/pem_lib.c
+++ b/
crypto/pem/pem_lib.c
@@
-74,7
+74,7
@@
#include <openssl/engine.h>
#endif
#include <openssl/engine.h>
#endif
-const char
*PEM_version
="PEM" OPENSSL_VERSION_PTEXT;
+const char
PEM_version[]
="PEM" OPENSSL_VERSION_PTEXT;
#define MIN_LENGTH 4
#define MIN_LENGTH 4
diff --git
a/crypto/rand/md_rand.c
b/crypto/rand/md_rand.c
index 4aa13f715646eb35ff7249b25ab390ba4eb9ce60..cfc78774f72fed7b76689983097a4366cd955a8e 100644
(file)
--- a/
crypto/rand/md_rand.c
+++ b/
crypto/rand/md_rand.c
@@
-153,7
+153,7
@@
static void *locking_thread_idptr = NULL; /* valid iff crypto_lock_rand is set *
int rand_predictable=0;
#endif
int rand_predictable=0;
#endif
-const char
*RAND_version
="RAND" OPENSSL_VERSION_PTEXT;
+const char
RAND_version[]
="RAND" OPENSSL_VERSION_PTEXT;
static void ssleay_rand_cleanup(void);
static void ssleay_rand_seed(const void *buf, int num);
static void ssleay_rand_cleanup(void);
static void ssleay_rand_seed(const void *buf, int num);
diff --git
a/crypto/rc2/rc2_ecb.c
b/crypto/rc2/rc2_ecb.c
index d3e8c2718a30b3f969078e089606cd2561a78964..fff86c7af897d1269c25b999e9d5c3a61b645d0f 100644
(file)
--- a/
crypto/rc2/rc2_ecb.c
+++ b/
crypto/rc2/rc2_ecb.c
@@
-60,7
+60,7
@@
#include "rc2_locl.h"
#include <openssl/opensslv.h>
#include "rc2_locl.h"
#include <openssl/opensslv.h>
-const char
*RC2_version
="RC2" OPENSSL_VERSION_PTEXT;
+const char
RC2_version[]
="RC2" OPENSSL_VERSION_PTEXT;
/* RC2 as implemented frm a posting from
* Newsgroups: sci.crypt
/* RC2 as implemented frm a posting from
* Newsgroups: sci.crypt
diff --git
a/crypto/rc4/rc4_skey.c
b/crypto/rc4/rc4_skey.c
index 781ff2d8b9b86e6b2fda2c6f276201b3da9feef6..b22c40b0bd0641c57bdf8b3eab439d9e6fe551d8 100644
(file)
--- a/
crypto/rc4/rc4_skey.c
+++ b/
crypto/rc4/rc4_skey.c
@@
-60,7
+60,7
@@
#include "rc4_locl.h"
#include <openssl/opensslv.h>
#include "rc4_locl.h"
#include <openssl/opensslv.h>
-const char
*RC4_version
="RC4" OPENSSL_VERSION_PTEXT;
+const char
RC4_version[]
="RC4" OPENSSL_VERSION_PTEXT;
const char *RC4_options(void)
{
const char *RC4_options(void)
{
diff --git
a/crypto/ripemd/rmd_dgst.c
b/crypto/ripemd/rmd_dgst.c
index b04d7bf54869810028f08626d9c1f1a3135d8e43..59b017f8c0a7f8fa3fb944db91cb6998c3712274 100644
(file)
--- a/
crypto/ripemd/rmd_dgst.c
+++ b/
crypto/ripemd/rmd_dgst.c
@@
-60,7
+60,7
@@
#include "rmd_locl.h"
#include <openssl/opensslv.h>
#include "rmd_locl.h"
#include <openssl/opensslv.h>
-const char
*RMD160_version
="RIPE-MD160" OPENSSL_VERSION_PTEXT;
+const char
RMD160_version[]
="RIPE-MD160" OPENSSL_VERSION_PTEXT;
# ifdef RMD160_ASM
void ripemd160_block_x86(RIPEMD160_CTX *c, unsigned long *p,size_t num);
# ifdef RMD160_ASM
void ripemd160_block_x86(RIPEMD160_CTX *c, unsigned long *p,size_t num);
diff --git
a/crypto/rsa/rsa_lib.c
b/crypto/rsa/rsa_lib.c
index d9feb88caf035bb1819ec1d2007a80705a602d96..c4b5b4731dc25071820c4463e951fe5a6e018520 100644
(file)
--- a/
crypto/rsa/rsa_lib.c
+++ b/
crypto/rsa/rsa_lib.c
@@
-67,7
+67,7
@@
#include <openssl/engine.h>
#endif
#include <openssl/engine.h>
#endif
-const char
*RSA_version
="RSA" OPENSSL_VERSION_PTEXT;
+const char
RSA_version[]
="RSA" OPENSSL_VERSION_PTEXT;
static const RSA_METHOD *default_RSA_meth=NULL;
static const RSA_METHOD *default_RSA_meth=NULL;
diff --git
a/crypto/sha/sha1dgst.c
b/crypto/sha/sha1dgst.c
index 447ce53e17ee3e630c1ad16e8a6c86c3ec3e6c8f..50d1925cdeb261887d2926140e53fe9cbf4387bd 100644
(file)
--- a/
crypto/sha/sha1dgst.c
+++ b/
crypto/sha/sha1dgst.c
@@
-64,7
+64,7
@@
#include <openssl/opensslv.h>
#include <openssl/opensslv.h>
-const char
*SHA1_version
="SHA1" OPENSSL_VERSION_PTEXT;
+const char
SHA1_version[]
="SHA1" OPENSSL_VERSION_PTEXT;
/* The implementation is in ../md32_common.h */
/* The implementation is in ../md32_common.h */
diff --git
a/crypto/sha/sha256.c
b/crypto/sha/sha256.c
index f687ca832118a8092a48c4ac5d8d6f912c0deed2..8952d87673b6f9c37ab5404f7b5f98fc05aaaefc 100644
(file)
--- a/
crypto/sha/sha256.c
+++ b/
crypto/sha/sha256.c
@@
-14,7
+14,7
@@
#include <openssl/sha.h>
#include <openssl/opensslv.h>
#include <openssl/sha.h>
#include <openssl/opensslv.h>
-const char
*SHA256_version
="SHA-256" OPENSSL_VERSION_PTEXT;
+const char
SHA256_version[]
="SHA-256" OPENSSL_VERSION_PTEXT;
int SHA224_Init (SHA256_CTX *c)
{
int SHA224_Init (SHA256_CTX *c)
{
diff --git
a/crypto/sha/sha512.c
b/crypto/sha/sha512.c
index e7a7e5dea8b21c8a49039aa5ec243a54a4b83d50..439fa0238553adb55da8def40ee12a6ab80d54dd 100644
(file)
--- a/
crypto/sha/sha512.c
+++ b/
crypto/sha/sha512.c
@@
-50,7
+50,7
@@
#include "cryptlib.h"
#include "cryptlib.h"
-const char
*SHA512_version
="SHA-512" OPENSSL_VERSION_PTEXT;
+const char
SHA512_version[]
="SHA-512" OPENSSL_VERSION_PTEXT;
#if defined(_M_IX86) || defined(_M_AMD64) || defined(__i386) || defined(__x86_64)
#define SHA512_BLOCK_CAN_MANAGE_UNALIGNED_DATA
#if defined(_M_IX86) || defined(_M_AMD64) || defined(__i386) || defined(__x86_64)
#define SHA512_BLOCK_CAN_MANAGE_UNALIGNED_DATA
diff --git
a/crypto/sha/sha_dgst.c
b/crypto/sha/sha_dgst.c
index 60465d0c3e937c200b6a1d0f1eaf5766c6a8e591..70eb56032c38a4b4c3b792ab504413d14d546a55 100644
(file)
--- a/
crypto/sha/sha_dgst.c
+++ b/
crypto/sha/sha_dgst.c
@@
-64,7
+64,7
@@
#include <openssl/opensslv.h>
#include <openssl/opensslv.h>
-const char
*SHA_version
="SHA" OPENSSL_VERSION_PTEXT;
+const char
SHA_version[]
="SHA" OPENSSL_VERSION_PTEXT;
/* The implementation is in ../md32_common.h */
/* The implementation is in ../md32_common.h */
diff --git
a/crypto/stack/stack.c
b/crypto/stack/stack.c
index 5967a2c73563684b44432c15007a8f8058367298..378bd7c7968c432dd609f207d0cb646b293dca1d 100644
(file)
--- a/
crypto/stack/stack.c
+++ b/
crypto/stack/stack.c
@@
-73,7
+73,7
@@
#undef MIN_NODES
#define MIN_NODES 4
#undef MIN_NODES
#define MIN_NODES 4
-const char
*STACK_version
="Stack" OPENSSL_VERSION_PTEXT;
+const char
STACK_version[]
="Stack" OPENSSL_VERSION_PTEXT;
#include <errno.h>
#include <errno.h>
diff --git
a/crypto/txt_db/txt_db.c
b/crypto/txt_db/txt_db.c
index e9e503eb073cbb89272adcc6001a531dcbb56aca..3ed5f72ee94b70c825b442a4632e5ce8a5419ecc 100644
(file)
--- a/
crypto/txt_db/txt_db.c
+++ b/
crypto/txt_db/txt_db.c
@@
-66,7
+66,7
@@
#undef BUFSIZE
#define BUFSIZE 512
#undef BUFSIZE
#define BUFSIZE 512
-const char
*TXT_DB_version
="TXT_DB" OPENSSL_VERSION_PTEXT;
+const char
TXT_DB_version[]
="TXT_DB" OPENSSL_VERSION_PTEXT;
TXT_DB *TXT_DB_read(BIO *in, int num)
{
TXT_DB *TXT_DB_read(BIO *in, int num)
{
diff --git
a/crypto/x509/x509_vfy.c
b/crypto/x509/x509_vfy.c
index 8e98b5d0a55c9ca10e0cc34517d2c84abae64a4c..d8ed30a9e80e851b387e14a64f2021e0bc12b679 100644
(file)
--- a/
crypto/x509/x509_vfy.c
+++ b/
crypto/x509/x509_vfy.c
@@
-81,7
+81,7
@@
static int check_policy(X509_STORE_CTX *ctx);
static int crl_akid_check(X509_STORE_CTX *ctx, AUTHORITY_KEYID *akid);
static int idp_check_scope(X509 *x, X509_CRL *crl);
static int internal_verify(X509_STORE_CTX *ctx);
static int crl_akid_check(X509_STORE_CTX *ctx, AUTHORITY_KEYID *akid);
static int idp_check_scope(X509 *x, X509_CRL *crl);
static int internal_verify(X509_STORE_CTX *ctx);
-const char
*X509_version
="X.509" OPENSSL_VERSION_PTEXT;
+const char
X509_version[]
="X.509" OPENSSL_VERSION_PTEXT;
static int null_callback(int ok, X509_STORE_CTX *e)
static int null_callback(int ok, X509_STORE_CTX *e)
diff --git
a/crypto/x509v3/v3_addr.c
b/crypto/x509v3/v3_addr.c
index b9be9995e16938f175a534466db9c30f112f708e..65371051084863824d4b5dbcdcea7c8959ff1375 100644
(file)
--- a/
crypto/x509v3/v3_addr.c
+++ b/
crypto/x509v3/v3_addr.c
@@
-1045,7
+1045,7
@@
static void *v2i_IPAddrBlocks(struct v3_ext_method *method,
/*
* OpenSSL dispatch
*/
/*
* OpenSSL dispatch
*/
-X509V3_EXT_METHOD v3_addr = {
+
const
X509V3_EXT_METHOD v3_addr = {
NID_sbgp_ipAddrBlock, /* nid */
0, /* flags */
ASN1_ITEM_ref(IPAddrBlocks), /* template */
NID_sbgp_ipAddrBlock, /* nid */
0, /* flags */
ASN1_ITEM_ref(IPAddrBlocks), /* template */
diff --git
a/crypto/x509v3/v3_akey.c
b/crypto/x509v3/v3_akey.c
index c481b6f12dc54b34ca6a3c567e844155299ad996..ac0548b7751b2d58c5f703921a7ef257767a0884 100644
(file)
--- a/
crypto/x509v3/v3_akey.c
+++ b/
crypto/x509v3/v3_akey.c
@@
-68,7
+68,7
@@
static STACK_OF(CONF_VALUE) *i2v_AUTHORITY_KEYID(X509V3_EXT_METHOD *method,
static AUTHORITY_KEYID *v2i_AUTHORITY_KEYID(X509V3_EXT_METHOD *method,
X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *values);
static AUTHORITY_KEYID *v2i_AUTHORITY_KEYID(X509V3_EXT_METHOD *method,
X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *values);
-X509V3_EXT_METHOD v3_akey_id =
+
const
X509V3_EXT_METHOD v3_akey_id =
{
NID_authority_key_identifier,
X509V3_EXT_MULTILINE, ASN1_ITEM_ref(AUTHORITY_KEYID),
{
NID_authority_key_identifier,
X509V3_EXT_MULTILINE, ASN1_ITEM_ref(AUTHORITY_KEYID),
diff --git
a/crypto/x509v3/v3_alt.c
b/crypto/x509v3/v3_alt.c
index b38b3dbfe62baffd7a4c8e956e4e16442f886f59..bb2f5bc54ebabbe5ce1b85c36e12c5de75306b3c 100644
(file)
--- a/
crypto/x509v3/v3_alt.c
+++ b/
crypto/x509v3/v3_alt.c
@@
-68,7
+68,7
@@
static int copy_issuer(X509V3_CTX *ctx, GENERAL_NAMES *gens);
static int do_othername(GENERAL_NAME *gen, char *value, X509V3_CTX *ctx);
static int do_dirname(GENERAL_NAME *gen, char *value, X509V3_CTX *ctx);
static int do_othername(GENERAL_NAME *gen, char *value, X509V3_CTX *ctx);
static int do_dirname(GENERAL_NAME *gen, char *value, X509V3_CTX *ctx);
-X509V3_EXT_METHOD v3_alt[] = {
+
const
X509V3_EXT_METHOD v3_alt[] = {
{ NID_subject_alt_name, 0, ASN1_ITEM_ref(GENERAL_NAMES),
0,0,0,0,
0,0,
{ NID_subject_alt_name, 0, ASN1_ITEM_ref(GENERAL_NAMES),
0,0,0,0,
0,0,
diff --git
a/crypto/x509v3/v3_asid.c
b/crypto/x509v3/v3_asid.c
index f155c1f438e59cefd8dd3ce08403272b6a0e0140..7db5c7c9706907acda8907776ab36860411e0e5c 100644
(file)
--- a/
crypto/x509v3/v3_asid.c
+++ b/
crypto/x509v3/v3_asid.c
@@
-608,7
+608,7
@@
static void *v2i_ASIdentifiers(struct v3_ext_method *method,
/*
* OpenSSL dispatch.
*/
/*
* OpenSSL dispatch.
*/
-X509V3_EXT_METHOD v3_asid = {
+
const
X509V3_EXT_METHOD v3_asid = {
NID_sbgp_autonomousSysNum, /* nid */
0, /* flags */
ASN1_ITEM_ref(ASIdentifiers), /* template */
NID_sbgp_autonomousSysNum, /* nid */
0, /* flags */
ASN1_ITEM_ref(ASIdentifiers), /* template */
diff --git
a/crypto/x509v3/v3_bcons.c
b/crypto/x509v3/v3_bcons.c
index cbb012715e55ae39e0660a3a1271ec191b17bf22..74b1233071cba1c55b83c71819b4c9bcce1a3195 100644
(file)
--- a/
crypto/x509v3/v3_bcons.c
+++ b/
crypto/x509v3/v3_bcons.c
@@
-67,7
+67,7
@@
static STACK_OF(CONF_VALUE) *i2v_BASIC_CONSTRAINTS(X509V3_EXT_METHOD *method, BASIC_CONSTRAINTS *bcons, STACK_OF(CONF_VALUE) *extlist);
static BASIC_CONSTRAINTS *v2i_BASIC_CONSTRAINTS(X509V3_EXT_METHOD *method, X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *values);
static STACK_OF(CONF_VALUE) *i2v_BASIC_CONSTRAINTS(X509V3_EXT_METHOD *method, BASIC_CONSTRAINTS *bcons, STACK_OF(CONF_VALUE) *extlist);
static BASIC_CONSTRAINTS *v2i_BASIC_CONSTRAINTS(X509V3_EXT_METHOD *method, X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *values);
-X509V3_EXT_METHOD v3_bcons = {
+
const
X509V3_EXT_METHOD v3_bcons = {
NID_basic_constraints, 0,
ASN1_ITEM_ref(BASIC_CONSTRAINTS),
0,0,0,0,
NID_basic_constraints, 0,
ASN1_ITEM_ref(BASIC_CONSTRAINTS),
0,0,0,0,
diff --git
a/crypto/x509v3/v3_bitst.c
b/crypto/x509v3/v3_bitst.c
index 170c8d280bcc104a15166ac6413b3b14acd1d0ee..cf31f0816eee54004dd767fecf7b3591c343c34d 100644
(file)
--- a/
crypto/x509v3/v3_bitst.c
+++ b/
crypto/x509v3/v3_bitst.c
@@
-88,8
+88,8
@@
static BIT_STRING_BITNAME key_usage_type_table[] = {
-X509V3_EXT_METHOD v3_nscert = EXT_BITSTRING(NID_netscape_cert_type, ns_cert_type_table);
-X509V3_EXT_METHOD v3_key_usage = EXT_BITSTRING(NID_key_usage, key_usage_type_table);
+
const
X509V3_EXT_METHOD v3_nscert = EXT_BITSTRING(NID_netscape_cert_type, ns_cert_type_table);
+
const
X509V3_EXT_METHOD v3_key_usage = EXT_BITSTRING(NID_key_usage, key_usage_type_table);
STACK_OF(CONF_VALUE) *i2v_ASN1_BIT_STRING(X509V3_EXT_METHOD *method,
ASN1_BIT_STRING *bits, STACK_OF(CONF_VALUE) *ret)
STACK_OF(CONF_VALUE) *i2v_ASN1_BIT_STRING(X509V3_EXT_METHOD *method,
ASN1_BIT_STRING *bits, STACK_OF(CONF_VALUE) *ret)
diff --git
a/crypto/x509v3/v3_cpols.c
b/crypto/x509v3/v3_cpols.c
index e5b8c5a1acc2af779a0ed7881117d47d6a1e0884..a40f490aa904ac62abb2f2304e21f0b3de0f972d 100644
(file)
--- a/
crypto/x509v3/v3_cpols.c
+++ b/
crypto/x509v3/v3_cpols.c
@@
-77,7
+77,7
@@
static POLICYQUALINFO *notice_section(X509V3_CTX *ctx,
STACK_OF(CONF_VALUE) *unot, int ia5org);
static int nref_nos(STACK_OF(ASN1_INTEGER) *nnums, STACK_OF(CONF_VALUE) *nos);
STACK_OF(CONF_VALUE) *unot, int ia5org);
static int nref_nos(STACK_OF(ASN1_INTEGER) *nnums, STACK_OF(CONF_VALUE) *nos);
-X509V3_EXT_METHOD v3_cpols = {
+
const
X509V3_EXT_METHOD v3_cpols = {
NID_certificate_policies, 0,ASN1_ITEM_ref(CERTIFICATEPOLICIES),
0,0,0,0,
0,0,
NID_certificate_policies, 0,ASN1_ITEM_ref(CERTIFICATEPOLICIES),
0,0,0,0,
0,0,
diff --git
a/crypto/x509v3/v3_crld.c
b/crypto/x509v3/v3_crld.c
index 5b9d3b453a795b16152f7c5128179a2ccaed8613..26a26d18547a7361d5bee09a0b9b32d04b1e4763 100644
(file)
--- a/
crypto/x509v3/v3_crld.c
+++ b/
crypto/x509v3/v3_crld.c
@@
-68,7
+68,7
@@
static void *v2i_crld(X509V3_EXT_METHOD *method,
static int i2r_crldp(X509V3_EXT_METHOD *method, void *pcrldp, BIO *out,
int indent);
static int i2r_crldp(X509V3_EXT_METHOD *method, void *pcrldp, BIO *out,
int indent);
-X509V3_EXT_METHOD v3_crld =
+
const
X509V3_EXT_METHOD v3_crld =
{
NID_crl_distribution_points, 0, ASN1_ITEM_ref(CRL_DIST_POINTS),
0,0,0,0,
{
NID_crl_distribution_points, 0, ASN1_ITEM_ref(CRL_DIST_POINTS),
0,0,0,0,
@@
-399,7
+399,7
@@
static int i2r_idp(X509V3_EXT_METHOD *method,
static void *v2i_idp(X509V3_EXT_METHOD *method,
X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval);
static void *v2i_idp(X509V3_EXT_METHOD *method,
X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval);
-X509V3_EXT_METHOD v3_idp =
+
const
X509V3_EXT_METHOD v3_idp =
{
NID_issuing_distribution_point, X509V3_EXT_MULTILINE,
ASN1_ITEM_ref(ISSUING_DIST_POINT),
{
NID_issuing_distribution_point, X509V3_EXT_MULTILINE,
ASN1_ITEM_ref(ISSUING_DIST_POINT),
diff --git
a/crypto/x509v3/v3_enum.c
b/crypto/x509v3/v3_enum.c
index 010c9d6260a92939a7f5679a620800db10f4f5b6..a236cb22e158f7ae66f72cf67d4dad14a3b50703 100644
(file)
--- a/
crypto/x509v3/v3_enum.c
+++ b/
crypto/x509v3/v3_enum.c
@@
-72,7
+72,7
@@
static ENUMERATED_NAMES crl_reasons[] = {
{-1, NULL, NULL}
};
{-1, NULL, NULL}
};
-X509V3_EXT_METHOD v3_crl_reason = {
+
const
X509V3_EXT_METHOD v3_crl_reason = {
NID_crl_reason, 0, ASN1_ITEM_ref(ASN1_ENUMERATED),
0,0,0,0,
(X509V3_EXT_I2S)i2s_ASN1_ENUMERATED_TABLE,
NID_crl_reason, 0, ASN1_ITEM_ref(ASN1_ENUMERATED),
0,0,0,0,
(X509V3_EXT_I2S)i2s_ASN1_ENUMERATED_TABLE,
diff --git
a/crypto/x509v3/v3_extku.c
b/crypto/x509v3/v3_extku.c
index 58c1c2e6993538f4a770a4255646eb6da2f1c55c..a4efe0031e1fcc1506f62316a0ef849015e179e5 100644
(file)
--- a/
crypto/x509v3/v3_extku.c
+++ b/
crypto/x509v3/v3_extku.c
@@
-68,7
+68,7
@@
static void *v2i_EXTENDED_KEY_USAGE(X509V3_EXT_METHOD *method,
static STACK_OF(CONF_VALUE) *i2v_EXTENDED_KEY_USAGE(X509V3_EXT_METHOD *method,
void *eku, STACK_OF(CONF_VALUE) *extlist);
static STACK_OF(CONF_VALUE) *i2v_EXTENDED_KEY_USAGE(X509V3_EXT_METHOD *method,
void *eku, STACK_OF(CONF_VALUE) *extlist);
-X509V3_EXT_METHOD v3_ext_ku = {
+
const
X509V3_EXT_METHOD v3_ext_ku = {
NID_ext_key_usage, 0,
ASN1_ITEM_ref(EXTENDED_KEY_USAGE),
0,0,0,0,
NID_ext_key_usage, 0,
ASN1_ITEM_ref(EXTENDED_KEY_USAGE),
0,0,0,0,
@@
-80,7
+80,7
@@
X509V3_EXT_METHOD v3_ext_ku = {
};
/* NB OCSP acceptable responses also is a SEQUENCE OF OBJECT */
};
/* NB OCSP acceptable responses also is a SEQUENCE OF OBJECT */
-X509V3_EXT_METHOD v3_ocsp_accresp = {
+
const
X509V3_EXT_METHOD v3_ocsp_accresp = {
NID_id_pkix_OCSP_acceptableResponses, 0,
ASN1_ITEM_ref(EXTENDED_KEY_USAGE),
0,0,0,0,
NID_id_pkix_OCSP_acceptableResponses, 0,
ASN1_ITEM_ref(EXTENDED_KEY_USAGE),
0,0,0,0,
diff --git
a/crypto/x509v3/v3_ia5.c
b/crypto/x509v3/v3_ia5.c
index 9683afa47c4303c6c3120ec92a96b1b05244cfbb..b739ccd036172aec39eca85c8283436751a31234 100644
(file)
--- a/
crypto/x509v3/v3_ia5.c
+++ b/
crypto/x509v3/v3_ia5.c
@@
-65,7
+65,7
@@
static char *i2s_ASN1_IA5STRING(X509V3_EXT_METHOD *method, ASN1_IA5STRING *ia5);
static ASN1_IA5STRING *s2i_ASN1_IA5STRING(X509V3_EXT_METHOD *method, X509V3_CTX *ctx, char *str);
static char *i2s_ASN1_IA5STRING(X509V3_EXT_METHOD *method, ASN1_IA5STRING *ia5);
static ASN1_IA5STRING *s2i_ASN1_IA5STRING(X509V3_EXT_METHOD *method, X509V3_CTX *ctx, char *str);
-X509V3_EXT_METHOD v3_ns_ia5_list[] = {
+
const
X509V3_EXT_METHOD v3_ns_ia5_list[] = {
EXT_IA5STRING(NID_netscape_base_url),
EXT_IA5STRING(NID_netscape_revocation_url),
EXT_IA5STRING(NID_netscape_ca_revocation_url),
EXT_IA5STRING(NID_netscape_base_url),
EXT_IA5STRING(NID_netscape_revocation_url),
EXT_IA5STRING(NID_netscape_ca_revocation_url),
diff --git
a/crypto/x509v3/v3_info.c
b/crypto/x509v3/v3_info.c
index ab4f0eae194203b0ea5d3d8161ec20a659153892..e0ef69de42313b3aca5f9f10a40fe5f45438f29d 100644
(file)
--- a/
crypto/x509v3/v3_info.c
+++ b/
crypto/x509v3/v3_info.c
@@
-69,7
+69,7
@@
static STACK_OF(CONF_VALUE) *i2v_AUTHORITY_INFO_ACCESS(X509V3_EXT_METHOD *method
static AUTHORITY_INFO_ACCESS *v2i_AUTHORITY_INFO_ACCESS(X509V3_EXT_METHOD *method,
X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval);
static AUTHORITY_INFO_ACCESS *v2i_AUTHORITY_INFO_ACCESS(X509V3_EXT_METHOD *method,
X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval);
-X509V3_EXT_METHOD v3_info =
+
const
X509V3_EXT_METHOD v3_info =
{ NID_info_access, X509V3_EXT_MULTILINE, ASN1_ITEM_ref(AUTHORITY_INFO_ACCESS),
0,0,0,0,
0,0,
{ NID_info_access, X509V3_EXT_MULTILINE, ASN1_ITEM_ref(AUTHORITY_INFO_ACCESS),
0,0,0,0,
0,0,
@@
-78,7
+78,7
@@
X509V3_EXT_METHOD v3_info =
0,0,
NULL};
0,0,
NULL};
-X509V3_EXT_METHOD v3_sinfo =
+
const
X509V3_EXT_METHOD v3_sinfo =
{ NID_sinfo_access, X509V3_EXT_MULTILINE, ASN1_ITEM_ref(AUTHORITY_INFO_ACCESS),
0,0,0,0,
0,0,
{ NID_sinfo_access, X509V3_EXT_MULTILINE, ASN1_ITEM_ref(AUTHORITY_INFO_ACCESS),
0,0,0,0,
0,0,
diff --git
a/crypto/x509v3/v3_int.c
b/crypto/x509v3/v3_int.c
index 85e79c05cad8ca6bafb9728cdc6360f72c303636..9a48dc1508d3c300f52010226e1311dfdb71eb6d 100644
(file)
--- a/
crypto/x509v3/v3_int.c
+++ b/
crypto/x509v3/v3_int.c
@@
-60,14
+60,14
@@
#include "cryptlib.h"
#include <openssl/x509v3.h>
#include "cryptlib.h"
#include <openssl/x509v3.h>
-X509V3_EXT_METHOD v3_crl_num = {
+
const
X509V3_EXT_METHOD v3_crl_num = {
NID_crl_number, 0, ASN1_ITEM_ref(ASN1_INTEGER),
0,0,0,0,
(X509V3_EXT_I2S)i2s_ASN1_INTEGER,
0,
0,0,0,0, NULL};
NID_crl_number, 0, ASN1_ITEM_ref(ASN1_INTEGER),
0,0,0,0,
(X509V3_EXT_I2S)i2s_ASN1_INTEGER,
0,
0,0,0,0, NULL};
-X509V3_EXT_METHOD v3_delta_crl = {
+
const
X509V3_EXT_METHOD v3_delta_crl = {
NID_delta_crl, 0, ASN1_ITEM_ref(ASN1_INTEGER),
0,0,0,0,
(X509V3_EXT_I2S)i2s_ASN1_INTEGER,
NID_delta_crl, 0, ASN1_ITEM_ref(ASN1_INTEGER),
0,0,0,0,
(X509V3_EXT_I2S)i2s_ASN1_INTEGER,
@@
-79,7
+79,7
@@
static void * s2i_asn1_int(X509V3_EXT_METHOD *meth, X509V3_CTX *ctx, char *value
return s2i_ASN1_INTEGER(meth, value);
}
return s2i_ASN1_INTEGER(meth, value);
}
-X509V3_EXT_METHOD v3_inhibit_anyp = {
+
const
X509V3_EXT_METHOD v3_inhibit_anyp = {
NID_inhibit_any_policy, 0, ASN1_ITEM_ref(ASN1_INTEGER),
0,0,0,0,
(X509V3_EXT_I2S)i2s_ASN1_INTEGER,
NID_inhibit_any_policy, 0, ASN1_ITEM_ref(ASN1_INTEGER),
0,0,0,0,
(X509V3_EXT_I2S)i2s_ASN1_INTEGER,
diff --git
a/crypto/x509v3/v3_ncons.c
b/crypto/x509v3/v3_ncons.c
index 5fded6910ea525cb07ebffeecb10e3be60b8bd0c..42e7f5a8797b843d50ec96140c5c2794817d7929 100644
(file)
--- a/
crypto/x509v3/v3_ncons.c
+++ b/
crypto/x509v3/v3_ncons.c
@@
-72,7
+72,7
@@
static int do_i2r_name_constraints(X509V3_EXT_METHOD *method,
BIO *bp, int ind, char *name);
static int print_nc_ipadd(BIO *bp, ASN1_OCTET_STRING *ip);
BIO *bp, int ind, char *name);
static int print_nc_ipadd(BIO *bp, ASN1_OCTET_STRING *ip);
-X509V3_EXT_METHOD v3_name_constraints = {
+
const
X509V3_EXT_METHOD v3_name_constraints = {
NID_name_constraints, 0,
ASN1_ITEM_ref(NAME_CONSTRAINTS),
0,0,0,0,
NID_name_constraints, 0,
ASN1_ITEM_ref(NAME_CONSTRAINTS),
0,0,0,0,
diff --git
a/crypto/x509v3/v3_ocsp.c
b/crypto/x509v3/v3_ocsp.c
index 28c11a4dbfcaf05678ab4f761ab87d8d197ea86c..62aac06335317e1d0c90f5de9dcd502d5dd906df 100644
(file)
--- a/
crypto/x509v3/v3_ocsp.c
+++ b/
crypto/x509v3/v3_ocsp.c
@@
-82,7
+82,7
@@
static int i2r_ocsp_nocheck(X509V3_EXT_METHOD *method, void *nocheck, BIO *out,
static void *s2i_ocsp_nocheck(X509V3_EXT_METHOD *method, X509V3_CTX *ctx, const char *str);
static int i2r_ocsp_serviceloc(X509V3_EXT_METHOD *method, void *in, BIO *bp, int ind);
static void *s2i_ocsp_nocheck(X509V3_EXT_METHOD *method, X509V3_CTX *ctx, const char *str);
static int i2r_ocsp_serviceloc(X509V3_EXT_METHOD *method, void *in, BIO *bp, int ind);
-X509V3_EXT_METHOD v3_ocsp_crlid = {
+
const
X509V3_EXT_METHOD v3_ocsp_crlid = {
NID_id_pkix_OCSP_CrlID, 0, ASN1_ITEM_ref(OCSP_CRLID),
0,0,0,0,
0,0,
NID_id_pkix_OCSP_CrlID, 0, ASN1_ITEM_ref(OCSP_CRLID),
0,0,0,0,
0,0,
@@
-91,7
+91,7
@@
X509V3_EXT_METHOD v3_ocsp_crlid = {
NULL
};
NULL
};
-X509V3_EXT_METHOD v3_ocsp_acutoff = {
+
const
X509V3_EXT_METHOD v3_ocsp_acutoff = {
NID_id_pkix_OCSP_archiveCutoff, 0, ASN1_ITEM_ref(ASN1_GENERALIZEDTIME),
0,0,0,0,
0,0,
NID_id_pkix_OCSP_archiveCutoff, 0, ASN1_ITEM_ref(ASN1_GENERALIZEDTIME),
0,0,0,0,
0,0,
@@
-100,7
+100,7
@@
X509V3_EXT_METHOD v3_ocsp_acutoff = {
NULL
};
NULL
};
-X509V3_EXT_METHOD v3_crl_invdate = {
+
const
X509V3_EXT_METHOD v3_crl_invdate = {
NID_invalidity_date, 0, ASN1_ITEM_ref(ASN1_GENERALIZEDTIME),
0,0,0,0,
0,0,
NID_invalidity_date, 0, ASN1_ITEM_ref(ASN1_GENERALIZEDTIME),
0,0,0,0,
0,0,
@@
-109,7
+109,7
@@
X509V3_EXT_METHOD v3_crl_invdate = {
NULL
};
NULL
};
-X509V3_EXT_METHOD v3_crl_hold = {
+
const
X509V3_EXT_METHOD v3_crl_hold = {
NID_hold_instruction_code, 0, ASN1_ITEM_ref(ASN1_OBJECT),
0,0,0,0,
0,0,
NID_hold_instruction_code, 0, ASN1_ITEM_ref(ASN1_OBJECT),
0,0,0,0,
0,0,
@@
-118,7
+118,7
@@
X509V3_EXT_METHOD v3_crl_hold = {
NULL
};
NULL
};
-X509V3_EXT_METHOD v3_ocsp_nonce = {
+
const
X509V3_EXT_METHOD v3_ocsp_nonce = {
NID_id_pkix_OCSP_Nonce, 0, NULL,
ocsp_nonce_new,
ocsp_nonce_free,
NID_id_pkix_OCSP_Nonce, 0, NULL,
ocsp_nonce_new,
ocsp_nonce_free,
@@
-130,7
+130,7
@@
X509V3_EXT_METHOD v3_ocsp_nonce = {
NULL
};
NULL
};
-X509V3_EXT_METHOD v3_ocsp_nocheck = {
+
const
X509V3_EXT_METHOD v3_ocsp_nocheck = {
NID_id_pkix_OCSP_noCheck, 0, ASN1_ITEM_ref(ASN1_NULL),
0,0,0,0,
0,s2i_ocsp_nocheck,
NID_id_pkix_OCSP_noCheck, 0, ASN1_ITEM_ref(ASN1_NULL),
0,0,0,0,
0,s2i_ocsp_nocheck,
@@
-139,7
+139,7
@@
X509V3_EXT_METHOD v3_ocsp_nocheck = {
NULL
};
NULL
};
-X509V3_EXT_METHOD v3_ocsp_serviceloc = {
+
const
X509V3_EXT_METHOD v3_ocsp_serviceloc = {
NID_id_pkix_OCSP_serviceLocator, 0, ASN1_ITEM_ref(OCSP_SERVICELOC),
0,0,0,0,
0,0,
NID_id_pkix_OCSP_serviceLocator, 0, ASN1_ITEM_ref(OCSP_SERVICELOC),
0,0,0,0,
0,0,
diff --git
a/crypto/x509v3/v3_pci.c
b/crypto/x509v3/v3_pci.c
index ccb0da548ac4110225a2b1233101aa606a09f488..5158b1dfb3338b2cf3433d37f5427f82b028da1d 100644
(file)
--- a/
crypto/x509v3/v3_pci.c
+++ b/
crypto/x509v3/v3_pci.c
@@
-44,7
+44,7
@@
static int i2r_pci(X509V3_EXT_METHOD *method, PROXY_CERT_INFO_EXTENSION *ext,
static PROXY_CERT_INFO_EXTENSION *r2i_pci(X509V3_EXT_METHOD *method,
X509V3_CTX *ctx, char *str);
static PROXY_CERT_INFO_EXTENSION *r2i_pci(X509V3_EXT_METHOD *method,
X509V3_CTX *ctx, char *str);
-X509V3_EXT_METHOD v3_pci =
+
const
X509V3_EXT_METHOD v3_pci =
{ NID_proxyCertInfo, 0, ASN1_ITEM_ref(PROXY_CERT_INFO_EXTENSION),
0,0,0,0,
0,0,
{ NID_proxyCertInfo, 0, ASN1_ITEM_ref(PROXY_CERT_INFO_EXTENSION),
0,0,0,0,
0,0,
diff --git
a/crypto/x509v3/v3_pcons.c
b/crypto/x509v3/v3_pcons.c
index 91ae862ed795beda98eae5c6605b3d0b84cfa7fa..13248c2adaf455958bef69da4c914e2f611420b1 100644
(file)
--- a/
crypto/x509v3/v3_pcons.c
+++ b/
crypto/x509v3/v3_pcons.c
@@
-69,7
+69,7
@@
static STACK_OF(CONF_VALUE) *i2v_POLICY_CONSTRAINTS(X509V3_EXT_METHOD *method,
static void *v2i_POLICY_CONSTRAINTS(X509V3_EXT_METHOD *method,
X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *values);
static void *v2i_POLICY_CONSTRAINTS(X509V3_EXT_METHOD *method,
X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *values);
-X509V3_EXT_METHOD v3_policy_constraints = {
+
const
X509V3_EXT_METHOD v3_policy_constraints = {
NID_policy_constraints, 0,
ASN1_ITEM_ref(POLICY_CONSTRAINTS),
0,0,0,0,
NID_policy_constraints, 0,
ASN1_ITEM_ref(POLICY_CONSTRAINTS),
0,0,0,0,
diff --git
a/crypto/x509v3/v3_pku.c
b/crypto/x509v3/v3_pku.c
index 49a2e4697acc0469bbf34d3020d4d9ade54914dc..5c4626e89b5b766591ff057dca92a23f1e38b2a1 100644
(file)
--- a/
crypto/x509v3/v3_pku.c
+++ b/
crypto/x509v3/v3_pku.c
@@
-66,7
+66,7
@@
static int i2r_PKEY_USAGE_PERIOD(X509V3_EXT_METHOD *method, PKEY_USAGE_PERIOD *u
/*
static PKEY_USAGE_PERIOD *v2i_PKEY_USAGE_PERIOD(X509V3_EXT_METHOD *method, X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *values);
*/
/*
static PKEY_USAGE_PERIOD *v2i_PKEY_USAGE_PERIOD(X509V3_EXT_METHOD *method, X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *values);
*/
-X509V3_EXT_METHOD v3_pkey_usage_period = {
+
const
X509V3_EXT_METHOD v3_pkey_usage_period = {
NID_private_key_usage_period, 0, ASN1_ITEM_ref(PKEY_USAGE_PERIOD),
0,0,0,0,
0,0,0,0,
NID_private_key_usage_period, 0, ASN1_ITEM_ref(PKEY_USAGE_PERIOD),
0,0,0,0,
0,0,0,0,
diff --git
a/crypto/x509v3/v3_pmaps.c
b/crypto/x509v3/v3_pmaps.c
index 137be58ad91a3f7501b58f37f04e434e394b7c83..626303264f715f69a94a90271d858c33342a692e 100644
(file)
--- a/
crypto/x509v3/v3_pmaps.c
+++ b/
crypto/x509v3/v3_pmaps.c
@@
-68,7
+68,7
@@
static void *v2i_POLICY_MAPPINGS(X509V3_EXT_METHOD *method,
static STACK_OF(CONF_VALUE) *i2v_POLICY_MAPPINGS(X509V3_EXT_METHOD *method,
void *pmps, STACK_OF(CONF_VALUE) *extlist);
static STACK_OF(CONF_VALUE) *i2v_POLICY_MAPPINGS(X509V3_EXT_METHOD *method,
void *pmps, STACK_OF(CONF_VALUE) *extlist);
-X509V3_EXT_METHOD v3_policy_mappings = {
+
const
X509V3_EXT_METHOD v3_policy_mappings = {
NID_policy_mappings, 0,
ASN1_ITEM_ref(POLICY_MAPPINGS),
0,0,0,0,
NID_policy_mappings, 0,
ASN1_ITEM_ref(POLICY_MAPPINGS),
0,0,0,0,
diff --git
a/crypto/x509v3/v3_skey.c
b/crypto/x509v3/v3_skey.c
index b17a72d46ce208c3b59df130072a59b244364102..da0a3558f65bb85fc53f42f9c70afbfe6fe8e9ab 100644
(file)
--- a/
crypto/x509v3/v3_skey.c
+++ b/
crypto/x509v3/v3_skey.c
@@
-62,7
+62,7
@@
#include <openssl/x509v3.h>
static ASN1_OCTET_STRING *s2i_skey_id(X509V3_EXT_METHOD *method, X509V3_CTX *ctx, char *str);
#include <openssl/x509v3.h>
static ASN1_OCTET_STRING *s2i_skey_id(X509V3_EXT_METHOD *method, X509V3_CTX *ctx, char *str);
-X509V3_EXT_METHOD v3_skey_id = {
+
const
X509V3_EXT_METHOD v3_skey_id = {
NID_subject_key_identifier, 0, ASN1_ITEM_ref(ASN1_OCTET_STRING),
0,0,0,0,
(X509V3_EXT_I2S)i2s_ASN1_OCTET_STRING,
NID_subject_key_identifier, 0, ASN1_ITEM_ref(ASN1_OCTET_STRING),
0,0,0,0,
(X509V3_EXT_I2S)i2s_ASN1_OCTET_STRING,
diff --git
a/crypto/x509v3/v3_sxnet.c
b/crypto/x509v3/v3_sxnet.c
index 819e2e670dac47328657d1b7bf5058c9cea7192b..eaea9ea01b4ba52e84fa9940d3a298e2df7c4958 100644
(file)
--- a/
crypto/x509v3/v3_sxnet.c
+++ b/
crypto/x509v3/v3_sxnet.c
@@
-72,7
+72,7
@@
static int sxnet_i2r(X509V3_EXT_METHOD *method, SXNET *sx, BIO *out, int indent)
static SXNET * sxnet_v2i(X509V3_EXT_METHOD *method, X509V3_CTX *ctx,
STACK_OF(CONF_VALUE) *nval);
#endif
static SXNET * sxnet_v2i(X509V3_EXT_METHOD *method, X509V3_CTX *ctx,
STACK_OF(CONF_VALUE) *nval);
#endif
-X509V3_EXT_METHOD v3_sxnet = {
+
const
X509V3_EXT_METHOD v3_sxnet = {
NID_sxnet, X509V3_EXT_MULTILINE, ASN1_ITEM_ref(SXNET),
0,0,0,0,
0,0,
NID_sxnet, X509V3_EXT_MULTILINE, ASN1_ITEM_ref(SXNET),
0,0,0,0,
0,0,