Browse Source

Constify version strings and some structures.

master
Dr. Stephen Henson 16 years ago
parent
commit
560b79cbff
56 changed files with 70 additions and 70 deletions
  1. +1
    -1
      crypto/aes/aes_misc.c
  2. +1
    -1
      crypto/asn1/asn1_lib.c
  3. +1
    -1
      crypto/bf/bf_ecb.c
  4. +1
    -1
      crypto/bn/bn_lib.c
  5. +1
    -1
      crypto/camellia/cmll_misc.c
  6. +1
    -1
      crypto/cast/c_ecb.c
  7. +1
    -1
      crypto/conf/conf_def.c
  8. +1
    -1
      crypto/conf/conf_lib.c
  9. +2
    -2
      crypto/des/des_ver.h
  10. +2
    -2
      crypto/des/ecb_enc.c
  11. +1
    -1
      crypto/dh/dh_lib.c
  12. +1
    -1
      crypto/dsa/dsa_lib.c
  13. +1
    -1
      crypto/ec/ec_ameth.c
  14. +1
    -1
      crypto/ecdh/ech_lib.c
  15. +1
    -1
      crypto/ecdsa/ecs_lib.c
  16. +1
    -1
      crypto/evp/evp_enc.c
  17. +1
    -1
      crypto/evp/evp_pbe.c
  18. +1
    -1
      crypto/idea/i_ecb.c
  19. +1
    -1
      crypto/lhash/lhash.c
  20. +1
    -1
      crypto/md2/md2_dgst.c
  21. +1
    -1
      crypto/md4/md4_dgst.c
  22. +1
    -1
      crypto/md5/md5_dgst.c
  23. +1
    -1
      crypto/pem/pem_lib.c
  24. +1
    -1
      crypto/rand/md_rand.c
  25. +1
    -1
      crypto/rc2/rc2_ecb.c
  26. +1
    -1
      crypto/rc4/rc4_skey.c
  27. +1
    -1
      crypto/ripemd/rmd_dgst.c
  28. +1
    -1
      crypto/rsa/rsa_lib.c
  29. +1
    -1
      crypto/sha/sha1dgst.c
  30. +1
    -1
      crypto/sha/sha256.c
  31. +1
    -1
      crypto/sha/sha512.c
  32. +1
    -1
      crypto/sha/sha_dgst.c
  33. +1
    -1
      crypto/stack/stack.c
  34. +1
    -1
      crypto/txt_db/txt_db.c
  35. +1
    -1
      crypto/x509/x509_vfy.c
  36. +1
    -1
      crypto/x509v3/v3_addr.c
  37. +1
    -1
      crypto/x509v3/v3_akey.c
  38. +1
    -1
      crypto/x509v3/v3_alt.c
  39. +1
    -1
      crypto/x509v3/v3_asid.c
  40. +1
    -1
      crypto/x509v3/v3_bcons.c
  41. +2
    -2
      crypto/x509v3/v3_bitst.c
  42. +1
    -1
      crypto/x509v3/v3_cpols.c
  43. +2
    -2
      crypto/x509v3/v3_crld.c
  44. +1
    -1
      crypto/x509v3/v3_enum.c
  45. +2
    -2
      crypto/x509v3/v3_extku.c
  46. +1
    -1
      crypto/x509v3/v3_ia5.c
  47. +2
    -2
      crypto/x509v3/v3_info.c
  48. +3
    -3
      crypto/x509v3/v3_int.c
  49. +1
    -1
      crypto/x509v3/v3_ncons.c
  50. +7
    -7
      crypto/x509v3/v3_ocsp.c
  51. +1
    -1
      crypto/x509v3/v3_pci.c
  52. +1
    -1
      crypto/x509v3/v3_pcons.c
  53. +1
    -1
      crypto/x509v3/v3_pku.c
  54. +1
    -1
      crypto/x509v3/v3_pmaps.c
  55. +1
    -1
      crypto/x509v3/v3_skey.c
  56. +1
    -1
      crypto/x509v3/v3_sxnet.c

+ 1
- 1
crypto/aes/aes_misc.c View File

@ -53,7 +53,7 @@
#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


+ 1
- 1
crypto/asn1/asn1_lib.c View File

@ -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);
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)
{


+ 1
- 1
crypto/bf/bf_ecb.c View File

@ -65,7 +65,7 @@
* 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)
{


+ 1
- 1
crypto/bn/bn_lib.c View File

@ -67,7 +67,7 @@
#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


+ 1
- 1
crypto/camellia/cmll_misc.c View File

@ -53,7 +53,7 @@
#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)


+ 1
- 1
crypto/cast/c_ecb.c View File

@ -60,7 +60,7 @@
#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)


+ 1
- 1
crypto/conf/conf_def.c View File

@ -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);
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",


+ 1
- 1
crypto/conf/conf_lib.c View File

@ -63,7 +63,7 @@
#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;


+ 2
- 2
crypto/des/des_ver.h View File

@ -67,5 +67,5 @@
#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 */

+ 2
- 2
crypto/des/ecb_enc.c View File

@ -61,8 +61,8 @@
#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)
{


+ 1
- 1
crypto/dh/dh_lib.c View File

@ -64,7 +64,7 @@
#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;


+ 1
- 1
crypto/dsa/dsa_lib.c View File

@ -70,7 +70,7 @@
#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;


+ 1
- 1
crypto/ec/ec_ameth.c View File

@ -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,


+ 1
- 1
crypto/ecdh/ech_lib.c View File

@ -74,7 +74,7 @@
#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;


+ 1
- 1
crypto/ecdsa/ecs_lib.c View File

@ -61,7 +61,7 @@
#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;


+ 1
- 1
crypto/evp/evp_enc.c View File

@ -66,7 +66,7 @@
#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)
{


+ 1
- 1
crypto/evp/evp_pbe.c View File

@ -77,7 +77,7 @@ typedef struct
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},


+ 1
- 1
crypto/idea/i_ecb.c View File

@ -60,7 +60,7 @@
#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)
{


+ 1
- 1
crypto/lhash/lhash.c View File

@ -100,7 +100,7 @@
#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


+ 1
- 1
crypto/md2/md2_dgst.c View File

@ -63,7 +63,7 @@
#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
*/


+ 1
- 1
crypto/md4/md4_dgst.c View File

@ -60,7 +60,7 @@
#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
*/


+ 1
- 1
crypto/md5/md5_dgst.c View File

@ -60,7 +60,7 @@
#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
*/


+ 1
- 1
crypto/pem/pem_lib.c View File

@ -74,7 +74,7 @@
#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


+ 1
- 1
crypto/rand/md_rand.c View File

@ -153,7 +153,7 @@ static void *locking_thread_idptr = NULL; /* valid iff crypto_lock_rand is set *
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);


+ 1
- 1
crypto/rc2/rc2_ecb.c View File

@ -60,7 +60,7 @@
#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


+ 1
- 1
crypto/rc4/rc4_skey.c View File

@ -60,7 +60,7 @@
#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)
{


+ 1
- 1
crypto/ripemd/rmd_dgst.c View File

@ -60,7 +60,7 @@
#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);


+ 1
- 1
crypto/rsa/rsa_lib.c View File

@ -67,7 +67,7 @@
#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;


+ 1
- 1
crypto/sha/sha1dgst.c View File

@ -64,7 +64,7 @@
#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 */


+ 1
- 1
crypto/sha/sha256.c View File

@ -14,7 +14,7 @@
#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)
{


+ 1
- 1
crypto/sha/sha512.c View File

@ -50,7 +50,7 @@
#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


+ 1
- 1
crypto/sha/sha_dgst.c View File

@ -64,7 +64,7 @@
#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 */


+ 1
- 1
crypto/stack/stack.c View File

@ -73,7 +73,7 @@
#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>


+ 1
- 1
crypto/txt_db/txt_db.c View File

@ -66,7 +66,7 @@
#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)
{


+ 1
- 1
crypto/x509/x509_vfy.c View File

@ -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);
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)


+ 1
- 1
crypto/x509v3/v3_addr.c View File

@ -1045,7 +1045,7 @@ static void *v2i_IPAddrBlocks(struct v3_ext_method *method,
/*
* OpenSSL dispatch
*/
X509V3_EXT_METHOD v3_addr = {
const X509V3_EXT_METHOD v3_addr = {
NID_sbgp_ipAddrBlock, /* nid */
0, /* flags */
ASN1_ITEM_ref(IPAddrBlocks), /* template */


+ 1
- 1
crypto/x509v3/v3_akey.c View File

@ -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);
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),


+ 1
- 1
crypto/x509v3/v3_alt.c View File

@ -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);
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,


+ 1
- 1
crypto/x509v3/v3_asid.c View File

@ -608,7 +608,7 @@ static void *v2i_ASIdentifiers(struct v3_ext_method *method,
/*
* OpenSSL dispatch.
*/
X509V3_EXT_METHOD v3_asid = {
const X509V3_EXT_METHOD v3_asid = {
NID_sbgp_autonomousSysNum, /* nid */
0, /* flags */
ASN1_ITEM_ref(ASIdentifiers), /* template */


+ 1
- 1
crypto/x509v3/v3_bcons.c View File

@ -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);
X509V3_EXT_METHOD v3_bcons = {
const X509V3_EXT_METHOD v3_bcons = {
NID_basic_constraints, 0,
ASN1_ITEM_ref(BASIC_CONSTRAINTS),
0,0,0,0,


+ 2
- 2
crypto/x509v3/v3_bitst.c View File

@ -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)


+ 1
- 1
crypto/x509v3/v3_cpols.c View File

@ -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);
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,


+ 2
- 2
crypto/x509v3/v3_crld.c View File

@ -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);
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,
@ -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);
X509V3_EXT_METHOD v3_idp =
const X509V3_EXT_METHOD v3_idp =
{
NID_issuing_distribution_point, X509V3_EXT_MULTILINE,
ASN1_ITEM_ref(ISSUING_DIST_POINT),


+ 1
- 1
crypto/x509v3/v3_enum.c View File

@ -72,7 +72,7 @@ static ENUMERATED_NAMES crl_reasons[] = {
{-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,


+ 2
- 2
crypto/x509v3/v3_extku.c View File

@ -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);
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,
@ -80,7 +80,7 @@ X509V3_EXT_METHOD v3_ext_ku = {
};
/* 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,


+ 1
- 1
crypto/x509v3/v3_ia5.c View File

@ -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);
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),


+ 2
- 2
crypto/x509v3/v3_info.c View File

@ -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);
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,
@ -78,7 +78,7 @@ X509V3_EXT_METHOD v3_info =
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,


+ 3
- 3
crypto/x509v3/v3_int.c View File

@ -60,14 +60,14 @@
#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};
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,
@ -79,7 +79,7 @@ static void * s2i_asn1_int(X509V3_EXT_METHOD *meth, X509V3_CTX *ctx, char *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,


+ 1
- 1
crypto/x509v3/v3_ncons.c View File

@ -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);
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,


+ 7
- 7
crypto/x509v3/v3_ocsp.c View File

@ -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);
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,
@ -91,7 +91,7 @@ X509V3_EXT_METHOD v3_ocsp_crlid = {
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,
@ -100,7 +100,7 @@ X509V3_EXT_METHOD v3_ocsp_acutoff = {
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,
@ -109,7 +109,7 @@ X509V3_EXT_METHOD v3_crl_invdate = {
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,
@ -118,7 +118,7 @@ X509V3_EXT_METHOD v3_crl_hold = {
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,
@ -130,7 +130,7 @@ X509V3_EXT_METHOD v3_ocsp_nonce = {
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,
@ -139,7 +139,7 @@ X509V3_EXT_METHOD v3_ocsp_nocheck = {
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,


+ 1
- 1
crypto/x509v3/v3_pci.c View File

@ -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);
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,


+ 1
- 1
crypto/x509v3/v3_pcons.c View File

@ -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);
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,


+ 1
- 1
crypto/x509v3/v3_pku.c View File

@ -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);
*/
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,


+ 1
- 1
crypto/x509v3/v3_pmaps.c View File

@ -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);
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,


+ 1
- 1
crypto/x509v3/v3_skey.c View File

@ -62,7 +62,7 @@
#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,


+ 1
- 1
crypto/x509v3/v3_sxnet.c View File

@ -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
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,


Loading…
Cancel
Save