diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2017-12-07 17:37:15 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2017-12-07 17:37:15 +0000 |
| commit | 4f94f84d8491a2455678402b5c7c92e692a272bc (patch) | |
| tree | a4aa27b5b96b57155a4e7c22defb8f25e93cb846 /util | |
| parent | b6a9311a3edd056eaacbcbae2fcb723df5d99057 (diff) | |
| download | src-4f94f84d8491a2455678402b5c7c92e692a272bc.tar.gz src-4f94f84d8491a2455678402b5c7c92e692a272bc.zip | |
Import OpenSSL 1.0.2n.vendor/openssl/1.0.2n
Notes
Notes:
svn path=/vendor-crypto/openssl/dist/; revision=326660
svn path=/vendor-crypto/openssl/1.0.2n/; revision=326661; tag=vendor/openssl/1.0.2n
Diffstat (limited to 'util')
| -rwxr-xr-x | util/copy-if-different.pl | 3 | ||||
| -rw-r--r-- | util/copy.pl | 3 | ||||
| -rwxr-xr-x | util/libeay.num | 3 | ||||
| -rwxr-xr-x | util/mk1mf.pl | 2 |
4 files changed, 7 insertions, 4 deletions
diff --git a/util/copy-if-different.pl b/util/copy-if-different.pl index e1245f54aff1..5420f3f2bd30 100755 --- a/util/copy-if-different.pl +++ b/util/copy-if-different.pl @@ -12,7 +12,8 @@ my @filelist; foreach my $arg (@ARGV) { $arg =~ s|\\|/|g; # compensate for bug/feature in cygwin glob... - foreach (glob qq("$arg")) + $arg = qq("$arg") if ($arg =~ /\s/); # compensate for bug in 5.10... + foreach (glob $arg) { push @filelist, $_; } diff --git a/util/copy.pl b/util/copy.pl index a6b2a54ec6f0..9c0e68c41467 100644 --- a/util/copy.pl +++ b/util/copy.pl @@ -19,7 +19,8 @@ foreach $arg (@ARGV) { next; } $arg =~ s|\\|/|g; # compensate for bug/feature in cygwin glob... - foreach (glob qq("$arg")) + $arg = qq("$arg") if ($arg =~ /\s/); # compensate for bug in 5.10... + foreach (glob $arg) { push @filelist, $_; } diff --git a/util/libeay.num b/util/libeay.num index fddfe1cbb202..f5b4f215098e 100755 --- a/util/libeay.num +++ b/util/libeay.num @@ -4417,7 +4417,8 @@ EC_GROUP_get_mont_data 4772 EXIST::FUNCTION:EC i2d_re_X509_tbs 4773 EXIST::FUNCTION: EVP_PKEY_asn1_set_item 4774 EXIST::FUNCTION: EVP_PKEY_meth_get_init 4775 EXIST::FUNCTION: -EVP_PKEY_meth_get_verify_recover 4776 EXIST::FUNCTION: +EVP_PKEY_meth_get_verify_recover 4776 EXIST:!VMS:FUNCTION: +EVP_PKEY_meth_get_vrfy_recover 4776 EXIST:VMS:FUNCTION: EVP_PKEY_meth_get_keygen 4777 EXIST::FUNCTION: EVP_PKEY_meth_get_derive 4778 EXIST::FUNCTION: EVP_PKEY_meth_get_verifyctx 4779 EXIST::FUNCTION: diff --git a/util/mk1mf.pl b/util/mk1mf.pl index 6b31496ed1e6..ee14dafea6e0 100755 --- a/util/mk1mf.pl +++ b/util/mk1mf.pl @@ -765,7 +765,7 @@ foreach (split(/\s+/,$test)) { $t=&bname($_); $tt="\$(OBJ_D)${o}$t${obj}"; - $tt.=" \$(OBJ_D)${o}ssltestlib${obj}" if $t eq "dtlstest"; + $tt.=" \$(OBJ_D)${o}ssltestlib${obj}" if $t eq "dtlstest" or $t eq "fatalerrtest"; $rules.=&do_link_rule("\$(TEST_D)$o$t$exep",$tt,"\$(LIBS_DEP)","\$(L_LIBS) \$(EX_LIBS)"); } |