[openssl-commits] [openssl] master update
The branch master has been updated via 95c91cb3fc85a50969358e579793a73726f6e483 (commit) from 50f3994b513ead4da94845bf38222bb71c440fb3 (commit) - Log - commit 95c91cb3fc85a50969358e579793a73726f6e483 Author: Dr. Matthias St. Pierre Date: Sat Aug 18 06:57:42 2018 +0200 test/recipes/30-test_evp_data: fix two typos Reviewed-by: Tim Hudson (Merged from https://github.com/openssl/openssl/pull/7001) --- Summary of changes: test/recipes/30-test_evp_data/evpciph.txt | 2 +- test/recipes/30-test_evp_data/evppkey.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/recipes/30-test_evp_data/evpciph.txt b/test/recipes/30-test_evp_data/evpciph.txt index bd78964..422d8b3 100644 --- a/test/recipes/30-test_evp_data/evpciph.txt +++ b/test/recipes/30-test_evp_data/evpciph.txt @@ -19,7 +19,7 @@ # -K 000102030405060708090A0B0C0D0E0F1011121314151617 -iv 0001020304050607 | # xxd -ps -u -Title = DES Tests (varous sources) +Title = DES Tests (various sources) Cipher = DES-EDE3-CFB1 Key = 000102030405060708090A0B0C0D0E0F1011121314151617 diff --git a/test/recipes/30-test_evp_data/evppkey.txt b/test/recipes/30-test_evp_data/evppkey.txt index d482c14..2d769d4 100644 --- a/test/recipes/30-test_evp_data/evppkey.txt +++ b/test/recipes/30-test_evp_data/evppkey.txt @@ -17287,7 +17287,7 @@ PeerKey=BOB_cf_sect283k1_PUB Ctrl=ecdh_cofactor_mode:1 Result = DERIVE_ERROR -Title = Test keypair mistmatches +Title = Test keypair mismatches PrivPubKeyPair = Alice-25519:Bob-25519-PUBLIC Result = KEYPAIR_MISMATCH _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] Build completed: openssl master.19460
Build openssl master.19460 completed Commit e090dffa3a by Dr. Matthias St. Pierre on 8/17/2018 10:55 PM: fixup! rand_unix.c: assimilate syscall_random() with getrandom(2) Configure your notification preferences _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] Build failed: openssl master.19459
Build openssl master.19459 failed Commit 2feddc6d99 by Dr. Matthias St. Pierre on 8/16/2018 7:34 PM: rand_unix.c: don't discard entropy bytes from /dev/*random 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
The branch OpenSSL_1_1_0-stable has been updated
via dba995e78f09ccf00a3cf1b1c4c196febd2a7fa4 (commit)
from d706faf38da07083cb2116f4d30422081bc8ae1d (commit)
- Log -
commit dba995e78f09ccf00a3cf1b1c4c196febd2a7fa4
Author: Benjamin Kaduk
Date: Thu Aug 16 15:42:55 2018 -0500
Avoid shadowing 'free' in X509_LOOKUP_met_set_free
gcc 4.6 (arguably erroneously) warns about our use of 'free' as
the name of a function parameter, when --strict-warnings is enabled:
crypto/x509/x509_meth.c: In function 'X509_LOOKUP_meth_set_free':
crypto/x509/x509_meth.c:61:12: error: declaration of 'free' shadows a
global declaration [-Werror=shadow]
cc1: all warnings being treated as errors
make[1]: *** [crypto/x509/x509_meth.o] Error 1
(gcc 4.8 is fine with this code, as are newer compilers.)
Reviewed-by: Tim Hudson
(Merged from https://github.com/openssl/openssl/pull/6991)
(cherry picked from commit 50f3994b513ead4da94845bf38222bb71c440fb3)
---
Summary of changes:
crypto/x509/x509_meth.c| 4 ++--
include/openssl/x509_vfy.h | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/crypto/x509/x509_meth.c b/crypto/x509/x509_meth.c
index 05ed4bf..9dc587a 100644
--- a/crypto/x509/x509_meth.c
+++ b/crypto/x509/x509_meth.c
@@ -58,9 +58,9 @@ int (*X509_LOOKUP_meth_get_new_item(const X509_LOOKUP_METHOD*
method))
int X509_LOOKUP_meth_set_free(
X509_LOOKUP_METHOD *method,
-void (*free) (X509_LOOKUP *ctx))
+void (*free_fn) (X509_LOOKUP *ctx))
{
-method->free = free;
+method->free = free_fn;
return 1;
}
diff --git a/include/openssl/x509_vfy.h b/include/openssl/x509_vfy.h
index d91581c..131b6cf 100644
--- a/include/openssl/x509_vfy.h
+++ b/include/openssl/x509_vfy.h
@@ -397,7 +397,7 @@ int (*X509_LOOKUP_meth_get_new_item(const
X509_LOOKUP_METHOD* method))
(X509_LOOKUP *ctx);
int X509_LOOKUP_meth_set_free(X509_LOOKUP_METHOD *method,
- void (*free) (X509_LOOKUP *ctx));
+ void (*free_fn) (X509_LOOKUP *ctx));
void (*X509_LOOKUP_meth_get_free(const X509_LOOKUP_METHOD* method))
(X509_LOOKUP *ctx);
_
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] [openssl] master update
The branch master has been updated
via 50f3994b513ead4da94845bf38222bb71c440fb3 (commit)
from d2b863643d94704abd9840519cfc54d22d0481fe (commit)
- Log -
commit 50f3994b513ead4da94845bf38222bb71c440fb3
Author: Benjamin Kaduk
Date: Thu Aug 16 15:42:55 2018 -0500
Avoid shadowing 'free' in X509_LOOKUP_met_set_free
gcc 4.6 (arguably erroneously) warns about our use of 'free' as
the name of a function parameter, when --strict-warnings is enabled:
crypto/x509/x509_meth.c: In function 'X509_LOOKUP_meth_set_free':
crypto/x509/x509_meth.c:61:12: error: declaration of 'free' shadows a
global declaration [-Werror=shadow]
cc1: all warnings being treated as errors
make[1]: *** [crypto/x509/x509_meth.o] Error 1
(gcc 4.8 is fine with this code, as are newer compilers.)
Reviewed-by: Tim Hudson
(Merged from https://github.com/openssl/openssl/pull/6991)
---
Summary of changes:
crypto/x509/x509_meth.c| 4 ++--
include/openssl/x509_vfy.h | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/crypto/x509/x509_meth.c b/crypto/x509/x509_meth.c
index 05ed4bf..9dc587a 100644
--- a/crypto/x509/x509_meth.c
+++ b/crypto/x509/x509_meth.c
@@ -58,9 +58,9 @@ int (*X509_LOOKUP_meth_get_new_item(const X509_LOOKUP_METHOD*
method))
int X509_LOOKUP_meth_set_free(
X509_LOOKUP_METHOD *method,
-void (*free) (X509_LOOKUP *ctx))
+void (*free_fn) (X509_LOOKUP *ctx))
{
-method->free = free;
+method->free = free_fn;
return 1;
}
diff --git a/include/openssl/x509_vfy.h b/include/openssl/x509_vfy.h
index a657ec2..2adb155 100644
--- a/include/openssl/x509_vfy.h
+++ b/include/openssl/x509_vfy.h
@@ -401,7 +401,7 @@ int (*X509_LOOKUP_meth_get_new_item(const
X509_LOOKUP_METHOD* method))
(X509_LOOKUP *ctx);
int X509_LOOKUP_meth_set_free(X509_LOOKUP_METHOD *method,
- void (*free) (X509_LOOKUP *ctx));
+ void (*free_fn) (X509_LOOKUP *ctx));
void (*X509_LOOKUP_meth_get_free(const X509_LOOKUP_METHOD* method))
(X509_LOOKUP *ctx);
_
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] [openssl] master update
The branch master has been updated
via d2b863643d94704abd9840519cfc54d22d0481fe (commit)
from 2805ee1e095a78f596dc7adf778441e2edb9f15c (commit)
- Log -
commit d2b863643d94704abd9840519cfc54d22d0481fe
Author: Andy Polyakov
Date: Mon Aug 13 22:53:14 2018 +0200
crypto/threads_*: remove CRYPTO_atomic_{read|write}.
CRYPTO_atomic_read was added with intention to read statistics counters,
but readings are effectively indistinguishable from regular load (even
in non-lock-free case). This is because you can get out-dated value in
both cases. CRYPTO_atomic_write was added for symmetry and was never used.
Reviewed-by: Kurt Roeckx
(Merged from https://github.com/openssl/openssl/pull/6883)
---
Summary of changes:
crypto/threads_none.c | 12
crypto/threads_pthread.c| 38 -
crypto/threads_win.c| 12
doc/man3/CRYPTO_THREAD_run_once.pod | 17 ++---
include/openssl/crypto.h| 2 --
util/libcrypto.num | 2 --
6 files changed, 2 insertions(+), 81 deletions(-)
diff --git a/crypto/threads_none.c b/crypto/threads_none.c
index ab6db8e..4b1940a 100644
--- a/crypto/threads_none.c
+++ b/crypto/threads_none.c
@@ -128,18 +128,6 @@ int CRYPTO_atomic_add(int *val, int amount, int *ret,
CRYPTO_RWLOCK *lock)
return 1;
}
-int CRYPTO_atomic_read(int *val, int *ret, CRYPTO_RWLOCK *lock)
-{
-*ret = *val;
-return 1;
-}
-
-int CRYPTO_atomic_write(int *val, int n, CRYPTO_RWLOCK *lock)
-{
-*val = n;
-return 1;
-}
-
int openssl_init_fork_handlers(void)
{
return 0;
diff --git a/crypto/threads_pthread.c b/crypto/threads_pthread.c
index 8d30e1c..5a59779 100644
--- a/crypto/threads_pthread.c
+++ b/crypto/threads_pthread.c
@@ -175,44 +175,6 @@ int CRYPTO_atomic_add(int *val, int amount, int *ret,
CRYPTO_RWLOCK *lock)
return 1;
}
-int CRYPTO_atomic_read(int *val, int *ret, CRYPTO_RWLOCK *lock)
-{
-# if defined(__GNUC__) && defined(__ATOMIC_ACQUIRE)
-if (__atomic_is_lock_free(sizeof(*val), val)) {
-__atomic_load(val, ret, __ATOMIC_ACQUIRE);
-return 1;
-}
-# endif
-if (!CRYPTO_THREAD_read_lock(lock))
-return 0;
-
-*ret = *val;
-
-if (!CRYPTO_THREAD_unlock(lock))
-return 0;
-
-return 1;
-}
-
-int CRYPTO_atomic_write(int *val, int n, CRYPTO_RWLOCK *lock)
-{
-# if defined(__GNUC__) && defined(__ATOMIC_RELEASE)
-if (__atomic_is_lock_free(sizeof(*val), val)) {
-__atomic_store(val, , __ATOMIC_RELEASE);
-return 1;
-}
-# endif
-if (!CRYPTO_THREAD_write_lock(lock))
-return 0;
-
-*val = n;
-
-if (!CRYPTO_THREAD_unlock(lock))
-return 0;
-
-return 1;
-}
-
# ifdef OPENSSL_SYS_UNIX
static pthread_once_t fork_once_control = PTHREAD_ONCE_INIT;
diff --git a/crypto/threads_win.c b/crypto/threads_win.c
index 7fdbc1f..d8fdfb7 100644
--- a/crypto/threads_win.c
+++ b/crypto/threads_win.c
@@ -155,18 +155,6 @@ int CRYPTO_atomic_add(int *val, int amount, int *ret,
CRYPTO_RWLOCK *lock)
return 1;
}
-int CRYPTO_atomic_read(int *val, int *ret, CRYPTO_RWLOCK *lock)
-{
-*ret = InterlockedCompareExchange(val, 0, 0);
-return 1;
-}
-
-int CRYPTO_atomic_write(int *val, int n, CRYPTO_RWLOCK *lock)
-{
-InterlockedExchange(val, n);
-return 1;
-}
-
int openssl_init_fork_handlers(void)
{
return 0;
diff --git a/doc/man3/CRYPTO_THREAD_run_once.pod
b/doc/man3/CRYPTO_THREAD_run_once.pod
index a290278..3277613 100644
--- a/doc/man3/CRYPTO_THREAD_run_once.pod
+++ b/doc/man3/CRYPTO_THREAD_run_once.pod
@@ -4,8 +4,8 @@
CRYPTO_THREAD_run_once,
CRYPTO_THREAD_lock_new, CRYPTO_THREAD_read_lock, CRYPTO_THREAD_write_lock,
-CRYPTO_THREAD_unlock, CRYPTO_THREAD_lock_free, CRYPTO_atomic_add,
-CRYPTO_atomic_read, CRYPTO_atomic_write - OpenSSL thread support
+CRYPTO_THREAD_unlock, CRYPTO_THREAD_lock_free,
+CRYPTO_atomic_add - OpenSSL thread support
=head1 SYNOPSIS
@@ -21,8 +21,6 @@ CRYPTO_atomic_read, CRYPTO_atomic_write - OpenSSL thread
support
void CRYPTO_THREAD_lock_free(CRYPTO_RWLOCK *lock);
int CRYPTO_atomic_add(int *val, int amount, int *ret, CRYPTO_RWLOCK *lock);
- int CRYPTO_atomic_read(int *val, int *ret, CRYPTO_RWLOCK *lock);
- int CRYPTO_atomic_write(int *val, int n, CRYPTO_RWLOCK *lock);
=head1 DESCRIPTION
@@ -77,17 +75,6 @@ operations are supported on the specific platform. Because
of this, if a
variable is modified by CRYPTO_atomic_add() then CRYPTO_atomic_add() must
be the only way that the variable is modified.
-=item *
-
-CRYPTO_atomic_read() atomically reads B and returns the result of
-the operation in B. B will be locked, unless atomic operations
-are supported on the specific platform.
-
-=item *
-
-CRYPTO_atomic_write() atomically writes B to
[openssl-commits] [web] master update
The branch master has been updated via b966818f2cf7a74e2535e6717f53a603f684fc89 (commit) via 75e2b7a51f0c104ebfbfecdc49d24e3f5b017581 (commit) from 69f29ba7e9075d3e7cb078a3ee0581665b8ce0bd (commit) - Log - commit b966818f2cf7a74e2535e6717f53a603f684fc89 Merge: 75e2b7a 69f29ba Author: Mark J. Cox Date: Fri Aug 17 10:21:51 2018 +0100 Merge branch 'master' of git.openssl.org:openssl-web commit 75e2b7a51f0c104ebfbfecdc49d24e3f5b017581 Author: Mark J. Cox Date: Fri Aug 17 10:21:21 2018 +0100 Rearrange to alphabetical order which makes more sense (ack'd by Tim) --- Summary of changes: support/acks.html | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/support/acks.html b/support/acks.html index 4094177..eea4919 100644 --- a/support/acks.html +++ b/support/acks.html @@ -15,7 +15,7 @@ We would like to identify and thank the following such sponsors for their significant support of the OpenSSL project. Sponsors are - listed chronologically within categories. Please note that we ask + listed alphabetically within categories. Please note that we ask permission to identify sponsors and that some sponsors we consider eligible for inclusion here have requested to remain anonymous. @@ -53,15 +53,15 @@ Platinum support: - https://www.netapp.com/;> https://www.bluecedar.com/;> - https://www.vmware.com/;>https://www.huawei.com/;> + https://www.netapp.com/;> https://www.oracle.com/;> - https://www.huawei.com/;>https://www.vmware.com/;> _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] [openssl] OpenSSL_1_0_2-stable update
The branch OpenSSL_1_0_2-stable has been updated
via 9804228a4313fcdff1cface0f87ce8b8ed180259 (commit)
from 8297ab58008e01f4b86c1b168118aaa3bb882234 (commit)
- Log -
commit 9804228a4313fcdff1cface0f87ce8b8ed180259
Author: Andy Polyakov
Date: Sun Jul 29 14:13:32 2018 +0200
x509v3/v3_purp.c: resolve Thread Sanitizer nit.
Reviewed-by: Viktor Dukhovni
(Merged from https://github.com/openssl/openssl/pull/6916)
(cherry picked from commit 0da7358b0757fa35f2c3a8f51fa036466ae50fd7)
Resolved conflicts:
crypto/x509v3/v3_purp.c
---
Summary of changes:
crypto/x509v3/v3_purp.c | 4
1 file changed, 4 deletions(-)
diff --git a/crypto/x509v3/v3_purp.c b/crypto/x509v3/v3_purp.c
index 7080a51..6d3aa8f 100644
--- a/crypto/x509v3/v3_purp.c
+++ b/crypto/x509v3/v3_purp.c
@@ -396,12 +396,8 @@ static void x509v3_cache_extensions(X509 *x)
ASN1_BIT_STRING *ns;
EXTENDED_KEY_USAGE *extusage;
X509_EXTENSION *ex;
-
int i;
-if (x->ex_flags & EXFLAG_SET)
-return;
-
CRYPTO_w_lock(CRYPTO_LOCK_X509);
if (x->ex_flags & EXFLAG_SET) {
CRYPTO_w_unlock(CRYPTO_LOCK_X509);
_
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
