Update from HEAD.
This commit is contained in:
parent
5190ddd445
commit
566933a8ba
48 changed files with 60 additions and 60 deletions
|
@ -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
|
||||
|
|
|
@ -64,7 +64,7 @@
|
|||
|
||||
static int asn1_get_length(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;
|
||||
|
||||
int ASN1_check_infinite_end(unsigned char **p, long len)
|
||||
{
|
||||
|
|
|
@ -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)
|
||||
{
|
||||
|
|
|
@ -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;
|
||||
|
||||
/* For a 32 bit machine
|
||||
* 2 - 4 == 128
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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",
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
|
@ -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 */
|
||||
|
|
|
@ -62,8 +62,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)
|
||||
{
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
|
@ -67,7 +67,7 @@
|
|||
#include <openssl/engine.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;
|
||||
|
||||
|
|
|
@ -65,7 +65,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)
|
||||
{
|
||||
|
|
|
@ -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)
|
||||
{
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -65,7 +65,7 @@
|
|||
#include <openssl/fips.h>
|
||||
#include <openssl/err.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
|
||||
*/
|
||||
|
|
|
@ -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
|
||||
*/
|
||||
|
|
|
@ -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
|
||||
*/
|
||||
|
|
|
@ -69,7 +69,7 @@
|
|||
#include <openssl/des.h>
|
||||
#endif
|
||||
|
||||
const char *PEM_version="PEM" OPENSSL_VERSION_PTEXT;
|
||||
const char PEM_version[]="PEM" OPENSSL_VERSION_PTEXT;
|
||||
|
||||
#define MIN_LENGTH 4
|
||||
|
||||
|
|
|
@ -153,7 +153,7 @@ static unsigned long locking_thread = 0; /* 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);
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -62,7 +62,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)
|
||||
{
|
||||
|
|
|
@ -61,7 +61,7 @@
|
|||
#include <openssl/fips.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,int num);
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
|
@ -65,7 +65,7 @@
|
|||
#include <openssl/opensslconf.h>
|
||||
|
||||
#ifndef OPENSSL_FIPS
|
||||
const char *SHA1_version="SHA1" OPENSSL_VERSION_PTEXT;
|
||||
const char SHA1_version[]="SHA1" OPENSSL_VERSION_PTEXT;
|
||||
|
||||
/* The implementation is in ../md32_common.h */
|
||||
|
||||
|
|
|
@ -63,7 +63,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 */
|
||||
|
||||
|
|
|
@ -72,7 +72,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>
|
||||
|
||||
|
|
|
@ -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)
|
||||
{
|
||||
|
|
|
@ -78,7 +78,7 @@ static int check_trust(X509_STORE_CTX *ctx);
|
|||
static int check_revocation(X509_STORE_CTX *ctx);
|
||||
static int check_cert(X509_STORE_CTX *ctx);
|
||||
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)
|
||||
|
|
|
@ -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),
|
||||
0,0,0,0,
|
||||
0,0,
|
||||
|
|
|
@ -65,7 +65,7 @@ static GENERAL_NAMES *v2i_subject_alt(X509V3_EXT_METHOD *method, X509V3_CTX *ctx
|
|||
static GENERAL_NAMES *v2i_issuer_alt(X509V3_EXT_METHOD *method, X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval);
|
||||
static int copy_email(X509V3_CTX *ctx, GENERAL_NAMES *gens, int move_p);
|
||||
static int copy_issuer(X509V3_CTX *ctx, GENERAL_NAMES *gens);
|
||||
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,
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -94,8 +94,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);
|
||||
|
||||
static STACK_OF(CONF_VALUE) *i2v_ASN1_BIT_STRING(X509V3_EXT_METHOD *method,
|
||||
ASN1_BIT_STRING *bits, STACK_OF(CONF_VALUE) *ret)
|
||||
|
|
|
@ -75,7 +75,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,
|
||||
|
|
|
@ -68,7 +68,7 @@ static STACK_OF(CONF_VALUE) *i2v_crld(X509V3_EXT_METHOD *method,
|
|||
static STACK_OF(DIST_POINT) *v2i_crld(X509V3_EXT_METHOD *method,
|
||||
X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval);
|
||||
|
||||
X509V3_EXT_METHOD v3_crld = {
|
||||
const X509V3_EXT_METHOD v3_crld = {
|
||||
NID_crl_distribution_points, X509V3_EXT_MULTILINE, ASN1_ITEM_ref(CRL_DIST_POINTS),
|
||||
0,0,0,0,
|
||||
0,0,
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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),
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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, 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,
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -68,7 +68,7 @@ static int ssl23_write(SSL *s, const void *buf, int len);
|
|||
static long ssl23_default_timeout(void );
|
||||
static int ssl23_put_cipher_by_char(const SSL_CIPHER *c, unsigned char *p);
|
||||
static SSL_CIPHER *ssl23_get_cipher_by_char(const unsigned char *p);
|
||||
const char *SSL23_version_str="SSLv2/3 compatibility" OPENSSL_VERSION_PTEXT;
|
||||
const char SSL23_version_str[]="SSLv2/3 compatibility" OPENSSL_VERSION_PTEXT;
|
||||
|
||||
static SSL_METHOD SSLv23_data= {
|
||||
TLS1_VERSION,
|
||||
|
|
|
@ -65,7 +65,7 @@
|
|||
#include <openssl/md5.h>
|
||||
|
||||
static long ssl2_default_timeout(void );
|
||||
const char *ssl2_version_str="SSLv2" OPENSSL_VERSION_PTEXT;
|
||||
const char ssl2_version_str[]="SSLv2" OPENSSL_VERSION_PTEXT;
|
||||
|
||||
#define SSL2_NUM_CIPHERS (sizeof(ssl2_ciphers)/sizeof(SSL_CIPHER))
|
||||
|
||||
|
|
|
@ -115,7 +115,7 @@
|
|||
#include "kssl_lcl.h"
|
||||
#include <openssl/md5.h>
|
||||
|
||||
const char *ssl3_version_str="SSLv3" OPENSSL_VERSION_PTEXT;
|
||||
const char ssl3_version_str[]="SSLv3" OPENSSL_VERSION_PTEXT;
|
||||
|
||||
#define SSL3_NUM_CIPHERS (sizeof(ssl3_ciphers)/sizeof(SSL_CIPHER))
|
||||
|
||||
|
|
|
@ -60,7 +60,7 @@
|
|||
#include <openssl/objects.h>
|
||||
#include "ssl_locl.h"
|
||||
|
||||
const char *tls1_version_str="TLSv1" OPENSSL_VERSION_PTEXT;
|
||||
const char tls1_version_str[]="TLSv1" OPENSSL_VERSION_PTEXT;
|
||||
|
||||
static long tls1_default_timeout(void);
|
||||
|
||||
|
|
Loading…
Reference in a new issue