diff options
author | tb <> | 2023-05-17 07:42:38 +0000 |
---|---|---|
committer | tb <> | 2023-05-17 07:42:38 +0000 |
commit | 244fe4acf652024e7c876f6498c46317be42ed9d (patch) | |
tree | c3571a1584949460ec1e7791842855fc20abe3f0 /src/lib/libcrypto/crypto_lock.c | |
parent | 6683fd06977fdaa02290993ccf540e097725fbcb (diff) | |
download | openbsd-244fe4acf652024e7c876f6498c46317be42ed9d.tar.gz openbsd-244fe4acf652024e7c876f6498c46317be42ed9d.tar.bz2 openbsd-244fe4acf652024e7c876f6498c46317be42ed9d.zip |
Use crypto_internal.h's CTASSERT()
Now that this macro is available in a header, let's use that version
rather than copies in several .c files.
discussed with jsing
Diffstat (limited to 'src/lib/libcrypto/crypto_lock.c')
-rw-r--r-- | src/lib/libcrypto/crypto_lock.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/lib/libcrypto/crypto_lock.c b/src/lib/libcrypto/crypto_lock.c index 5d317a81c0..5b1d1b090b 100644 --- a/src/lib/libcrypto/crypto_lock.c +++ b/src/lib/libcrypto/crypto_lock.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: crypto_lock.c,v 1.2 2018/11/28 15:51:32 jsing Exp $ */ | 1 | /* $OpenBSD: crypto_lock.c,v 1.3 2023/05/17 07:42:38 tb Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2018 Brent Cook <bcook@openbsd.org> | 3 | * Copyright (c) 2018 Brent Cook <bcook@openbsd.org> |
4 | * | 4 | * |
@@ -19,6 +19,8 @@ | |||
19 | 19 | ||
20 | #include <openssl/crypto.h> | 20 | #include <openssl/crypto.h> |
21 | 21 | ||
22 | #include "crypto_internal.h" | ||
23 | |||
22 | static pthread_mutex_t locks[] = { | 24 | static pthread_mutex_t locks[] = { |
23 | PTHREAD_MUTEX_INITIALIZER, | 25 | PTHREAD_MUTEX_INITIALIZER, |
24 | PTHREAD_MUTEX_INITIALIZER, | 26 | PTHREAD_MUTEX_INITIALIZER, |
@@ -63,9 +65,6 @@ static pthread_mutex_t locks[] = { | |||
63 | PTHREAD_MUTEX_INITIALIZER, | 65 | PTHREAD_MUTEX_INITIALIZER, |
64 | }; | 66 | }; |
65 | 67 | ||
66 | #define CTASSERT(x) extern char _ctassert[(x) ? 1 : -1 ] \ | ||
67 | __attribute__((__unused__)) | ||
68 | |||
69 | CTASSERT((sizeof(locks) / sizeof(*locks)) == CRYPTO_NUM_LOCKS); | 68 | CTASSERT((sizeof(locks) / sizeof(*locks)) == CRYPTO_NUM_LOCKS); |
70 | 69 | ||
71 | void | 70 | void |