aboutsummaryrefslogtreecommitdiff
path: root/deps/openssl/openssl/util
diff options
context:
space:
mode:
authorDaniel Bevenius <daniel.bevenius@gmail.com>2017-05-26 07:27:45 +0200
committerShigeki Ohtsu <ohtsu@ohtsu.org>2017-06-03 00:41:47 +0900
commitbd4a53493b4d130e39955a2497995707666cffd4 (patch)
treeca6d428d3eca9528608af14f0d969f8999e87c64 /deps/openssl/openssl/util
parenta235e670a820107210be27e0cd266164763fb014 (diff)
downloadandroid-node-v8-bd4a53493b4d130e39955a2497995707666cffd4.tar.gz
android-node-v8-bd4a53493b4d130e39955a2497995707666cffd4.tar.bz2
android-node-v8-bd4a53493b4d130e39955a2497995707666cffd4.zip
deps: upgrade openssl sources to 1.0.2l
This replaces all sources of openssl-1.0.2l.tar.gz into deps/openssl/openssl Fixes: https://github.com/nodejs/node/issues/13161 PR-URL: https://github.com/nodejs/node/pull/13233 Reviewed-By: Shigeki Ohtsu <ohtsu@ohtsu.org> Reviewed-By: Sam Roberts <vieuxtech@gmail.com> Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
Diffstat (limited to 'deps/openssl/openssl/util')
-rwxr-xr-xdeps/openssl/openssl/util/domd6
-rwxr-xr-xdeps/openssl/openssl/util/mk1mf.pl1
2 files changed, 4 insertions, 3 deletions
diff --git a/deps/openssl/openssl/util/domd b/deps/openssl/openssl/util/domd
index bc2a85f7dd..5a92559c9b 100755
--- a/deps/openssl/openssl/util/domd
+++ b/deps/openssl/openssl/util/domd
@@ -34,11 +34,11 @@ else
${PERL} $TOP/util/clean-depend.pl < Makefile > Makefile.new
RC=$?
fi
-if ! cmp -s Makefile.save Makefile.new; then
- mv Makefile.new Makefile
-else
+if cmp -s Makefile.save Makefile.new; then
mv Makefile.save Makefile
rm -f Makefile.new
+else
+ mv Makefile.new Makefile
fi
# unfake the presence of Kerberos
rm $TOP/krb5.h
diff --git a/deps/openssl/openssl/util/mk1mf.pl b/deps/openssl/openssl/util/mk1mf.pl
index 7a3ae11f78..490a034e40 100755
--- a/deps/openssl/openssl/util/mk1mf.pl
+++ b/deps/openssl/openssl/util/mk1mf.pl
@@ -1207,6 +1207,7 @@ sub read_options
"no-ssl3-method" => 0,
"no-tlsext" => \$no_tlsext,
"no-tls1" => \$no_tls1,
+ "no-dtls1" => 0,
"no-srp" => \$no_srp,
"no-cms" => \$no_cms,
"no-jpake" => \$no_jpake,