aboutsummaryrefslogtreecommitdiff
path: root/deps/openssl/openssl/demos
diff options
context:
space:
mode:
authorShigeki Ohtsu <ohtsu@iij.ad.jp>2015-06-12 00:00:05 +0900
committerShigeki Ohtsu <ohtsu@iij.ad.jp>2015-06-12 09:47:44 +0900
commitc21b24decf6fef3d808cdf1e2fa58be156898d65 (patch)
tree3c4cfc597b96b6fbb1c1f18bce4693396c97b32d /deps/openssl/openssl/demos
parenta6b8ee19b85bbd798510191f0aee596f36b909d2 (diff)
downloadandroid-node-v8-c21b24decf6fef3d808cdf1e2fa58be156898d65.tar.gz
android-node-v8-c21b24decf6fef3d808cdf1e2fa58be156898d65.tar.bz2
android-node-v8-c21b24decf6fef3d808cdf1e2fa58be156898d65.zip
deps: upgrade openssl sources to 1.0.2b
This just replaces all sources of openssl-1.0.2b.tar.gz into deps/openssl/openssl Fixes: https://github.com/nodejs/io.js/issues/1921 PR-URL: https://github.com/nodejs/io.js/pull/1950 Reviewed-By: Fedor Indutny <fedor@indutny.com> Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Diffstat (limited to 'deps/openssl/openssl/demos')
-rw-r--r--deps/openssl/openssl/demos/bio/README1
-rw-r--r--deps/openssl/openssl/demos/bio/accept.cnf2
-rw-r--r--deps/openssl/openssl/demos/bio/connect.cnf2
-rw-r--r--deps/openssl/openssl/demos/easy_tls/easy-tls.c3
4 files changed, 5 insertions, 3 deletions
diff --git a/deps/openssl/openssl/demos/bio/README b/deps/openssl/openssl/demos/bio/README
index a8467cda64..a36bb48a5d 100644
--- a/deps/openssl/openssl/demos/bio/README
+++ b/deps/openssl/openssl/demos/bio/README
@@ -4,3 +4,4 @@ to simplify socket programming.
The client-conf, server-conf, client-arg and client-conf include examples
of how to use the SSL_CONF API for configuration file or command line
processing.
+
diff --git a/deps/openssl/openssl/demos/bio/accept.cnf b/deps/openssl/openssl/demos/bio/accept.cnf
index f92cedf312..e4acea75f3 100644
--- a/deps/openssl/openssl/demos/bio/accept.cnf
+++ b/deps/openssl/openssl/demos/bio/accept.cnf
@@ -8,6 +8,6 @@ Curves = P-521:P-384:P-256
# Automatic curve selection
ECDHParameters = Automatic
# Restricted signature algorithms
-SignatureAlgorithms = RSA+SHA512:ECDSA+SHA512
+SignatureAlgorithms = RSA+SHA512:ECDSA+SHA512
Certificate=server.pem
PrivateKey=server.pem
diff --git a/deps/openssl/openssl/demos/bio/connect.cnf b/deps/openssl/openssl/demos/bio/connect.cnf
index ab764403a4..4dee03c373 100644
--- a/deps/openssl/openssl/demos/bio/connect.cnf
+++ b/deps/openssl/openssl/demos/bio/connect.cnf
@@ -6,4 +6,4 @@ Connect = localhost:4433
# Only support 3 curves
Curves = P-521:P-384:P-256
# Restricted signature algorithms
-SignatureAlgorithms = RSA+SHA512:ECDSA+SHA512
+SignatureAlgorithms = RSA+SHA512:ECDSA+SHA512
diff --git a/deps/openssl/openssl/demos/easy_tls/easy-tls.c b/deps/openssl/openssl/demos/easy_tls/easy-tls.c
index acc688aaf4..5682e91a47 100644
--- a/deps/openssl/openssl/demos/easy_tls/easy-tls.c
+++ b/deps/openssl/openssl/demos/easy_tls/easy-tls.c
@@ -761,7 +761,8 @@ SSL_CTX *tls_create_ctx(struct tls_create_ctx_args a, void *apparg)
if (tls_dhe1024 == NULL) {
int i;
- RAND_bytes((unsigned char *)&i, sizeof i);
+ if (RAND_bytes((unsigned char *)&i, sizeof i) <= 0)
+ goto err_return;
/*
* make sure that i is non-negative -- pick one of the provided
* seeds