diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2007-08-12 23:59:05 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2007-08-12 23:59:05 +0000 |
| commit | 525de5d3352f663a743b7d214831545aa14779c0 (patch) | |
| tree | 516f0cba5015253186e2bd00847e1f02fbfdb877 /util | |
| parent | 367eb1f125063b9e76b6eaaacd85705023d435b4 (diff) | |
| download | openssl-525de5d3352f663a743b7d214831545aa14779c0.zip openssl-525de5d3352f663a743b7d214831545aa14779c0.tar.gz openssl-525de5d3352f663a743b7d214831545aa14779c0.tar.bz2 | |
OPENSSL_NO_TLS1 WIN32 build support. Fix so normal build works again.
Diffstat (limited to 'util')
| -rwxr-xr-x | util/mk1mf.pl | 2 | ||||
| -rwxr-xr-x | util/mkdef.pl | 1 | ||||
| -rw-r--r-- | util/pl/VC-32.pl | 4 | ||||
| -rwxr-xr-x | util/ssleay.num | 26 |
4 files changed, 18 insertions, 15 deletions
diff --git a/util/mk1mf.pl b/util/mk1mf.pl index 5fb3262..1557936 100755 --- a/util/mk1mf.pl +++ b/util/mk1mf.pl @@ -221,6 +221,7 @@ $cflags.=" -DOPENSSL_NO_WHIRLPOOL" if $no_whirlpool; $cflags.=" -DOPENSSL_NO_SOCK" if $no_sock; $cflags.=" -DOPENSSL_NO_SSL2" if $no_ssl2; $cflags.=" -DOPENSSL_NO_SSL3" if $no_ssl3; +$cflags.=" -DOPENSSL_NO_TLSEXT" if $no_tlsext; $cflags.=" -DOPENSSL_NO_ERR" if $no_err; $cflags.=" -DOPENSSL_NO_KRB5" if $no_krb5; $cflags.=" -DOPENSSL_NO_EC" if $no_ec; @@ -1020,6 +1021,7 @@ sub read_options "gaswin" => \$gaswin, "no-ssl2" => \$no_ssl2, "no-ssl3" => \$no_ssl3, + "no-tlsext" => \$no_tlsext, "no-err" => \$no_err, "no-sock" => \$no_sock, "no-krb5" => \$no_krb5, diff --git a/util/mkdef.pl b/util/mkdef.pl index fb74fab..70ed218 100755 --- a/util/mkdef.pl +++ b/util/mkdef.pl @@ -198,6 +198,7 @@ foreach (@ARGV, split(/ /, $options)) elsif (/^no-hw$/) { $no_hw=1; } elsif (/^no-gmp$/) { $no_gmp=1; } elsif (/^no-rfc3779$/) { $no_rfc3779=1; } + elsif (/^no-tlsext$/) { $no_tlsext=1; } } diff --git a/util/pl/VC-32.pl b/util/pl/VC-32.pl index 0a08673..0043983 100644 --- a/util/pl/VC-32.pl +++ b/util/pl/VC-32.pl @@ -285,7 +285,7 @@ sub do_lib_rule } $ex.=" $zlib_lib" if $zlib_opt == 1 && $target =~ /O_CRYPTO/; $ret.="\t\$(LINK) \$(MLFLAGS) $efile$target $name @<<\n \$(SHLIB_EX_OBJ) $objs $ex\n<<\n"; - $ret.="\tIF EXIST \$@.manifest mt -manifest \$@.manifest -outputresource:\$@;2\n\n"; + $ret.="\tIF EXIST \$@.manifest mt -nologo -manifest \$@.manifest -outputresource:\$@;2\n\n"; } $ret.="\n"; return($ret); @@ -301,7 +301,7 @@ sub do_link_rule $ret.="$target: $files $dep_libs\n"; $ret.="\t\$(LINK) \$(LFLAGS) $efile$target @<<\n"; $ret.=" \$(APP_EX_OBJ) $files $libs\n<<\n"; - $ret.="\tIF EXIST \$@.manifest mt -manifest \$@.manifest -outputresource:\$@;1\n\n"; + $ret.="\tIF EXIST \$@.manifest mt -nologo -manifest \$@.manifest -outputresource:\$@;1\n\n"; return($ret); } diff --git a/util/ssleay.num b/util/ssleay.num index 3c0bf88..8f7548b 100755 --- a/util/ssleay.num +++ b/util/ssleay.num @@ -239,17 +239,17 @@ SSL_CTX_sess_get_new_cb 287 EXIST::FUNCTION: SSL_CTX_get_client_cert_cb 288 EXIST::FUNCTION: SSL_CTX_sess_get_remove_cb 289 EXIST::FUNCTION: SSL_set_SSL_CTX 290 EXIST::FUNCTION: -SSL_CTX_use_psk_identity_hint 291 EXIST::FUNCTION:PSK -SSL_CTX_set_psk_client_callback 292 EXIST::FUNCTION:PSK -SSL_get_psk_identity_hint 293 EXIST::FUNCTION:PSK -SSL_set_psk_server_callback 294 EXIST::FUNCTION:PSK -SSL_use_psk_identity_hint 295 EXIST::FUNCTION:PSK -SSL_set_psk_client_callback 296 EXIST::FUNCTION:PSK -SSL_get_servername 297 EXIST::FUNCTION:TLSEXT -SSL_get_servername_type 298 EXIST::FUNCTION:TLSEXT -SSL_CTX_set_psk_server_callback 299 EXIST::FUNCTION:PSK -SSL_get_psk_identity 300 EXIST::FUNCTION:PSK -PEM_write_bio_SSL_SESSION 301 EXIST::FUNCTION: -PEM_read_SSL_SESSION 302 EXIST:!WIN16:FUNCTION: -PEM_read_bio_SSL_SESSION 303 EXIST::FUNCTION: +SSL_get_servername 291 EXIST::FUNCTION:TLSEXT +SSL_get_servername_type 292 EXIST::FUNCTION:TLSEXT +SSL_CTX_use_psk_identity_hint 293 EXIST::FUNCTION:PSK +SSL_CTX_set_psk_client_callback 294 EXIST::FUNCTION:PSK +PEM_write_bio_SSL_SESSION 295 EXIST::FUNCTION: +SSL_get_psk_identity_hint 296 EXIST::FUNCTION:PSK +SSL_set_psk_server_callback 297 EXIST::FUNCTION:PSK +SSL_use_psk_identity_hint 298 EXIST::FUNCTION:PSK +SSL_set_psk_client_callback 299 EXIST::FUNCTION:PSK +PEM_read_SSL_SESSION 300 EXIST:!WIN16:FUNCTION: +PEM_read_bio_SSL_SESSION 301 EXIST::FUNCTION: +SSL_CTX_set_psk_server_callback 302 EXIST::FUNCTION:PSK +SSL_get_psk_identity 303 EXIST::FUNCTION:PSK PEM_write_SSL_SESSION 304 EXIST:!WIN16:FUNCTION: |