generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update to Win32 build system to it knows about TLS extension code.

Browse Source
This commit is contained in:
Dr. Stephen Henson
2007-08-12 22:31:16 +00:00
parent ae46e91e4d
commit 2863a6878f
3 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
util/mk1mf.pl
View File

@@ -218,6 +218,7 @@ $cflags.=" -DOPENSSL_NO_DH" if $no_dh;
$cflags.=" -DOPENSSL_NO_SOCK" if $no_sock; $cflags.=" -DOPENSSL_NO_SOCK" if $no_sock;
$cflags.=" -DOPENSSL_NO_SSL2" if $no_ssl2; $cflags.=" -DOPENSSL_NO_SSL2" if $no_ssl2;
$cflags.=" -DOPENSSL_NO_SSL3" if $no_ssl3; $cflags.=" -DOPENSSL_NO_SSL3" if $no_ssl3;
$cflags.=" -DOPENSSL_NO_TLSEXT" if $no_tlsext;
$cflags.=" -DOPENSSL_NO_ERR" if $no_err; $cflags.=" -DOPENSSL_NO_ERR" if $no_err;
$cflags.=" -DOPENSSL_NO_KRB5" if $no_krb5; $cflags.=" -DOPENSSL_NO_KRB5" if $no_krb5;
$cflags.=" -DOPENSSL_NO_EC" if $no_ec; $cflags.=" -DOPENSSL_NO_EC" if $no_ec;
@@ -1011,6 +1012,7 @@ sub read_options
"gaswin" => \$gaswin, "gaswin" => \$gaswin,
"no-ssl2" => \$no_ssl2, "no-ssl2" => \$no_ssl2,
"no-ssl3" => \$no_ssl3, "no-ssl3" => \$no_ssl3,
"no-tlsext" => \$no_tlsext,
"no-err" => \$no_err, "no-err" => \$no_err,
"no-sock" => \$no_sock, "no-sock" => \$no_sock,
"no-krb5" => \$no_krb5, "no-krb5" => \$no_krb5,

7
util/mkdef.pl
View File

@@ -96,6 +96,8 @@ my @known_algorithms = ( "RC2", "RC4", "RC5", "IDEA", "DES", "BF",
"STATIC_ENGINE", "ENGINE", "HW", "GMP", "STATIC_ENGINE", "ENGINE", "HW", "GMP",
# RFC3779 support # RFC3779 support
"RFC3779", "RFC3779",
# TLS extension support
"TLSEXT",
# Deprecated functions # Deprecated functions
"DEPRECATED" ); "DEPRECATED" );
@@ -116,7 +118,7 @@ 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_camellia; my $no_ec; my $no_ecdsa; my $no_ecdh; my $no_engine; my $no_hw; my $no_camellia;
my $no_seed; my $no_seed;
my $no_fp_api; my $no_static_engine; my $no_gmp; my $no_deprecated; my $no_fp_api; my $no_static_engine; my $no_gmp; my $no_deprecated;
my $no_rfc3779; my $no_rfc3779; my $no_tlsext;
foreach (@ARGV, split(/ /, $options)) foreach (@ARGV, split(/ /, $options))
@@ -195,6 +197,7 @@ foreach (@ARGV, split(/ /, $options))
elsif (/^no-hw$/) { $no_hw=1; } elsif (/^no-hw$/) { $no_hw=1; }
elsif (/^no-gmp$/) { $no_gmp=1; } elsif (/^no-gmp$/) { $no_gmp=1; }
elsif (/^no-rfc3779$/) { $no_rfc3779=1; } elsif (/^no-rfc3779$/) { $no_rfc3779=1; }
elsif (/^no-tlsext$/) { $no_tlsext=1; }
} }
@@ -230,6 +233,7 @@ $max_crypto = $max_num;
my $ssl="ssl/ssl.h"; my $ssl="ssl/ssl.h";
$ssl.=" ssl/kssl.h"; $ssl.=" ssl/kssl.h";
$ssl.=" ssl/tls1.h";
my $crypto ="crypto/crypto.h"; my $crypto ="crypto/crypto.h";
$crypto.=" crypto/o_dir.h"; $crypto.=" crypto/o_dir.h";
@@ -1115,6 +1119,7 @@ sub is_valid
if ($keyword eq "STATIC_ENGINE" && $no_static_engine) { return 0; } if ($keyword eq "STATIC_ENGINE" && $no_static_engine) { return 0; }
if ($keyword eq "GMP" && $no_gmp) { return 0; } if ($keyword eq "GMP" && $no_gmp) { return 0; }
if ($keyword eq "RFC3779" && $no_rfc3779) { return 0; } if ($keyword eq "RFC3779" && $no_rfc3779) { return 0; }
if ($keyword eq "TLSEXT" && $no_tlsext) { return 0; }
if ($keyword eq "DEPRECATED" && $no_deprecated) { return 0; } if ($keyword eq "DEPRECATED" && $no_deprecated) { return 0; }
# Nothing recognise as true # Nothing recognise as true

3
util/ssleay.num
View File

@@ -238,3 +238,6 @@ SSL_CTX_set_info_callback 286 EXIST::FUNCTION:
SSL_CTX_sess_get_new_cb 287 EXIST::FUNCTION: SSL_CTX_sess_get_new_cb 287 EXIST::FUNCTION:
SSL_CTX_get_client_cert_cb 288 EXIST::FUNCTION: SSL_CTX_get_client_cert_cb 288 EXIST::FUNCTION:
SSL_CTX_sess_get_remove_cb 289 EXIST::FUNCTION: SSL_CTX_sess_get_remove_cb 289 EXIST::FUNCTION:
SSL_set_SSL_CTX 290 EXIST::FUNCTION:
SSL_get_servername 291 EXIST::FUNCTION:TLSEXT
SSL_get_servername_type 292 EXIST::FUNCTION:TLSEXT