Win32 fixes from stable branch.
This commit is contained in:
Dr. Stephen Henson
parent
7806f3dd4b
commit
d137b56a5b
6 changed files with 17 additions and 19 deletions
11
Configure
11
Configure
|
|
@ -579,7 +579,7 @@ my $threads=0;
|
|||
my $no_shared=0; # but "no-shared" is default
|
||||
my $zlib=1; # but "no-zlib" is default
|
||||
my $no_krb5=0; # but "no-krb5" is implied unless "--with-krb5-..." is used
|
||||
my $rfc3779=1; # but "no-rfc3779" is default
|
||||
my $no_rfc3779=1; # but "no-rfc3779" is default
|
||||
my $no_asm=0;
|
||||
my $no_dso=0;
|
||||
my $no_gmp=0;
|
||||
|
|
@ -626,7 +626,7 @@ my %disabled = ( # "what" => "comment"
|
|||
# For symmetry, "disable-..." is a synonym for "no-...".
|
||||
|
||||
# This is what $depflags will look like with the above default:
|
||||
my $default_depflags = "-DOPENSSL_NO_GMP -DOPENSSL_NO_MDC2 -DOPENSSL_NO_RC5 ";
|
||||
my $default_depflags = "-DOPENSSL_NO_GMP -DOPENSSL_NO_MDC2 -DOPENSSL_NO_RC5 -DOPENSSL_NO_RFC3779";
|
||||
|
||||
|
||||
my $no_sse2=0;
|
||||
|
|
@ -903,8 +903,6 @@ foreach (sort (keys %disabled))
|
|||
{ $symlink = 0; }
|
||||
elsif (/^sse2$/)
|
||||
{ $no_sse2 = 1; }
|
||||
elsif (/^rfc3779$/)
|
||||
{ $rfc3779 = 0; }
|
||||
else
|
||||
{
|
||||
my ($ALGO, $algo);
|
||||
|
|
@ -1141,11 +1139,6 @@ if ($zlib)
|
|||
}
|
||||
}
|
||||
|
||||
if ($rfc3779)
|
||||
{
|
||||
$openssl_other_defines.="#define OPENSSL_RFC3779\n";
|
||||
}
|
||||
|
||||
# You will find shlib_mark1 and shlib_mark2 explained in Makefile.org
|
||||
my $shared_mark = "";
|
||||
if ($shared_target eq "")
|
||||
|
|
|
|||
|
|
@ -68,7 +68,7 @@
|
|||
#include <openssl/asn1t.h>
|
||||
#include <openssl/x509v3.h>
|
||||
|
||||
#ifdef OPENSSL_RFC3779
|
||||
#ifndef OPENSSL_NO_RFC3779
|
||||
|
||||
/*
|
||||
* OpenSSL ASN.1 template translation of RFC 3779 2.2.3.
|
||||
|
|
|
|||
|
|
@ -658,7 +658,7 @@ int X509V3_NAME_from_section(X509_NAME *nm, STACK_OF(CONF_VALUE)*dn_sk,
|
|||
|
||||
void X509_POLICY_NODE_print(BIO *out, X509_POLICY_NODE *node, int indent);
|
||||
|
||||
#ifdef OPENSSL_RFC3779
|
||||
#ifndef OPENSSL_NO_RFC3779
|
||||
|
||||
typedef struct ASRange_st {
|
||||
ASN1_INTEGER *min, *max;
|
||||
|
|
|
|||
|
|
@ -914,18 +914,18 @@ void SSL_CTX_sess_set_new_cb(SSL_CTX *ctx,
|
|||
ctx->new_session_cb=cb;
|
||||
}
|
||||
|
||||
int (*SSL_CTX_sess_get_new_cb(SSL_CTX *ctx))(struct ssl_st */*ssl*/,SSL_SESSION */*sess*/)
|
||||
int (*SSL_CTX_sess_get_new_cb(SSL_CTX *ctx))(SSL *ssl, SSL_SESSION *sess)
|
||||
{
|
||||
return ctx->new_session_cb;
|
||||
}
|
||||
|
||||
void SSL_CTX_sess_set_remove_cb(SSL_CTX *ctx,
|
||||
void (*cb)(struct ssl_ctx_st *ctx,SSL_SESSION *sess))
|
||||
void (*cb)(SSL_CTX *ctx,SSL_SESSION *sess))
|
||||
{
|
||||
ctx->remove_session_cb=cb;
|
||||
}
|
||||
|
||||
void (*SSL_CTX_sess_get_remove_cb(SSL_CTX *ctx))(struct ssl_ctx_st */*ctx*/,SSL_SESSION */*sess*/)
|
||||
void (*SSL_CTX_sess_get_remove_cb(SSL_CTX *ctx))(SSL_CTX * ctx,SSL_SESSION *sess)
|
||||
{
|
||||
return ctx->remove_session_cb;
|
||||
}
|
||||
|
|
@ -937,8 +937,8 @@ void SSL_CTX_sess_set_get_cb(SSL_CTX *ctx,
|
|||
ctx->get_session_cb=cb;
|
||||
}
|
||||
|
||||
SSL_SESSION * (*SSL_CTX_sess_get_get_cb(SSL_CTX *ctx))(struct ssl_st */*ssl*/,
|
||||
unsigned char */*data*/,int /*len*/,int */*copy*/)
|
||||
SSL_SESSION * (*SSL_CTX_sess_get_get_cb(SSL_CTX *ctx))(SSL *ssl,
|
||||
unsigned char *data,int len,int *copy)
|
||||
{
|
||||
return ctx->get_session_cb;
|
||||
}
|
||||
|
|
@ -949,7 +949,7 @@ void SSL_CTX_set_info_callback(SSL_CTX *ctx,
|
|||
ctx->info_callback=cb;
|
||||
}
|
||||
|
||||
void (*SSL_CTX_get_info_callback(SSL_CTX *ctx))(const SSL */*ssl*/,int /*type*/,int /*val*/)
|
||||
void (*SSL_CTX_get_info_callback(SSL_CTX *ctx))(const SSL *ssl,int type,int val)
|
||||
{
|
||||
return ctx->info_callback;
|
||||
}
|
||||
|
|
@ -960,7 +960,7 @@ void SSL_CTX_set_client_cert_cb(SSL_CTX *ctx,
|
|||
ctx->client_cert_cb=cb;
|
||||
}
|
||||
|
||||
int (*SSL_CTX_get_client_cert_cb(SSL_CTX *ctx))(SSL * /*ssl */, X509 **/* x509 */, EVP_PKEY **/*pkey*/)
|
||||
int (*SSL_CTX_get_client_cert_cb(SSL_CTX *ctx))(SSL * ssl, X509 ** x509 , EVP_PKEY **pkey)
|
||||
{
|
||||
return ctx->client_cert_cb;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1038,6 +1038,7 @@ sub read_options
|
|||
"dll" => \$shlib,
|
||||
"shared" => 0,
|
||||
"no-gmp" => 0,
|
||||
"no-rfc3779" => 0,
|
||||
"no-shared" => 0,
|
||||
"no-zlib" => 0,
|
||||
"no-zlib-dynamic" => 0,
|
||||
|
|
|
|||
|
|
@ -95,6 +95,8 @@ my @known_algorithms = ( "RC2", "RC4", "RC5", "IDEA", "DES", "BF",
|
|||
"FP_API", "STDIO", "SOCK", "KRB5", "DGRAM",
|
||||
# Engines
|
||||
"STATIC_ENGINE", "ENGINE", "HW", "GMP",
|
||||
# RFC3779
|
||||
"RFC3779",
|
||||
# TLS
|
||||
"TLSEXT", "PSK",
|
||||
# Deprecated functions
|
||||
|
|
@ -116,7 +118,7 @@ my $no_md2; my $no_md4; my $no_md5; my $no_sha; my $no_ripemd; my $no_mdc2;
|
|||
my $no_rsa; my $no_dsa; my $no_dh; my $no_hmac=0; my $no_aes; my $no_krb5;
|
||||
my $no_ec; my $no_ecdsa; my $no_ecdh; my $no_engine; my $no_hw;
|
||||
my $no_fp_api; my $no_static_engine=1; my $no_gmp; my $no_deprecated;
|
||||
my $no_psk; my $no_tlsext;
|
||||
my $no_rfc3779; my $no_psk; my $no_tlsext;
|
||||
|
||||
|
||||
foreach (@ARGV, split(/ /, $options))
|
||||
|
|
@ -194,6 +196,7 @@ foreach (@ARGV, split(/ /, $options))
|
|||
elsif (/^no-engine$/) { $no_engine=1; }
|
||||
elsif (/^no-hw$/) { $no_hw=1; }
|
||||
elsif (/^no-gmp$/) { $no_gmp=1; }
|
||||
elsif (/^no-rfc3779$/) { $no_rfc3779=1; }
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -1114,6 +1117,7 @@ sub is_valid
|
|||
if ($keyword eq "FP_API" && $no_fp_api) { return 0; }
|
||||
if ($keyword eq "STATIC_ENGINE" && $no_static_engine) { return 0; }
|
||||
if ($keyword eq "GMP" && $no_gmp) { return 0; }
|
||||
if ($keyword eq "RFC3779" && $no_rfc3779) { return 0; }
|
||||
if ($keyword eq "TLSEXT" && $no_tlsext) { return 0; }
|
||||
if ($keyword eq "PSK" && $no_psk) { return 0; }
|
||||
if ($keyword eq "DEPRECATED" && $no_deprecated) { return 0; }
|
||||
|
|
|
|||
Loading…
Reference in a new issue