[openssl-commits] Build completed: openssl master.19234

2018-08-03 Thread AppVeyor


Build openssl master.19234 completed



Commit f906cf1e8c by Dr. Matthias St. Pierre on 8/4/2018 6:03 AM:

fixup! Harmonize calls to EVP_Digest*Update()


Configure your notification preferences

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


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

2018-08-03 Thread AppVeyor



Build openssl master.19233 failed


Commit 96113a0f19 by Dr. Matthias St. Pierre on 8/3/2018 10:38 PM:

Harmonize calls to EVP_Digest*{Init,Update,Final}()


Configure your notification preferences

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


[openssl-commits] [openssl] OpenSSL_1_1_0-stable update

2018-08-03 Thread Rich Salz
The branch OpenSSL_1_1_0-stable has been updated
   via  e0a79ae63700051ddab9e091031dd37ae18182a5 (commit)
  from  c700d1fe090acf3661d3948c25f489803f50a98b (commit)


- Log -
commit e0a79ae63700051ddab9e091031dd37ae18182a5
Author: Rich Salz 
Date:   Fri Aug 3 18:03:22 2018 -0400

Use auto-null-initializer

Thanks to GitHub user YuDudysheva for reporting this.

Reviewed-by: Matthias St. Pierre 
(Merged from https://github.com/openssl/openssl/pull/6853)

---

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

diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c
index 7a393cb..b8da982 100644
--- a/ssl/ssl_ciph.c
+++ b/ssl/ssl_ciph.c
@@ -101,10 +101,7 @@ static const ssl_cipher_table 
ssl_cipher_table_cipher[SSL_ENC_NUM_IDX] = {
 {SSL_CHACHA20POLY1305, NID_chacha20_poly1305},
 };
 
-static const EVP_CIPHER *ssl_cipher_methods[SSL_ENC_NUM_IDX] = {
-NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
-NULL, NULL
-};
+static const EVP_CIPHER *ssl_cipher_methods[SSL_ENC_NUM_IDX];
 
 #define SSL_COMP_NULL_IDX   0
 #define SSL_COMP_ZLIB_IDX   1
_
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits


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

2018-08-03 Thread AppVeyor



Build openssl master.19226 failed


Commit 9ef01b7ddb by Jack Lloyd on 8/3/2018 8:02 PM:

Address review comments


Configure your notification preferences

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


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

2018-08-03 Thread AppVeyor



Build openssl master.19222 failed


Commit 1207627783 by Kurt Roeckx on 7/29/2018 9:43 AM:

Add support for a strong Lucas prime 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.19221

2018-08-03 Thread AppVeyor



Build openssl master.19221 failed


Commit 427e496d73 by Kurt Roeckx on 7/29/2018 9:43 AM:

Add support for a strong Lucas prime test


Configure your notification preferences

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


[openssl-commits] [openssl] master update

2018-08-03 Thread matthias . st . pierre
The branch master has been updated
   via  28c5b7d482dda8597bbf93890463d7eb0f9f2355 (commit)
  from  d8a4f8ffd04e157d3591044cde8d7a56f605742c (commit)


- Log -
commit 28c5b7d482dda8597bbf93890463d7eb0f9f2355
Author: Dr. Matthias St. Pierre 
Date:   Wed Aug 1 21:50:41 2018 +0200

Fix some undefined behaviour in the Curve448 code (2nd attempt)

Fixes #6800
Replaces #5418

This commit reverts commit 7876dbffcee9 and moves the check for a
zero-length input down the callstack into sha3_update().

Reviewed-by: Matt Caswell 
Reviewed-by: Andy Polyakov 
Reviewed-by: Paul Dale 
(Merged from https://github.com/openssl/openssl/pull/6838)

---

Summary of changes:
 crypto/ec/curve448/eddsa.c | 9 +++--
 crypto/evp/m_sha3.c| 3 +++
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/crypto/ec/curve448/eddsa.c b/crypto/ec/curve448/eddsa.c
index 85565a8..909413a 100644
--- a/crypto/ec/curve448/eddsa.c
+++ b/crypto/ec/curve448/eddsa.c
@@ -63,8 +63,7 @@ static c448_error_t hash_init_with_dom(EVP_MD_CTX *hashctx, 
uint8_t prehashed,
 if (!EVP_DigestInit_ex(hashctx, EVP_shake256(), NULL)
 || !EVP_DigestUpdate(hashctx, dom_s, strlen(dom_s))
 || !EVP_DigestUpdate(hashctx, dom, sizeof(dom))
-|| (context_len > 0
-&& !EVP_DigestUpdate(hashctx, context, context_len)))
+|| !EVP_DigestUpdate(hashctx, context, context_len))
 return C448_FAILURE;
 
 return C448_SUCCESS;
@@ -161,8 +160,7 @@ c448_error_t c448_ed448_sign(
 || !EVP_DigestUpdate(hashctx,
  expanded + EDDSA_448_PRIVATE_BYTES,
  EDDSA_448_PRIVATE_BYTES)
-|| (message_len > 0
-&& !EVP_DigestUpdate(hashctx, message, message_len))) {
+|| !EVP_DigestUpdate(hashctx, message, message_len)) {
 OPENSSL_cleanse(expanded, sizeof(expanded));
 goto err;
 }
@@ -202,8 +200,7 @@ c448_error_t c448_ed448_sign(
 if (!hash_init_with_dom(hashctx, prehashed, 0, context, context_len)
 || !EVP_DigestUpdate(hashctx, nonce_point, sizeof(nonce_point))
 || !EVP_DigestUpdate(hashctx, pubkey, EDDSA_448_PUBLIC_BYTES)
-|| (message_len > 0
-&& !EVP_DigestUpdate(hashctx, message, message_len))
+|| !EVP_DigestUpdate(hashctx, message, message_len)
 || !EVP_DigestFinalXOF(hashctx, challenge, sizeof(challenge)))
 goto err;
 
diff --git a/crypto/evp/m_sha3.c b/crypto/evp/m_sha3.c
index cf902e7..bfc65b2 100644
--- a/crypto/evp/m_sha3.c
+++ b/crypto/evp/m_sha3.c
@@ -66,6 +66,9 @@ static int sha3_update(EVP_MD_CTX *evp_ctx, const void *_inp, 
size_t len)
 size_t bsz = ctx->block_size;
 size_t num, rem;
 
+if (len == 0)
+return 1;
+
 if ((num = ctx->num) != 0) {  /* process intermediate buffer? */
 rem = bsz - num;
 
_
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits


[openssl-commits] Build completed: openssl OpenSSL_1_1_0-stable.19216

2018-08-03 Thread AppVeyor


Build openssl OpenSSL_1_1_0-stable.19216 completed



Commit c700d1fe09 by Andy Polyakov on 8/3/2018 7:01 AM:

asn1/tasn_utl.c: fix logical error in asn1_do_lock.


Configure your notification preferences

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


[openssl-commits] [openssl] OpenSSL_1_1_0-stable update

2018-08-03 Thread Andy Polyakov
The branch OpenSSL_1_1_0-stable has been updated
   via  c700d1fe090acf3661d3948c25f489803f50a98b (commit)
   via  4e7ade969944a9e6923a48471efb910dfb5f4a3a (commit)
  from  24233a0f3c491919ee3a38e2567271ccc041ee1d (commit)


- Log -
commit c700d1fe090acf3661d3948c25f489803f50a98b
Author: Andy Polyakov 
Date:   Thu Aug 2 09:02:47 2018 +0200

asn1/tasn_utl.c: fix logical error in asn1_do_lock.

CRYPTO_atomic_add was assumed to return negative value on error, while
it returns 0.

Reviewed-by: Matt Caswell 
Reviewed-by: Paul Dale 
(Merged from https://github.com/openssl/openssl/pull/6843)

commit 4e7ade969944a9e6923a48471efb910dfb5f4a3a
Author: Andy Polyakov 
Date:   Thu Aug 2 08:59:48 2018 +0200

Revert "asn1/tasn_utl.c: fix logical error in and overhaul asn1_do_lock."

This reverts commit 24233a0f3c491919ee3a38e2567271ccc041ee1d.

Reviewed-by: Matt Caswell 
Reviewed-by: Paul Dale 
(Merged from https://github.com/openssl/openssl/pull/6843)

---

Summary of changes:
 crypto/asn1/tasn_utl.c | 35 ---
 1 file changed, 12 insertions(+), 23 deletions(-)

diff --git a/crypto/asn1/tasn_utl.c b/crypto/asn1/tasn_utl.c
index 22e853d..cad45a0 100644
--- a/crypto/asn1/tasn_utl.c
+++ b/crypto/asn1/tasn_utl.c
@@ -57,10 +57,8 @@ int asn1_set_choice_selector(ASN1_VALUE **pval, int value,
 int asn1_do_lock(ASN1_VALUE **pval, int op, const ASN1_ITEM *it)
 {
 const ASN1_AUX *aux;
-CRYPTO_REF_COUNT *lck;
+int *lck, ret;
 CRYPTO_RWLOCK **lock;
-int ret = -1;
-
 if ((it->itype != ASN1_ITYPE_SEQUENCE)
 && (it->itype != ASN1_ITYPE_NDEF_SEQUENCE))
 return 0;
@@ -69,34 +67,25 @@ int asn1_do_lock(ASN1_VALUE **pval, int op, const ASN1_ITEM 
*it)
 return 0;
 lck = offset2ptr(*pval, aux->ref_offset);
 lock = offset2ptr(*pval, aux->ref_lock);
-
-switch (op) {
-case 0:
-*lck = ret = 1;
+if (op == 0) {
+*lck = 1;
 *lock = CRYPTO_THREAD_lock_new();
 if (*lock == NULL) {
 ASN1err(ASN1_F_ASN1_DO_LOCK, ERR_R_MALLOC_FAILURE);
 return -1;
 }
-break;
-case 1:
-if (!CRYPTO_UP_REF(lck, &ret, *lock))
-return -1;
-break;
-case -1:
-if (!CRYPTO_DOWN_REF(lck, &ret, *lock))
-return -1;  /* failed */
+return 1;
+}
+if (!CRYPTO_atomic_add(lck, op, &ret, *lock))
+return -1;  /* failed */
 #ifdef REF_PRINT
-fprintf(stderr, "%p:%4d:%s\n", it, ret, it->sname);
+fprintf(stderr, "%p:%4d:%s\n", it, *lck, it->sname);
 #endif
-REF_ASSERT_ISNT(ret < 0);
-if (ret == 0) {
-CRYPTO_THREAD_lock_free(*lock);
-*lock = NULL;
-}
-break;
+REF_ASSERT_ISNT(ret < 0);
+if (ret == 0) {
+CRYPTO_THREAD_lock_free(*lock);
+*lock = NULL;
 }
-
 return ret;
 }
 
_
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits