diff options
| author | jkim <jkim@FreeBSD.org> | 2014-08-07 21:04:42 +0000 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2014-08-07 21:04:42 +0000 |
| commit | 2bfd7007417a2cd7c442bf1162e609303f217744 (patch) | |
| tree | 2ead8295addf0f92cbe4bf28f39105c909a6702f /crypto/openssl/util | |
| parent | 95576e5070819ac5bc80e16b237dc5a0061ed9a4 (diff) | |
| download | FreeBSD-src-2bfd7007417a2cd7c442bf1162e609303f217744.zip FreeBSD-src-2bfd7007417a2cd7c442bf1162e609303f217744.tar.gz | |
MFC: r269682
Merge OpenSSL 1.0.1i.
Diffstat (limited to 'crypto/openssl/util')
| -rwxr-xr-x | crypto/openssl/util/mk1mf.pl | 1 | ||||
| -rwxr-xr-x | crypto/openssl/util/mkdef.pl | 7 | ||||
| -rw-r--r-- | crypto/openssl/util/mkerr.pl | 4 | ||||
| -rw-r--r-- | crypto/openssl/util/ssleay.num | 1 |
4 files changed, 10 insertions, 3 deletions
diff --git a/crypto/openssl/util/mk1mf.pl b/crypto/openssl/util/mk1mf.pl index 72fa089..bcd00ba 100755 --- a/crypto/openssl/util/mk1mf.pl +++ b/crypto/openssl/util/mk1mf.pl @@ -1150,6 +1150,7 @@ sub read_options "no-montasm" => 0, "no-shared" => 0, "no-store" => 0, + "no-unit-test" => 0, "no-zlib" => 0, "no-zlib-dynamic" => 0, "fips" => \$fips diff --git a/crypto/openssl/util/mkdef.pl b/crypto/openssl/util/mkdef.pl index 9a8c7b8..79d4de8 100755 --- a/crypto/openssl/util/mkdef.pl +++ b/crypto/openssl/util/mkdef.pl @@ -116,7 +116,9 @@ my @known_algorithms = ( "RC2", "RC4", "RC5", "IDEA", "DES", "BF", # Hide SSL internals "SSL_INTERN", # SCTP - "SCTP"); + "SCTP", + # Unit testing + "UNIT_TEST"); my $options=""; open(IN,"<Makefile") || die "unable to open Makefile!\n"; @@ -137,6 +139,7 @@ my $no_fp_api; my $no_static_engine=1; my $no_gmp; my $no_deprecated; my $no_rfc3779; my $no_psk; my $no_tlsext; my $no_cms; my $no_capieng; my $no_jpake; my $no_srp; my $no_ssl2; my $no_ec2m; my $no_nistp_gcc; my $no_nextprotoneg; my $no_sctp; +my $no_unit_test; my $fips; @@ -235,6 +238,7 @@ foreach (@ARGV, split(/ /, $options)) elsif (/^no-jpake$/) { $no_jpake=1; } elsif (/^no-srp$/) { $no_srp=1; } elsif (/^no-sctp$/) { $no_sctp=1; } + elsif (/^no-unit-test$/){ $no_unit_test=1; } } @@ -1205,6 +1209,7 @@ sub is_valid if ($keyword eq "JPAKE" && $no_jpake) { return 0; } if ($keyword eq "SRP" && $no_srp) { return 0; } if ($keyword eq "SCTP" && $no_sctp) { return 0; } + if ($keyword eq "UNIT_TEST" && $no_unit_test) { return 0; } if ($keyword eq "DEPRECATED" && $no_deprecated) { return 0; } # Nothing recognise as true diff --git a/crypto/openssl/util/mkerr.pl b/crypto/openssl/util/mkerr.pl index aec401c..ee23a82 100644 --- a/crypto/openssl/util/mkerr.pl +++ b/crypto/openssl/util/mkerr.pl @@ -787,7 +787,7 @@ foreach (keys %rcodes) { push (@runref, $_) unless exists $urcodes{$_}; } -if($debug && defined(@funref) ) { +if($debug && @funref) { print STDERR "The following function codes were not referenced:\n"; foreach(sort @funref) { @@ -795,7 +795,7 @@ if($debug && defined(@funref) ) { } } -if($debug && defined(@runref) ) { +if($debug && @runref) { print STDERR "The following reason codes were not referenced:\n"; foreach(sort @runref) { diff --git a/crypto/openssl/util/ssleay.num b/crypto/openssl/util/ssleay.num index 37655bc..1c05a3c 100644 --- a/crypto/openssl/util/ssleay.num +++ b/crypto/openssl/util/ssleay.num @@ -181,6 +181,7 @@ SSL_get_verify_depth 229 EXIST::FUNCTION: SSL_CTX_set_session_id_context 231 EXIST::FUNCTION: SSL_CTX_set_cert_verify_callback 232 EXIST:!VMS:FUNCTION: SSL_CTX_set_cert_verify_cb 232 EXIST:VMS:FUNCTION: +SSL_test_functions 233 EXIST::FUNCTION:UNIT_TEST SSL_CTX_set_default_passwd_cb_userdata 235 EXIST:!VMS:FUNCTION: SSL_CTX_set_def_passwd_cb_ud 235 EXIST:VMS:FUNCTION: SSL_set_purpose 236 EXIST::FUNCTION: |
