diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2001-06-19 00:09:20 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2001-06-19 00:09:20 +0000 |
| commit | 1b822decb85ae7131e5687255ae59db34b57afaf (patch) | |
| tree | 3ec0c62731138a662c679933cfe9498c216f4b3c | |
| parent | dab4c2824fe6dd055b17cc6a736059222cd03282 (diff) | |
| download | openssl-1b822decb85ae7131e5687255ae59db34b57afaf.tar.gz | |
Don't set *pointer if add_lock_callback used.
| -rw-r--r-- | CHANGES | 5 | ||||
| -rw-r--r-- | crypto/cryptlib.c | 1 |
2 files changed, 5 insertions, 1 deletions
@@ -4,6 +4,11 @@ Changes between 0.9.6a and 0.9.6b [XX xxx XXXX] + *) Don't change *pointer in CRYPTO_add_lock() is add_lock_callback is + used: it isn't thread safe and the add_lock_callback should handle + that itself. + [Paul Rose <Paul.Rose@bridge.com>] + *) Verify that incoming data obeys the block size in ssl3_enc (ssl/s3_enc.c) and tls1_enc (ssl/t1_enc.c). [Bodo Moeller] diff --git a/crypto/cryptlib.c b/crypto/cryptlib.c index c99851810f..fdb416d598 100644 --- a/crypto/cryptlib.c +++ b/crypto/cryptlib.c @@ -430,7 +430,6 @@ int CRYPTO_add_lock(int *pointer, int amount, int type, const char *file, CRYPTO_get_lock_name(type), file,line); #endif - *pointer=ret; } else { |