diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2017-11-02 17:35:19 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2017-11-02 17:35:19 +0000 |
| commit | b6a9311a3edd056eaacbcbae2fcb723df5d99057 (patch) | |
| tree | 720225dbdc898757e7df9a925ec85ade660013c1 /util | |
| parent | 12df5ad9af4981f5d3c31a9819d31618c0f1af51 (diff) | |
Diffstat (limited to 'util')
| -rwxr-xr-x | util/copy-if-different.pl | 2 | ||||
| -rw-r--r-- | util/copy.pl | 2 | ||||
| -rwxr-xr-x | util/libeay.num | 16 | ||||
| -rwxr-xr-x | util/mk1mf.pl | 4 |
4 files changed, 19 insertions, 5 deletions
diff --git a/util/copy-if-different.pl b/util/copy-if-different.pl index ec99e084b56a9..e1245f54aff12 100755 --- a/util/copy-if-different.pl +++ b/util/copy-if-different.pl @@ -12,7 +12,7 @@ my @filelist; foreach my $arg (@ARGV) { $arg =~ s|\\|/|g; # compensate for bug/feature in cygwin glob... - foreach (glob $arg) + foreach (glob qq("$arg")) { push @filelist, $_; } diff --git a/util/copy.pl b/util/copy.pl index eba6d5815e9ce..a6b2a54ec6f06 100644 --- a/util/copy.pl +++ b/util/copy.pl @@ -19,7 +19,7 @@ foreach $arg (@ARGV) { next; } $arg =~ s|\\|/|g; # compensate for bug/feature in cygwin glob... - foreach (glob $arg) + foreach (glob qq("$arg")) { push @filelist, $_; } diff --git a/util/libeay.num b/util/libeay.num index 2094ab364c8e1..fddfe1cbb2024 100755 --- a/util/libeay.num +++ b/util/libeay.num @@ -4370,7 +4370,7 @@ DH_compute_key_padded 4732 EXIST::FUNCTION:DH ECDSA_METHOD_set_sign 4733 EXIST::FUNCTION:ECDSA CMS_RecipientEncryptedKey_cert_cmp 4734 EXIST:!VMS:FUNCTION:CMS CMS_RecipEncryptedKey_cert_cmp 4734 EXIST:VMS:FUNCTION:CMS -DH_KDF_X9_42 4735 EXIST::FUNCTION:DH +DH_KDF_X9_42 4735 EXIST::FUNCTION:CMS,DH RSA_OAEP_PARAMS_free 4736 EXIST::FUNCTION:RSA EVP_des_ede3_wrap 4737 EXIST::FUNCTION:DES RSA_OAEP_PARAMS_it 4738 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:RSA @@ -4416,3 +4416,17 @@ X509_VERIFY_PARAM_add1_host 4771 EXIST::FUNCTION: 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_keygen 4777 EXIST::FUNCTION: +EVP_PKEY_meth_get_derive 4778 EXIST::FUNCTION: +EVP_PKEY_meth_get_verifyctx 4779 EXIST::FUNCTION: +EVP_PKEY_meth_get_paramgen 4780 EXIST::FUNCTION: +EVP_PKEY_meth_get_verify 4781 EXIST::FUNCTION: +EVP_PKEY_meth_get_sign 4782 EXIST::FUNCTION: +EVP_PKEY_meth_get_signctx 4783 EXIST::FUNCTION: +EVP_PKEY_meth_get_ctrl 4784 EXIST::FUNCTION: +EVP_PKEY_meth_get_decrypt 4785 EXIST::FUNCTION: +EVP_PKEY_meth_get_cleanup 4786 EXIST::FUNCTION: +EVP_PKEY_meth_get_encrypt 4787 EXIST::FUNCTION: +EVP_PKEY_meth_get_copy 4788 EXIST::FUNCTION: diff --git a/util/mk1mf.pl b/util/mk1mf.pl index 490a034e4037e..6b31496ed1e69 100755 --- a/util/mk1mf.pl +++ b/util/mk1mf.pl @@ -428,7 +428,7 @@ EOF { $extra_install .= <<"EOF" \$(MKDIR) \"\$(INSTALLTOP)${o}lib${o}engines\" - \$(CP) \"\$(E_SHLIB)\" \"\$(INSTALLTOP)${o}lib${o}engines\" + \$(CP) \$(E_SHLIB) \"\$(INSTALLTOP)${o}lib${o}engines\" EOF } } @@ -608,7 +608,7 @@ install: all \$(MKDIR) \"\$(INSTALLTOP)${o}include${o}openssl\" \$(MKDIR) \"\$(INSTALLTOP)${o}lib\" \$(CP) \"\$(INCO_D)${o}*.\[ch\]\" \"\$(INSTALLTOP)${o}include${o}openssl\" - \$(CP) \"\$(BIN_D)$o\$(E_EXE)$exep \$(INSTALLTOP)${o}bin\" + \$(CP) \"\$(BIN_D)$o\$(E_EXE)$exep\" \"\$(INSTALLTOP)${o}bin\" \$(MKDIR) \"\$(OPENSSLDIR)\" \$(CP) apps${o}openssl.cnf \"\$(OPENSSLDIR)\" $extra_install |