date:20160427

[openssl-commits] Build completed: openssl OpenSSL_1_0_2-stable.2859

2016-04-27 Thread AppVeyor



Build openssl OpenSSL_1_0_2-stable.2859 completed



Commit 4436299296 by Dr. Stephen Henson on 4/27/2016 11:06 PM:

Reject inappropriate private key encryption ciphers.


Configure your notification preferences

_
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits

[openssl-commits] Build failed: openssl OpenSSL_1_0_1-stable.2858

2016-04-27 Thread AppVeyor




Build openssl OpenSSL_1_0_1-stable.2858 failed


Commit 6dfa55ab2f by Dr. Stephen Henson on 4/27/2016 11:07 PM:

Reject inappropriate private key encryption ciphers.


Configure your notification preferences

_
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits

[openssl-commits] Build failed: openssl master.2857

2016-04-27 Thread AppVeyor




Build openssl master.2857 failed


Commit d78df5dfd6 by Dr. Stephen Henson on 4/27/2016 11:04 PM:

Reject inappropriate private key encryption ciphers.


Configure your notification preferences

_
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits

[openssl-commits] Build failed: openssl master.2856

2016-04-27 Thread AppVeyor




Build openssl master.2856 failed


Commit 4a397f5168 by Viktor Dukhovni on 4/27/2016 8:16 PM:

Fix set0 reuse test


Configure your notification preferences

_
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits

[openssl-commits] Build failed: openssl master.2855

2016-04-27 Thread AppVeyor




Build openssl master.2855 failed


Commit 69664d6af0 by Viktor Dukhovni on 4/27/2016 6:42 PM:

Future proof build_chain() in x509_vfy.c


Configure your notification preferences

_
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits

[openssl-commits] [openssl] OpenSSL_1_0_2-stable update

2016-04-27 Thread Dr . Stephen Henson

The branch OpenSSL_1_0_2-stable has been updated
   via  4436299296cc10c6d6611b066b4b73dc0bdae1a6 (commit)
  from  8f43c80bfac15544820739bf035df946eeb603e8 (commit)


- Log -
commit 4436299296cc10c6d6611b066b4b73dc0bdae1a6
Author: Dr. Stephen Henson 
Date:   Sat Apr 23 13:33:05 2016 +0100

Reject inappropriate private key encryption ciphers.

The traditional private key encryption algorithm doesn't function
properly if the IV length of the cipher is zero. These ciphers
(e.g. ECB mode) are not suitable for private key encryption
anyway.

Reviewed-by: Emilia Käsper 
(cherry picked from commit d78df5dfd650e6de159a19a033513481064644f5)

---

Summary of changes:
 crypto/pem/pem_lib.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crypto/pem/pem_lib.c b/crypto/pem/pem_lib.c
index a29821a..fe881d6 100644
--- a/crypto/pem/pem_lib.c
+++ b/crypto/pem/pem_lib.c
@@ -348,7 +348,7 @@ int PEM_ASN1_write_bio(i2d_of_void *i2d, const char *name, 
BIO *bp,
 
 if (enc != NULL) {
 objstr = OBJ_nid2sn(EVP_CIPHER_nid(enc));
-if (objstr == NULL) {
+if (objstr == NULL || EVP_CIPHER_iv_length(enc) == 0) {
 PEMerr(PEM_F_PEM_ASN1_WRITE_BIO, PEM_R_UNSUPPORTED_CIPHER);
 goto err;
 }
_
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits

[openssl-commits] [openssl] OpenSSL_1_0_1-stable update

2016-04-27 Thread Dr . Stephen Henson

The branch OpenSSL_1_0_1-stable has been updated
   via  6dfa55ab2fbd9a0f45c3ce088b1dd61800fb03d3 (commit)
  from  a04d08fc18e3dba21dfce71e55f0decb971f9b91 (commit)


- Log -
commit 6dfa55ab2fbd9a0f45c3ce088b1dd61800fb03d3
Author: Dr. Stephen Henson 
Date:   Sat Apr 23 13:33:05 2016 +0100

Reject inappropriate private key encryption ciphers.

The traditional private key encryption algorithm doesn't function
properly if the IV length of the cipher is zero. These ciphers
(e.g. ECB mode) are not suitable for private key encryption
anyway.

Reviewed-by: Emilia Käsper 
(cherry picked from commit d78df5dfd650e6de159a19a033513481064644f5)

---

Summary of changes:
 crypto/pem/pem_lib.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crypto/pem/pem_lib.c b/crypto/pem/pem_lib.c
index 5507161..ab45a84 100644
--- a/crypto/pem/pem_lib.c
+++ b/crypto/pem/pem_lib.c
@@ -344,7 +344,7 @@ int PEM_ASN1_write_bio(i2d_of_void *i2d, const char *name, 
BIO *bp,
 
 if (enc != NULL) {
 objstr = OBJ_nid2sn(EVP_CIPHER_nid(enc));
-if (objstr == NULL) {
+if (objstr == NULL || EVP_CIPHER_iv_length(enc) == 0) {
 PEMerr(PEM_F_PEM_ASN1_WRITE_BIO, PEM_R_UNSUPPORTED_CIPHER);
 goto err;
 }
_
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits

[openssl-commits] [openssl] master update

2016-04-27 Thread Dr . Stephen Henson

The branch master has been updated
   via  d78df5dfd650e6de159a19a033513481064644f5 (commit)
  from  4a397f5168d41ef4417f1430f2f5133b92f145b8 (commit)


- Log -
commit d78df5dfd650e6de159a19a033513481064644f5
Author: Dr. Stephen Henson 
Date:   Sat Apr 23 13:33:05 2016 +0100

Reject inappropriate private key encryption ciphers.

The traditional private key encryption algorithm doesn't function
properly if the IV length of the cipher is zero. These ciphers
(e.g. ECB mode) are not suitable for private key encryption
anyway.

Reviewed-by: Emilia Käsper 

---

Summary of changes:
 crypto/pem/pem_lib.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crypto/pem/pem_lib.c b/crypto/pem/pem_lib.c
index 5e7aa77..6ee3b8e 100644
--- a/crypto/pem/pem_lib.c
+++ b/crypto/pem/pem_lib.c
@@ -344,7 +344,7 @@ int PEM_ASN1_write_bio(i2d_of_void *i2d, const char *name, 
BIO *bp,
 
 if (enc != NULL) {
 objstr = OBJ_nid2sn(EVP_CIPHER_nid(enc));
-if (objstr == NULL) {
+if (objstr == NULL || EVP_CIPHER_iv_length(enc) == 0) {
 PEMerr(PEM_F_PEM_ASN1_WRITE_BIO, PEM_R_UNSUPPORTED_CIPHER);
 goto err;
 }
_
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits

[openssl-commits] Build failed: openssl master.2854

2016-04-27 Thread AppVeyor




Build openssl master.2854 failed


Commit ad9e979939 by J Mohan Rao Arisankala on 4/27/2016 6:15 PM:

Merge remote-tracking branch 'origin/add-malloc-ret-checks' into add-malloc-ret-checks


Configure your notification preferences

_
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits

[openssl-commits] Build failed: openssl master.2853

2016-04-27 Thread AppVeyor




Build openssl master.2853 failed


Commit 443d8d7bac by J Mohan Rao Arisankala on 4/27/2016 6:07 PM:

log ECerr on init failure


Configure your notification preferences

_
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits

[openssl-commits] Build failed: openssl master.2852

2016-04-27 Thread AppVeyor




Build openssl master.2852 failed


Commit 38227f5601 by FdaSilvaYY on 3/7/2016 9:45 PM:

Unify _up_ref methods signature and behaviour.


Configure your notification preferences

_
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits

[openssl-commits] Passed: openssl/openssl#3538 (master - 4a397f5)

2016-04-27 Thread Travis CI

Build Update for openssl/openssl
-

Build: #3538
Status: Passed

Duration: 24 minutes and 42 seconds
Commit: 4a397f5 (master)
Author: Viktor Dukhovni
Message: Fix set0 reuse test

We must test for new object == current object, not !=.

Reviewed-by: Richard Levitte 

View the changeset: 
https://github.com/openssl/openssl/compare/69664d6af0cd...4a397f5168d4

View the full build log and details: 
https://travis-ci.org/openssl/openssl/builds/126208763

--

You can configure recipients for build notifications in your .travis.yml file. 
See https://docs.travis-ci.com/user/notifications

_
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits

[openssl-commits] Build failed: openssl master.2851

2016-04-27 Thread AppVeyor




Build openssl master.2851 failed


Commit 9077ee1805 by FdaSilvaYY on 2/14/2016 9:42 AM:

Add checks on CRYPTO_set_ex_data return value


Configure your notification preferences

_
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits

[openssl-commits] Passed: openssl/openssl#3537 (master - 69664d6)

2016-04-27 Thread Travis CI

Build Update for openssl/openssl
-

Build: #3537
Status: Passed

Duration: 25 minutes and 14 seconds
Commit: 69664d6 (master)
Author: Viktor Dukhovni
Message: Future proof build_chain() in x509_vfy.c

Coverity reports a potential NULL deref when "2 0 0" DANE trust-anchors
from DNS are configured via SSL_dane_tlsa_add() and X509_STORE_CTX_init()
is called with a NULL stack of untrusted certificates.

Since ssl_verify_cert_chain() always provideds a non-NULL stack of
untrusted certs, and no other code path enables DANE, the problem
can only happen in applications that use SSL_CTX_set_cert_verify_callback()
to implement their own wrappers around X509_verify_cert() passing
only the leaf certificate to the latter.

Regardless of the "improbability" of the problem, we do need to
ensure that build_chain() handles this case correctly.

Reviewed-by: Matt Caswell 

View the changeset: 
https://github.com/openssl/openssl/compare/4c5e6b2cb95a...69664d6af0cd

View the full build log and details: 
https://travis-ci.org/openssl/openssl/builds/126186727

--

You can configure recipients for build notifications in your .travis.yml file. 
See https://docs.travis-ci.com/user/notifications

_
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits

[openssl-commits] [openssl] master update

2016-04-27 Thread Viktor Dukhovni

The branch master has been updated
   via  4a397f5168d41ef4417f1430f2f5133b92f145b8 (commit)
  from  69664d6af0cdd7738f55d10fbbe46cdf15f72e0e (commit)


- Log -
commit 4a397f5168d41ef4417f1430f2f5133b92f145b8
Author: Viktor Dukhovni 
Date:   Wed Apr 27 15:08:33 2016 -0400

Fix set0 reuse test

We must test for new object == current object, not !=.

Reviewed-by: Richard Levitte 

---

Summary of changes:
 crypto/dh/dh_lib.c   | 2 +-
 crypto/dsa/dsa_lib.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/crypto/dh/dh_lib.c b/crypto/dh/dh_lib.c
index 644508d..9db4576 100644
--- a/crypto/dh/dh_lib.c
+++ b/crypto/dh/dh_lib.c
@@ -303,7 +303,7 @@ int DH_set0_key(DH *dh, BIGNUM *pub_key, BIGNUM *priv_key)
  * as input parameters.
  */
 if (dh->pub_key == pub_key
-|| (dh->priv_key != NULL && priv_key != dh->priv_key))
+|| (dh->priv_key != NULL && priv_key == dh->priv_key))
 return 0;
 
 if (pub_key != NULL) {
diff --git a/crypto/dsa/dsa_lib.c b/crypto/dsa/dsa_lib.c
index 383b48b..7b751a9 100644
--- a/crypto/dsa/dsa_lib.c
+++ b/crypto/dsa/dsa_lib.c
@@ -358,7 +358,7 @@ int DSA_set0_key(DSA *d, BIGNUM *pub_key, BIGNUM *priv_key)
  * as input parameters.
  */
 if (d->pub_key == pub_key
-|| (d->priv_key != NULL && priv_key != d->priv_key))
+|| (d->priv_key != NULL && priv_key == d->priv_key))
 return 0;
 
 if (pub_key != NULL) {
_
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits

[openssl-commits] Build failed: openssl master.2850

2016-04-27 Thread AppVeyor




Build openssl master.2850 failed


Commit bb0b39223e by FdaSilvaYY on 3/6/2016 8:40 PM:

Add more zalloc


Configure your notification preferences

_
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits

[openssl-commits] Build failed: openssl master.2849

2016-04-27 Thread AppVeyor




Build openssl master.2849 failed


Commit 0d35a3df37 by FdaSilvaYY on 3/20/2016 8:14 PM:

Add help message to some progs options.


Configure your notification preferences

_
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits

[openssl-commits] [openssl] master update

2016-04-27 Thread Viktor Dukhovni

The branch master has been updated
   via  69664d6af0cdd7738f55d10fbbe46cdf15f72e0e (commit)
  from  4c5e6b2cb95a4332829af140e5edba965c9685ce (commit)


- Log -
commit 69664d6af0cdd7738f55d10fbbe46cdf15f72e0e
Author: Viktor Dukhovni 
Date:   Tue Apr 26 14:17:57 2016 -0400

Future proof build_chain() in x509_vfy.c

Coverity reports a potential NULL deref when "2 0 0" DANE trust-anchors
from DNS are configured via SSL_dane_tlsa_add() and X509_STORE_CTX_init()
is called with a NULL stack of untrusted certificates.

Since ssl_verify_cert_chain() always provideds a non-NULL stack of
untrusted certs, and no other code path enables DANE, the problem
can only happen in applications that use SSL_CTX_set_cert_verify_callback()
to implement their own wrappers around X509_verify_cert() passing
only the leaf certificate to the latter.

Regardless of the "improbability" of the problem, we do need to
ensure that build_chain() handles this case correctly.

Reviewed-by: Matt Caswell 

---

Summary of changes:
 crypto/x509/x509_vfy.c | 15 ++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/crypto/x509/x509_vfy.c b/crypto/x509/x509_vfy.c
index b895ffe..30eabcb 100644
--- a/crypto/x509/x509_vfy.c
+++ b/crypto/x509/x509_vfy.c
@@ -2789,8 +2789,21 @@ static int build_chain(X509_STORE_CTX *ctx)
 return 0;
 }
 
-/* Include any untrusted full certificates from DNS */
+/*
+ * If we got any "DANE-TA(2) Cert(0) Full(0)" trust-anchors from DNS, add
+ * them to our working copy of the untrusted certificate stack.  Since the
+ * caller of X509_STORE_CTX_init() may have provided only a leaf cert with
+ * no corresponding stack of untrusted certificates, we may need to create
+ * an empty stack first.  [ At present only the ssl library provides DANE
+ * support, and ssl_verify_cert_chain() always provides a non-null stack
+ * containing at least the leaf certificate, but we must be prepared for
+ * this to change. ]
+ */
 if (DANETLS_ENABLED(dane) && dane->certs != NULL) {
+if (sktmp == NULL && (sktmp = sk_X509_new_null()) == NULL) {
+X509err(X509_F_BUILD_CHAIN, ERR_R_MALLOC_FAILURE);
+return 0;
+}
 for (i = 0; i < sk_X509_num(dane->certs); ++i) {
 if (!sk_X509_push(sktmp, sk_X509_value(dane->certs, i))) {
 sk_X509_free(sktmp);
_
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits

[openssl-commits] Build failed: openssl master.2848

2016-04-27 Thread AppVeyor




Build openssl master.2848 failed


Commit c16a39aa2b by FdaSilvaYY on 3/8/2016 7:11 PM:

Add checks on CRYPTO_new_ex_data return value...


Configure your notification preferences

_
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits

[openssl-commits] Build failed: openssl master.2847

2016-04-27 Thread AppVeyor




Build openssl master.2847 failed


Commit 0c4ac7fb34 by FdaSilvaYY on 4/4/2016 6:42 PM:

Fix an error code spelling.


Configure your notification preferences

_
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits

[openssl-commits] Build failed: openssl master.2846

2016-04-27 Thread AppVeyor




Build openssl master.2846 failed


Commit 4c5e6b2cb9 by Richard Levitte on 4/27/2016 1:07 PM:

Documentation the changed {RSA,DSA,DH}_set0_* functionality change


Configure your notification preferences

_
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits

[openssl-commits] Build failed: openssl master.2843

2016-04-27 Thread AppVeyor




Build openssl master.2843 failed


Commit 3aec886ed4 by Kazuki Yamaguchi on 4/27/2016 12:23 PM:

GH975 Add ex_data functions for X509_STORE


Configure your notification preferences

_
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits

[openssl-commits] Build failed: openssl master.2841

2016-04-27 Thread AppVeyor




Build openssl master.2841 failed


Commit 658e18cede by J Mohan Rao Arisankala on 4/27/2016 9:51 AM:

invoke ENGINE_finish() on init failure.


Configure your notification preferences

_
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits

[openssl-commits] Build failed: openssl master.2840

2016-04-27 Thread AppVeyor




Build openssl master.2840 failed


Commit a65ea8222d by J Mohan Rao Arisankala on 4/27/2016 9:33 AM:

Merge remote-tracking branch 'openssl/master' into add-malloc-ret-checks


Configure your notification preferences

_
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits

[openssl-commits] Errored: openssl/openssl#3528 (master - 4c5e6b2)

2016-04-27 Thread Travis CI

Build Update for openssl/openssl
-

Build: #3528
Status: Errored

Duration: 25 minutes and 6 seconds
Commit: 4c5e6b2 (master)
Author: Richard Levitte
Message: Documentation the changed {RSA,DSA,DH}_set0_* functionality change

Reviewed-by: Matt Caswell 

View the changeset: 
https://github.com/openssl/openssl/compare/3aec886ed4af...4c5e6b2cb95a

View the full build log and details: 
https://travis-ci.org/openssl/openssl/builds/126099702

--

You can configure recipients for build notifications in your .travis.yml file. 
See https://docs.travis-ci.com/user/notifications

_
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits

[openssl-commits] Build failed: openssl master.2839

2016-04-27 Thread AppVeyor




Build openssl master.2839 failed


Commit bfb155c187 by Matt Caswell on 4/27/2016 8:22 AM:

split_send_fragment should always be less than or equal to max_send_fragment


Configure your notification preferences

_
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits

[openssl-commits] Build failed in Jenkins: master_windows #1588

2016-04-27 Thread openssl . sanity

See 

Changes:

[ben] Fix no-engine no-ui.

[ben] Fix enable-ssl-trace no-nextprotoneg.

[ben] Fix no-gost no-srp no-ec no-dh.

[rsalz] GH975 Add ex_data functions for X509_STORE

[Richard Levitte] RSA, DSA, DH: Allow some given input to be NULL on already 
initialised keys

[Richard Levitte] Documentation the changed {RSA,DSA,DH}_set0_* functionality 
change

--
Started by upstream project "master_basic" build number 1852
originally caused by:
 Started by an SCM change
Building remotely on windows-slave in workspace 

 > git rev-parse --is-inside-work-tree # timeout=10
Fetching changes from the remote Git repository
 > git config remote.origin.url https://github.com/openssl/openssl.git # 
 > timeout=10
Fetching upstream changes from https://github.com/openssl/openssl.git
 > git --version # timeout=10
 > git -c core.askpass=true fetch --tags --progress 
 > https://github.com/openssl/openssl.git +refs/heads/*:refs/remotes/origin/*
 > git rev-parse "refs/remotes/origin/master^{commit}" # timeout=10
 > git rev-parse "refs/remotes/origin/origin/master^{commit}" # timeout=10
Checking out Revision 4c5e6b2cb95a4332829af140e5edba965c9685ce 
(refs/remotes/origin/master)
 > git config core.sparsecheckout # timeout=10
 > git checkout -f 4c5e6b2cb95a4332829af140e5edba965c9685ce
 > git rev-list bfb155c187fbb1e56561614925be5ca4ef069f03 # timeout=10
[master_windows] $ cmd /c call 
C:\Users\ADMINI~1\AppData\Local\Temp\1\hudson6870922018995213997.bat

call> "c:\program 
files (x86)\microsoft visual studio 12.0\vc\bin\vcvars32.bat" 

set> 
PROCESSOR_ARCHITECTURE=x86 

perl> Configure 
VC-WIN32 
Configuring OpenSSL version 1.1.0-pre6-dev (0x0x1016L)
no-crypto-mdebug [default]  OPENSSL_NO_CRYPTO_MDEBUG (skip dir)
no-crypto-mdebug-backtrace [forced]   OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE 
(skip dir)
no-ec_nistp_64_gcc_128 [default]  OPENSSL_NO_EC_NISTP_64_GCC_128 (skip dir)
no-egd  [default]  OPENSSL_NO_EGD (skip dir)
no-heartbeats   [default]  OPENSSL_NO_HEARTBEATS (skip dir)
no-md2  [default]  OPENSSL_NO_MD2 (skip dir)
no-rc5  [default]  OPENSSL_NO_RC5 (skip dir)
no-sctp [default]  OPENSSL_NO_SCTP (skip dir)
no-ssl-trace[default]  OPENSSL_NO_SSL_TRACE (skip dir)
no-ssl3 [default]  OPENSSL_NO_SSL3 (skip dir)
no-ssl3-method  [default]  OPENSSL_NO_SSL3_METHOD (skip dir)
no-unit-test[default]  OPENSSL_NO_UNIT_TEST (skip dir)
no-weak-ssl-ciphers [default]  OPENSSL_NO_WEAK_SSL_CIPHERS (skip dir)
no-zlib [default] 
no-zlib-dynamic [default] 
Configuring for VC-WIN32
CC=cl
CFLAG =-W3 -wd4090 -Gs0 -GF -Gy -nologo -DOPENSSL_SYS_WIN32 
-DWIN32_LEAN_AND_MEAN -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE -DUNICODE 
-D_UNICODE /MD /Ox /O2 /Ob2 
SHARED_CFLAG  =
DEFINES   =OPENSSL_USE_APPLINK DSO_WIN32 NDEBUG OPENSSL_THREADS 
OPENSSL_NO_STATIC_ENGINE OPENSSL_PIC OPENSSL_BN_ASM_PART_WORDS 
OPENSSL_IA32_SSE2 OPENSSL_BN_ASM_MONT OPENSSL_BN_ASM_GF2m SHA1_ASM SHA256_ASM 
SHA512_ASM MD5_ASM RMD160_ASM AES_ASM VPAES_ASM WHIRLPOOL_ASM GHASH_ASM 
ECP_NISTZ256_ASM POLY1305_ASM
LFLAG =/nologo /debug
PLIB_LFLAG=
EX_LIBS   =ws2_32.lib gdi32.lib advapi32.lib crypt32.lib user32.lib 
APPS_OBJ  =../ms/applink.o
CPUID_OBJ =x86cpuid.o
UPLINK_OBJ=../ms/uplink.o
BN_ASM=bn-586.o co-586.o x86-mont.o x86-gf2m.o
EC_ASM=ecp_nistz256.o ecp_nistz256-x86.o
DES_ENC   =des-586.o crypt586.o
AES_ENC   =aes-586.o vpaes-x86.o aesni-x86.o
BF_ENC=bf-586.o
CAST_ENC  =c_enc.o
RC4_ENC   =rc4-586.o
RC5_ENC   =rc5-586.o
MD5_OBJ_ASM   =md5-586.o
SHA1_OBJ_ASM  =sha1-586.o sha256-586.o sha512-586.o
RMD160_OBJ_ASM=rmd-586.o
CMLL_ENC  =cmll-x86.o
MODES_OBJ =ghash-x86.o
PADLOCK_OBJ   =e_padlock-x86.o
CHACHA_ENC=chacha-x86.o
POLY1305_OBJ  =poly1305-x86.o
BLAKE2_OBJ=
PROCESSOR =
RANLIB=true
ARFLAGS   =/nologo
PERL  =C:\Perl64\bin\perl.exe

THIRTY_TWO_BIT mode
BN_LLONG mode

Configured for VC-WIN32.

exit> 0 
[master_windows] $ cmd /c call 
C:\Users\ADMINI~1\AppData\Local\Temp\1\hudson8471065986123521061.bat

call> "c:\program 
files (x86)\microsoft visual studio 12.0\vc\bin\vcvars32.bat" 

set> 
PROCESSOR_ARCHITECTURE=x86 

nmake>

Microsoft (R) Program Maintenance Utility Version 12.00.21005.1
Copyright (C) Microsoft Corporation.  All rights reserved.

[openssl-commits] [openssl] master update

2016-04-27 Thread Richard Levitte

The branch master has been updated
   via  4c5e6b2cb95a4332829af140e5edba965c9685ce (commit)
   via  1da12e34ed69cec206f3a251a1e62ceeb694a6ea (commit)
  from  3aec886ed4af1ca945f5d10da2ce40e4538fe5fc (commit)


- Log -
commit 4c5e6b2cb95a4332829af140e5edba965c9685ce
Author: Richard Levitte 
Date:   Tue Apr 26 13:40:53 2016 +0200

Documentation the changed {RSA,DSA,DH}_set0_* functionality change

Reviewed-by: Matt Caswell 

commit 1da12e34ed69cec206f3a251a1e62ceeb694a6ea
Author: Richard Levitte 
Date:   Mon Apr 25 20:28:54 2016 +0200

RSA, DSA, DH: Allow some given input to be NULL on already initialised keys

The diverse {RSA,DSA,DH}_set0_* functions are made to allow some
parameters to be NULL IF the corresponding numbers in the given key
structure have already been previously initialised.  Specifically,
this allows the addition of private components to be added to a key
that already has the public half, approximately like this:

RSA_get0_key(rsa, NULL, , NULL);
RSA_get0_factors(rsa, , );
/* calculate new d */
RSA_set0_key(rsa, NULL, NULL, d);

Reviewed-by: Matt Caswell 

---

Summary of changes:
 crypto/dh/dh_lib.c  | 51 +-
 crypto/dsa/dsa_lib.c| 50 ++
 crypto/rsa/rsa_lib.c| 75 +
 doc/crypto/DH_get0_pqg.pod  | 11 ++-
 doc/crypto/DSA_get0_pqg.pod | 11 ++-
 doc/crypto/RSA_get0_key.pod | 19 +---
 6 files changed, 164 insertions(+), 53 deletions(-)

diff --git a/crypto/dh/dh_lib.c b/crypto/dh/dh_lib.c
index bf9f8d3..644508d 100644
--- a/crypto/dh/dh_lib.c
+++ b/crypto/dh/dh_lib.c
@@ -245,15 +245,27 @@ void DH_get0_pqg(const DH *dh, BIGNUM **p, BIGNUM **q, 
BIGNUM **g)
 
 int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g)
 {
-/* q is optional */
-if (p == NULL || g == NULL)
+/* If the fields p and g in d are NULL, the corresponding input
+ * parameters MUST be non-NULL.  q may remain NULL.
+ *
+ * It is an error to give the results from get0 on d
+ * as input parameters.
+ */
+if (p == dh->p || (dh->q != NULL && q == dh->q) || g == dh->g)
 return 0;
-BN_free(dh->p);
-BN_free(dh->q);
-BN_free(dh->g);
-dh->p = p;
-dh->q = q;
-dh->g = g;
+
+if (p != NULL) {
+BN_free(dh->p);
+dh->p = p;
+}
+if (q != NULL) {
+BN_free(dh->q);
+dh->q = q;
+}
+if (g != NULL) {
+BN_free(dh->g);
+dh->g = g;
+}
 
 if (q != NULL) {
 dh->length = BN_num_bits(q);
@@ -283,14 +295,25 @@ void DH_get0_key(const DH *dh, BIGNUM **pub_key, BIGNUM 
**priv_key)
 
 int DH_set0_key(DH *dh, BIGNUM *pub_key, BIGNUM *priv_key)
 {
-/* Note that it is valid for priv_key to be NULL */
-if (pub_key == NULL)
+/* If the pub_key in dh is NULL, the corresponding input
+ * parameters MUST be non-NULL.  The priv_key field may
+ * be left NULL.
+ *
+ * It is an error to give the results from get0 on dh
+ * as input parameters.
+ */
+if (dh->pub_key == pub_key
+|| (dh->priv_key != NULL && priv_key != dh->priv_key))
 return 0;
 
-BN_free(dh->pub_key);
-BN_free(dh->priv_key);
-dh->pub_key = pub_key;
-dh->priv_key = priv_key;
+if (pub_key != NULL) {
+BN_free(dh->pub_key);
+dh->pub_key = pub_key;
+}
+if (priv_key != NULL) {
+BN_free(dh->priv_key);
+dh->priv_key = priv_key;
+}
 
 return 1;
 }
diff --git a/crypto/dsa/dsa_lib.c b/crypto/dsa/dsa_lib.c
index facb97f..383b48b 100644
--- a/crypto/dsa/dsa_lib.c
+++ b/crypto/dsa/dsa_lib.c
@@ -315,14 +315,27 @@ void DSA_get0_pqg(const DSA *d, BIGNUM **p, BIGNUM **q, 
BIGNUM **g)
 
 int DSA_set0_pqg(DSA *d, BIGNUM *p, BIGNUM *q, BIGNUM *g)
 {
-if (p == NULL || q == NULL || g == NULL)
+/* If the fields in d are NULL, the corresponding input
+ * parameters MUST be non-NULL.
+ *
+ * It is an error to give the results from get0 on d
+ * as input parameters.
+ */
+if (p == d->p || q == d->q || g == d->g)
 return 0;
-BN_free(d->p);
-BN_free(d->q);
-BN_free(d->g);
-d->p = p;
-d->q = q;
-d->g = g;
+
+if (p != NULL) {
+BN_free(d->p);
+d->p = p;
+}
+if (q != NULL) {
+BN_free(d->q);
+d->q = q;
+}
+if (g != NULL) {
+BN_free(d->g);
+d->g = g;
+}
 
 return 1;
 }
@@ -337,14 +350,25 @@ void DSA_get0_key(const DSA *d, BIGNUM **pub_key, BIGNUM 
**priv_key)
 
 int DSA_set0_key(DSA *d, BIGNUM *pub_key, BIGNUM *priv_key)
 {
-/* Note that it is valid for priv_key to be NULL */
-if (pub_key

[openssl-commits] Build failed: openssl master.2838

2016-04-27 Thread AppVeyor




Build openssl master.2838 failed


Commit dbd5c34f18 by Matt Caswell on 4/27/2016 8:20 AM:

Fix BIO_CTRL_DUP for an SSL BIO


Configure your notification preferences

_
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits

[openssl-commits] [openssl] master update

2016-04-27 Thread Ben Laurie

The branch master has been updated
   via  5c001c326d7731042a602a171f1363191e9b0336 (commit)
   via  d94ce4100fb39dc12ceec38b1d14267a4c7e64b3 (commit)
   via  e93836b95e120a64d005a99f4bf0dde3a4d2ef3e (commit)
  from  bfb155c187fbb1e56561614925be5ca4ef069f03 (commit)


- Log -
commit 5c001c326d7731042a602a171f1363191e9b0336
Author: Ben Laurie 
Date:   Tue Apr 19 08:25:58 2016 +0100

Fix no-gost no-srp no-ec no-dh.

Reviewed-by: Richard Levitte 

commit d94ce4100fb39dc12ceec38b1d14267a4c7e64b3
Author: Ben Laurie 
Date:   Mon Apr 18 10:45:02 2016 +0100

Fix enable-ssl-trace no-nextprotoneg.

Reviewed-by: Richard Levitte 

commit e93836b95e120a64d005a99f4bf0dde3a4d2ef3e
Author: Ben Laurie 
Date:   Mon Apr 18 10:44:42 2016 +0100

Fix no-engine no-ui.

Reviewed-by: Richard Levitte 

---

Summary of changes:
 apps/apps.c  | 2 ++
 ssl/statem/statem_srvr.c | 5 -
 ssl/t1_trce.c| 2 ++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/apps/apps.c b/apps/apps.c
index 8cf3b59..a80a07e 100644
--- a/apps/apps.c
+++ b/apps/apps.c
@@ -156,7 +156,9 @@ typedef struct {
 unsigned long mask;
 } NAME_EX_TBL;
 
+#if !defined(OPENSSL_NO_UI) || !defined(OPENSSL_NO_ENGINE)
 static UI_METHOD *ui_method = NULL;
+#endif
 
 static int set_table_opts(unsigned long *flags, const char *arg,
   const NAME_EX_TBL * in_tbl);
diff --git a/ssl/statem/statem_srvr.c b/ssl/statem/statem_srvr.c
index 38fa945..4bb22e5 100644
--- a/ssl/statem/statem_srvr.c
+++ b/ssl/statem/statem_srvr.c
@@ -2079,7 +2079,6 @@ MSG_PROCESS_RETURN tls_process_client_key_exchange(SSL 
*s, PACKET *pkt)
 EVP_PKEY *ckey = NULL;
 #endif
 PACKET enc_premaster;
-const unsigned char *data;
 unsigned char *rsa_decrypt = NULL;
 
 alg_k = s->s3->tmp.new_cipher->algorithm_mkey;
@@ -2301,6 +2300,7 @@ MSG_PROCESS_RETURN tls_process_client_key_exchange(SSL 
*s, PACKET *pkt)
 DH *cdh;
 unsigned int i;
 BIGNUM *pub_key;
+const unsigned char *data;
 
 if (!PACKET_get_net_2(pkt, )) {
 if (alg_k & (SSL_kDHE | SSL_kDHEPSK)) {
@@ -2378,6 +2378,7 @@ MSG_PROCESS_RETURN tls_process_client_key_exchange(SSL 
*s, PACKET *pkt)
 goto f_err;
 } else {
 unsigned int i;
+const unsigned char *data;
 
 /*
  * Get client's public key from encoded point in the
@@ -2425,6 +2426,7 @@ MSG_PROCESS_RETURN tls_process_client_key_exchange(SSL 
*s, PACKET *pkt)
 #ifndef OPENSSL_NO_SRP
 if (alg_k & SSL_kSRP) {
 unsigned int i;
+const unsigned char *data;
 
 if (!PACKET_get_net_2(pkt, )
 || !PACKET_get_bytes(pkt, , i)) {
@@ -2467,6 +2469,7 @@ MSG_PROCESS_RETURN tls_process_client_key_exchange(SSL 
*s, PACKET *pkt)
 int Ttag, Tclass;
 long Tlen;
 long sess_key_len;
+const unsigned char *data;
 
 /* Get our certificate private key */
 alg_a = s->s3->tmp.new_cipher->algorithm_auth;
diff --git a/ssl/t1_trce.c b/ssl/t1_trce.c
index cb22d49..b56b504 100644
--- a/ssl/t1_trce.c
+++ b/ssl/t1_trce.c
@@ -497,7 +497,9 @@ static ssl_trace_tbl ssl_exts_tbl[] = {
 {TLSEXT_TYPE_heartbeat, "heartbeat"},
 {TLSEXT_TYPE_session_ticket, "session_ticket"},
 {TLSEXT_TYPE_renegotiate, "renegotiate"},
+#ifndef OPENSSL_NO_NEXTPROTONEG
 {TLSEXT_TYPE_next_proto_neg, "next_proto_neg"},
+#endif
 {TLSEXT_TYPE_signed_certificate_timestamp, 
"signed_certificate_timestamps"},
 {TLSEXT_TYPE_padding, "padding"},
 {TLSEXT_TYPE_encrypt_then_mac, "encrypt_then_mac"},
_
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits

[openssl-commits] Build failed: openssl master.2836

2016-04-27 Thread AppVeyor




Build openssl master.2836 failed


Commit 1ebf644808 by Viktor Szakats on 4/20/2016 7:01 PM:

set exec file attribute for scripts


Configure your notification preferences

_
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits

[openssl-commits] Build failed: openssl master.2835

2016-04-27 Thread AppVeyor




Build openssl master.2835 failed


Commit 36fe35fd45 by Richard Levitte on 4/26/2016 8:44 PM:

Documentation fixes (to be squashed)


Configure your notification preferences

_
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits

[openssl-commits] Build failed: openssl master.2834

2016-04-27 Thread AppVeyor




Build openssl master.2834 failed


Commit 33ea23dc5c by Andy Polyakov on 4/26/2016 7:35 PM:

SPARCv9 assembly pack: fine-tune run-time switch.


Configure your notification preferences

_
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits

[openssl-commits] Build failed in Jenkins: master_windows #1587

2016-04-27 Thread openssl . sanity

See 

Changes:

[rsalz] Add ex_data functions for X509_STORE

[rsalz] Remove dead-code infinite loop

[appro] camellia/build.info: fix typo

[appro] SPARCv9 assembly pack: fine-tune run-time switch.

[Matt Caswell] Fix passwd seg fault

[Matt Caswell] Fix BIO_CTRL_DUP for an SSL BIO

[Matt Caswell] split_send_fragment should always be less than or equal to 
max_send_fragment

--
Started by upstream project "master_basic" build number 1851
originally caused by:
 Started by an SCM change
Building remotely on windows-slave in workspace 

 > git rev-parse --is-inside-work-tree # timeout=10
Fetching changes from the remote Git repository
 > git config remote.origin.url https://github.com/openssl/openssl.git # 
 > timeout=10
Fetching upstream changes from https://github.com/openssl/openssl.git
 > git --version # timeout=10
 > git -c core.askpass=true fetch --tags --progress 
 > https://github.com/openssl/openssl.git +refs/heads/*:refs/remotes/origin/*
 > git rev-parse "refs/remotes/origin/master^{commit}" # timeout=10
 > git rev-parse "refs/remotes/origin/origin/master^{commit}" # timeout=10
Checking out Revision bfb155c187fbb1e56561614925be5ca4ef069f03 
(refs/remotes/origin/master)
 > git config core.sparsecheckout # timeout=10
 > git checkout -f bfb155c187fbb1e56561614925be5ca4ef069f03
 > git rev-list 446ba8de9af9aa4fa3debc7c76a38f4efed47a62 # timeout=10
[master_windows] $ cmd /c call 
C:\Users\ADMINI~1\AppData\Local\Temp\1\hudson489624181526151656.bat

call> "c:\program 
files (x86)\microsoft visual studio 12.0\vc\bin\vcvars32.bat" 

set> 
PROCESSOR_ARCHITECTURE=x86 

perl> Configure 
VC-WIN32 
Configuring OpenSSL version 1.1.0-pre6-dev (0x0x1016L)
no-crypto-mdebug [default]  OPENSSL_NO_CRYPTO_MDEBUG (skip dir)
no-crypto-mdebug-backtrace [forced]   OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE 
(skip dir)
no-ec_nistp_64_gcc_128 [default]  OPENSSL_NO_EC_NISTP_64_GCC_128 (skip dir)
no-egd  [default]  OPENSSL_NO_EGD (skip dir)
no-heartbeats   [default]  OPENSSL_NO_HEARTBEATS (skip dir)
no-md2  [default]  OPENSSL_NO_MD2 (skip dir)
no-rc5  [default]  OPENSSL_NO_RC5 (skip dir)
no-sctp [default]  OPENSSL_NO_SCTP (skip dir)
no-ssl-trace[default]  OPENSSL_NO_SSL_TRACE (skip dir)
no-ssl3 [default]  OPENSSL_NO_SSL3 (skip dir)
no-ssl3-method  [default]  OPENSSL_NO_SSL3_METHOD (skip dir)
no-unit-test[default]  OPENSSL_NO_UNIT_TEST (skip dir)
no-weak-ssl-ciphers [default]  OPENSSL_NO_WEAK_SSL_CIPHERS (skip dir)
no-zlib [default] 
no-zlib-dynamic [default] 
Configuring for VC-WIN32
CC=cl
CFLAG =-W3 -wd4090 -Gs0 -GF -Gy -nologo -DOPENSSL_SYS_WIN32 
-DWIN32_LEAN_AND_MEAN -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE -DUNICODE 
-D_UNICODE /MD /Ox /O2 /Ob2 
SHARED_CFLAG  =
DEFINES   =OPENSSL_USE_APPLINK DSO_WIN32 NDEBUG OPENSSL_THREADS 
OPENSSL_NO_STATIC_ENGINE OPENSSL_PIC OPENSSL_BN_ASM_PART_WORDS 
OPENSSL_IA32_SSE2 OPENSSL_BN_ASM_MONT OPENSSL_BN_ASM_GF2m SHA1_ASM SHA256_ASM 
SHA512_ASM MD5_ASM RMD160_ASM AES_ASM VPAES_ASM WHIRLPOOL_ASM GHASH_ASM 
ECP_NISTZ256_ASM POLY1305_ASM
LFLAG =/nologo /debug
PLIB_LFLAG=
EX_LIBS   =ws2_32.lib gdi32.lib advapi32.lib crypt32.lib user32.lib 
APPS_OBJ  =../ms/applink.o
CPUID_OBJ =x86cpuid.o
UPLINK_OBJ=../ms/uplink.o
BN_ASM=bn-586.o co-586.o x86-mont.o x86-gf2m.o
EC_ASM=ecp_nistz256.o ecp_nistz256-x86.o
DES_ENC   =des-586.o crypt586.o
AES_ENC   =aes-586.o vpaes-x86.o aesni-x86.o
BF_ENC=bf-586.o
CAST_ENC  =c_enc.o
RC4_ENC   =rc4-586.o
RC5_ENC   =rc5-586.o
MD5_OBJ_ASM   =md5-586.o
SHA1_OBJ_ASM  =sha1-586.o sha256-586.o sha512-586.o
RMD160_OBJ_ASM=rmd-586.o
CMLL_ENC  =cmll-x86.o
MODES_OBJ =ghash-x86.o
PADLOCK_OBJ   =e_padlock-x86.o
CHACHA_ENC=chacha-x86.o
POLY1305_OBJ  =poly1305-x86.o
BLAKE2_OBJ=
PROCESSOR =
RANLIB=true
ARFLAGS   =/nologo
PERL  =C:\Perl64\bin\perl.exe

THIRTY_TWO_BIT mode
BN_LLONG mode

Configured for VC-WIN32.

exit> 0 
[master_windows] $ cmd /c call 
C:\Users\ADMINI~1\AppData\Local\Temp\1\hudson8661397176452316178.bat

call> "c:\program 
files (x86)\microsoft visual studio 12.0\vc\bin\vcvars32.bat" 

set> 
PROCESSOR_ARCHITECTURE=x86 

nmake>

Microsoft (R) Program Maintenance Utility Version 12.00.21005.1
Copyright (C) Microsoft Corporation.  All

[openssl-commits] Build completed: openssl OpenSSL_1_0_2-stable.2833

2016-04-27 Thread AppVeyor



Build openssl OpenSSL_1_0_2-stable.2833 completed



Commit f633ee2543 by FdaSilvaYY on 4/4/2016 10:33 PM:

Fix a few leaks in X509_REQ_to_X509.


Configure your notification preferences

_
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits

[openssl-commits] [openssl] master update

2016-04-27 Thread Matt Caswell

The branch master has been updated
   via  bfb155c187fbb1e56561614925be5ca4ef069f03 (commit)
  from  dbd5c34f18d9119cfdeca439eb7aac28117f53d4 (commit)


- Log -
commit bfb155c187fbb1e56561614925be5ca4ef069f03
Author: Matt Caswell 
Date:   Tue Apr 26 18:01:24 2016 +0100

split_send_fragment should always be less than or equal to max_send_fragment

A bug meant that SSL_CTRL_SET_MAX_SEND_FRAGMENT was not adjusting
split_send_fragment properly.

Reviewed-by: Richard Levitte 

---

Summary of changes:
 ssl/ssl_lib.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index 994d093..f93b98f 100644
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -1873,7 +1873,7 @@ long SSL_CTX_ctrl(SSL_CTX *ctx, int cmd, long larg, void 
*parg)
 return 0;
 ctx->max_send_fragment = larg;
 if (ctx->max_send_fragment < ctx->split_send_fragment)
-ctx->split_send_fragment = ctx->split_send_fragment;
+ctx->split_send_fragment = ctx->max_send_fragment;
 return 1;
 case SSL_CTRL_SET_SPLIT_SEND_FRAGMENT:
 if ((unsigned int)larg > ctx->max_send_fragment || larg == 0)
_
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits

[openssl-commits] [openssl] master update

2016-04-27 Thread Matt Caswell

The branch master has been updated
   via  dbd5c34f18d9119cfdeca439eb7aac28117f53d4 (commit)
  from  97b04399b6b20d59ce4898def02011ee80914638 (commit)


- Log -
commit dbd5c34f18d9119cfdeca439eb7aac28117f53d4
Author: Matt Caswell 
Date:   Tue Apr 26 17:52:21 2016 +0100

Fix BIO_CTRL_DUP for an SSL BIO

The variables in the BIO weren't being duplicated properly.

Reviewed-by: Richard Levitte 
Reviewed-by: Viktor Dukhovni 

---

Summary of changes:
 ssl/bio_ssl.c | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/ssl/bio_ssl.c b/ssl/bio_ssl.c
index e3deebc..4cbfb3c 100644
--- a/ssl/bio_ssl.c
+++ b/ssl/bio_ssl.c
@@ -424,10 +424,11 @@ static long ssl_ctrl(BIO *b, int cmd, long num, void *ptr)
 dbs = BIO_get_data(dbio);
 SSL_free(dbs->ssl);
 dbs->ssl = SSL_dup(ssl);
-dbs->renegotiate_count = dbs->renegotiate_count;
-dbs->byte_count = dbs->byte_count;
-dbs->renegotiate_timeout = dbs->renegotiate_timeout;
-dbs->last_time = dbs->last_time;
+dbs->num_renegotiates = bs->num_renegotiates;
+dbs->renegotiate_count = bs->renegotiate_count;
+dbs->byte_count = bs->byte_count;
+dbs->renegotiate_timeout = bs->renegotiate_timeout;
+dbs->last_time = bs->last_time;
 ret = (dbs->ssl != NULL);
 break;
 case BIO_C_GET_FD:
_
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits

[openssl-commits] [openssl] master update

2016-04-27 Thread Matt Caswell

The branch master has been updated
   via  97b04399b6b20d59ce4898def02011ee80914638 (commit)
  from  33ea23dc5c8d20b29b45bb09784ff907386ff4c1 (commit)


- Log -
commit 97b04399b6b20d59ce4898def02011ee80914638
Author: Matt Caswell 
Date:   Tue Apr 26 17:00:33 2016 +0100

Fix passwd seg fault

Passing the -stdin arg to the passwd command line app *and* supply a
password on the command line causes a seg fault.

Reviewed-by: Richard Levitte 

---

Summary of changes:
 apps/passwd.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/passwd.c b/apps/passwd.c
index 98092bb..2f114db 100644
--- a/apps/passwd.c
+++ b/apps/passwd.c
@@ -175,6 +175,7 @@ int passwd_main(int argc, char **argv)
 if (pw_source_defined)
 goto opthelp;
 in_stdin = 1;
+pw_source_defined = 1;
 break;
 }
 }
_
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits

[openssl-commits] Build failed: openssl master.2832

2016-04-27 Thread AppVeyor




Build openssl master.2832 failed


Commit 7936a86b9f by Andy Polyakov on 4/26/2016 7:30 PM:

camellia/build.info: fix typo


Configure your notification preferences

_
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits

39 matches

Mail list logo