diff options
Diffstat (limited to 'src/lib/libcrypto/engine')
-rw-r--r-- | src/lib/libcrypto/engine/README | 4 | ||||
-rw-r--r-- | src/lib/libcrypto/engine/eng_aesni.c | 4 | ||||
-rw-r--r-- | src/lib/libcrypto/engine/eng_list.c | 4 | ||||
-rw-r--r-- | src/lib/libcrypto/engine/eng_padlock.c | 6 | ||||
-rw-r--r-- | src/lib/libcrypto/engine/eng_table.c | 6 | ||||
-rw-r--r-- | src/lib/libcrypto/engine/engine.h | 4 |
6 files changed, 14 insertions, 14 deletions
diff --git a/src/lib/libcrypto/engine/README b/src/lib/libcrypto/engine/README index 6b69b70f57..bc4a9041ff 100644 --- a/src/lib/libcrypto/engine/README +++ b/src/lib/libcrypto/engine/README | |||
@@ -122,7 +122,7 @@ use by EVP_MD code. Ditto for tb_rsa.c, tb_dsa.c, etc. These instantiations of | |||
122 | ENGINE_TABLE essentially provide linker-separation of the classes so that even | 122 | ENGINE_TABLE essentially provide linker-separation of the classes so that even |
123 | if ENGINEs implement *all* possible algorithms, an application using only | 123 | if ENGINEs implement *all* possible algorithms, an application using only |
124 | EVP_CIPHER code will link at most code relating to EVP_CIPHER, tb_cipher.c, core | 124 | EVP_CIPHER code will link at most code relating to EVP_CIPHER, tb_cipher.c, core |
125 | ENGINE code that is independant of class, and of course the ENGINE | 125 | ENGINE code that is independent of class, and of course the ENGINE |
126 | implementation that the application loaded. It will *not* however link any | 126 | implementation that the application loaded. It will *not* however link any |
127 | class-specific ENGINE code for digests, RSA, etc nor will it bleed over into | 127 | class-specific ENGINE code for digests, RSA, etc nor will it bleed over into |
128 | other APIs, such as the RSA/DSA/etc library code. | 128 | other APIs, such as the RSA/DSA/etc library code. |
@@ -188,7 +188,7 @@ state will be unchanged. Thus, no cleanup is required unless registration takes | |||
188 | place. ENGINE_cleanup() will simply iterate across a list of registered cleanup | 188 | place. ENGINE_cleanup() will simply iterate across a list of registered cleanup |
189 | callbacks calling each in turn, and will then internally delete its own storage | 189 | callbacks calling each in turn, and will then internally delete its own storage |
190 | (a STACK). When a cleanup callback is next registered (eg. if the cleanup() is | 190 | (a STACK). When a cleanup callback is next registered (eg. if the cleanup() is |
191 | part of a gracefull restart and the application wants to cleanup all state then | 191 | part of a graceful restart and the application wants to cleanup all state then |
192 | start again), the internal STACK storage will be freshly allocated. This is much | 192 | start again), the internal STACK storage will be freshly allocated. This is much |
193 | the same as the situation in the ENGINE_TABLE instantiations ... NULL is the | 193 | the same as the situation in the ENGINE_TABLE instantiations ... NULL is the |
194 | initialised state, so only modification operations (not queries) will cause that | 194 | initialised state, so only modification operations (not queries) will cause that |
diff --git a/src/lib/libcrypto/engine/eng_aesni.c b/src/lib/libcrypto/engine/eng_aesni.c index 586f74792a..cce4203bc4 100644 --- a/src/lib/libcrypto/engine/eng_aesni.c +++ b/src/lib/libcrypto/engine/eng_aesni.c | |||
@@ -1,6 +1,6 @@ | |||
1 | /* $OpenBSD: eng_aesni.c,v 1.11 2018/04/14 07:18:37 tb Exp $ */ | 1 | /* $OpenBSD: eng_aesni.c,v 1.12 2022/12/26 07:18:51 jmc Exp $ */ |
2 | /* | 2 | /* |
3 | * Support for Intel AES-NI intruction set | 3 | * Support for Intel AES-NI instruction set |
4 | * Author: Huang Ying <ying.huang@intel.com> | 4 | * Author: Huang Ying <ying.huang@intel.com> |
5 | * | 5 | * |
6 | * Intel AES-NI is a new set of Single Instruction Multiple Data | 6 | * Intel AES-NI is a new set of Single Instruction Multiple Data |
diff --git a/src/lib/libcrypto/engine/eng_list.c b/src/lib/libcrypto/engine/eng_list.c index b29b4102e4..451c8616ef 100644 --- a/src/lib/libcrypto/engine/eng_list.c +++ b/src/lib/libcrypto/engine/eng_list.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: eng_list.c,v 1.24 2019/01/19 01:07:00 tb Exp $ */ | 1 | /* $OpenBSD: eng_list.c,v 1.25 2022/12/26 07:18:51 jmc Exp $ */ |
2 | /* Written by Geoff Thorpe (geoff@geoffthorpe.net) for the OpenSSL | 2 | /* Written by Geoff Thorpe (geoff@geoffthorpe.net) for the OpenSSL |
3 | * project 2000. | 3 | * project 2000. |
4 | */ | 4 | */ |
@@ -223,7 +223,7 @@ ENGINE_get_next(ENGINE *e) | |||
223 | CRYPTO_w_lock(CRYPTO_LOCK_ENGINE); | 223 | CRYPTO_w_lock(CRYPTO_LOCK_ENGINE); |
224 | ret = e->next; | 224 | ret = e->next; |
225 | if (ret) { | 225 | if (ret) { |
226 | /* Return a valid structural refernce to the next ENGINE */ | 226 | /* Return a valid structural reference to the next ENGINE */ |
227 | ret->struct_ref++; | 227 | ret->struct_ref++; |
228 | engine_ref_debug(ret, 0, 1) | 228 | engine_ref_debug(ret, 0, 1) |
229 | } | 229 | } |
diff --git a/src/lib/libcrypto/engine/eng_padlock.c b/src/lib/libcrypto/engine/eng_padlock.c index 0281ab810c..50b5fb780d 100644 --- a/src/lib/libcrypto/engine/eng_padlock.c +++ b/src/lib/libcrypto/engine/eng_padlock.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: eng_padlock.c,v 1.16 2018/04/14 07:18:37 tb Exp $ */ | 1 | /* $OpenBSD: eng_padlock.c,v 1.17 2022/12/26 07:18:51 jmc Exp $ */ |
2 | /* | 2 | /* |
3 | * Support for VIA PadLock Advanced Cryptography Engine (ACE) | 3 | * Support for VIA PadLock Advanced Cryptography Engine (ACE) |
4 | * Written by Michal Ludvig <michal@logix.cz> | 4 | * Written by Michal Ludvig <michal@logix.cz> |
@@ -285,7 +285,7 @@ struct padlock_cipher_data { | |||
285 | * Essentially this variable belongs in thread local storage. | 285 | * Essentially this variable belongs in thread local storage. |
286 | * Having this variable global on the other hand can only cause | 286 | * Having this variable global on the other hand can only cause |
287 | * few bogus key reloads [if any at all on single-CPU system], | 287 | * few bogus key reloads [if any at all on single-CPU system], |
288 | * so we accept the penatly... | 288 | * so we accept the penalty... |
289 | */ | 289 | */ |
290 | static volatile struct padlock_cipher_data *padlock_saved_context; | 290 | static volatile struct padlock_cipher_data *padlock_saved_context; |
291 | #endif | 291 | #endif |
@@ -872,7 +872,7 @@ padlock_aes_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out_arg, | |||
872 | chunk = PADLOCK_CHUNK; | 872 | chunk = PADLOCK_CHUNK; |
873 | 873 | ||
874 | if (out_misaligned) { | 874 | if (out_misaligned) { |
875 | /* optmize for small input */ | 875 | /* optimize for small input */ |
876 | allocated = (chunk < nbytes ? PADLOCK_CHUNK : nbytes); | 876 | allocated = (chunk < nbytes ? PADLOCK_CHUNK : nbytes); |
877 | out = alloca(0x10 + allocated); | 877 | out = alloca(0x10 + allocated); |
878 | out = NEAREST_ALIGNED(out); | 878 | out = NEAREST_ALIGNED(out); |
diff --git a/src/lib/libcrypto/engine/eng_table.c b/src/lib/libcrypto/engine/eng_table.c index a8aded5aaf..0e7ea3b698 100644 --- a/src/lib/libcrypto/engine/eng_table.c +++ b/src/lib/libcrypto/engine/eng_table.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: eng_table.c,v 1.9 2017/01/29 17:49:23 beck Exp $ */ | 1 | /* $OpenBSD: eng_table.c,v 1.10 2022/12/26 07:18:52 jmc Exp $ */ |
2 | /* ==================================================================== | 2 | /* ==================================================================== |
3 | * Copyright (c) 2001 The OpenSSL Project. All rights reserved. | 3 | * Copyright (c) 2001 The OpenSSL Project. All rights reserved. |
4 | * | 4 | * |
@@ -163,7 +163,7 @@ engine_table_register(ENGINE_TABLE **table, ENGINE_CLEANUP_CB *cleanup, | |||
163 | fnd->funct = NULL; | 163 | fnd->funct = NULL; |
164 | (void)lh_ENGINE_PILE_insert(&(*table)->piles, fnd); | 164 | (void)lh_ENGINE_PILE_insert(&(*table)->piles, fnd); |
165 | } | 165 | } |
166 | /* A registration shouldn't add duplciate entries */ | 166 | /* A registration shouldn't add duplicate entries */ |
167 | (void)sk_ENGINE_delete_ptr(fnd->sk, e); | 167 | (void)sk_ENGINE_delete_ptr(fnd->sk, e); |
168 | /* if 'setdefault', this ENGINE goes to the head of the list */ | 168 | /* if 'setdefault', this ENGINE goes to the head of the list */ |
169 | if (!sk_ENGINE_push(fnd->sk, e)) | 169 | if (!sk_ENGINE_push(fnd->sk, e)) |
@@ -193,7 +193,7 @@ int_unregister_cb_doall_arg(ENGINE_PILE *pile, ENGINE *e) | |||
193 | { | 193 | { |
194 | int n; | 194 | int n; |
195 | 195 | ||
196 | /* Iterate the 'c->sk' stack removing any occurance of 'e' */ | 196 | /* Iterate the 'c->sk' stack removing any occurrence of 'e' */ |
197 | while ((n = sk_ENGINE_find(pile->sk, e)) >= 0) { | 197 | while ((n = sk_ENGINE_find(pile->sk, e)) >= 0) { |
198 | (void)sk_ENGINE_delete(pile->sk, n); | 198 | (void)sk_ENGINE_delete(pile->sk, n); |
199 | pile->uptodate = 0; | 199 | pile->uptodate = 0; |
diff --git a/src/lib/libcrypto/engine/engine.h b/src/lib/libcrypto/engine/engine.h index 5c21647fe3..41f05d48af 100644 --- a/src/lib/libcrypto/engine/engine.h +++ b/src/lib/libcrypto/engine/engine.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: engine.h,v 1.34 2022/07/12 14:42:49 kn Exp $ */ | 1 | /* $OpenBSD: engine.h,v 1.35 2022/12/26 07:18:52 jmc Exp $ */ |
2 | /* Written by Geoff Thorpe (geoff@geoffthorpe.net) for the OpenSSL | 2 | /* Written by Geoff Thorpe (geoff@geoffthorpe.net) for the OpenSSL |
3 | * project 2000. | 3 | * project 2000. |
4 | */ | 4 | */ |
@@ -631,7 +631,7 @@ typedef struct st_dynamic_MEM_fns { | |||
631 | dyn_MEM_free_cb free_cb; | 631 | dyn_MEM_free_cb free_cb; |
632 | } dynamic_MEM_fns; | 632 | } dynamic_MEM_fns; |
633 | /* FIXME: Perhaps the memory and locking code (crypto.h) should declare and use | 633 | /* FIXME: Perhaps the memory and locking code (crypto.h) should declare and use |
634 | * these types so we (and any other dependant code) can simplify a bit?? */ | 634 | * these types so we (and any other dependent code) can simplify a bit?? */ |
635 | typedef void (*dyn_lock_locking_cb)(int, int, const char *, int); | 635 | typedef void (*dyn_lock_locking_cb)(int, int, const char *, int); |
636 | typedef int (*dyn_lock_add_lock_cb)(int*, int, int, const char *, int); | 636 | typedef int (*dyn_lock_add_lock_cb)(int*, int, int, const char *, int); |
637 | typedef struct CRYPTO_dynlock_value *(*dyn_dynlock_create_cb)( | 637 | typedef struct CRYPTO_dynlock_value *(*dyn_dynlock_create_cb)( |