diff options
Diffstat (limited to 'src/lib/libcrypto/ecdsa/ecs_lib.c')
| -rw-r--r-- | src/lib/libcrypto/ecdsa/ecs_lib.c | 96 |
1 files changed, 1 insertions, 95 deletions
diff --git a/src/lib/libcrypto/ecdsa/ecs_lib.c b/src/lib/libcrypto/ecdsa/ecs_lib.c index 9ba5db2fca..11e707dd55 100644 --- a/src/lib/libcrypto/ecdsa/ecs_lib.c +++ b/src/lib/libcrypto/ecdsa/ecs_lib.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: ecs_lib.c,v 1.19 2023/06/25 18:27:38 tb Exp $ */ | 1 | /* $OpenBSD: ecs_lib.c,v 1.20 2023/06/25 18:45:56 tb Exp $ */ |
| 2 | /* ==================================================================== | 2 | /* ==================================================================== |
| 3 | * Copyright (c) 1998-2005 The OpenSSL Project. All rights reserved. | 3 | * Copyright (c) 1998-2005 The OpenSSL Project. All rights reserved. |
| 4 | * | 4 | * |
| @@ -68,10 +68,6 @@ | |||
| 68 | 68 | ||
| 69 | static const ECDSA_METHOD *default_ECDSA_method = NULL; | 69 | static const ECDSA_METHOD *default_ECDSA_method = NULL; |
| 70 | 70 | ||
| 71 | static void *ecdsa_data_new(void); | ||
| 72 | static void *ecdsa_data_dup(void *); | ||
| 73 | static void ecdsa_data_free(void *); | ||
| 74 | |||
| 75 | void | 71 | void |
| 76 | ECDSA_set_default_method(const ECDSA_METHOD *meth) | 72 | ECDSA_set_default_method(const ECDSA_METHOD *meth) |
| 77 | { | 73 | { |
| @@ -93,96 +89,6 @@ ECDSA_set_method(EC_KEY *eckey, const ECDSA_METHOD *meth) | |||
| 93 | return 0; | 89 | return 0; |
| 94 | } | 90 | } |
| 95 | 91 | ||
| 96 | static ECDSA_DATA * | ||
| 97 | ECDSA_DATA_new_method(ENGINE *engine) | ||
| 98 | { | ||
| 99 | ECDSA_DATA *ret; | ||
| 100 | |||
| 101 | ret = malloc(sizeof(ECDSA_DATA)); | ||
| 102 | if (ret == NULL) { | ||
| 103 | ECDSAerror(ERR_R_MALLOC_FAILURE); | ||
| 104 | return (NULL); | ||
| 105 | } | ||
| 106 | |||
| 107 | ret->init = NULL; | ||
| 108 | |||
| 109 | ret->meth = ECDSA_get_default_method(); | ||
| 110 | ret->engine = engine; | ||
| 111 | #ifndef OPENSSL_NO_ENGINE | ||
| 112 | if (!ret->engine) | ||
| 113 | ret->engine = ENGINE_get_default_ECDSA(); | ||
| 114 | if (ret->engine) { | ||
| 115 | ret->meth = ENGINE_get_ECDSA(ret->engine); | ||
| 116 | if (ret->meth == NULL) { | ||
| 117 | ECDSAerror(ERR_R_ENGINE_LIB); | ||
| 118 | ENGINE_finish(ret->engine); | ||
| 119 | free(ret); | ||
| 120 | return NULL; | ||
| 121 | } | ||
| 122 | } | ||
| 123 | #endif | ||
| 124 | |||
| 125 | ret->flags = ret->meth->flags; | ||
| 126 | CRYPTO_new_ex_data(CRYPTO_EX_INDEX_ECDSA, ret, &ret->ex_data); | ||
| 127 | return (ret); | ||
| 128 | } | ||
| 129 | |||
| 130 | static void * | ||
| 131 | ecdsa_data_new(void) | ||
| 132 | { | ||
| 133 | return (void *)ECDSA_DATA_new_method(NULL); | ||
| 134 | } | ||
| 135 | |||
| 136 | static void * | ||
| 137 | ecdsa_data_dup(void *data) | ||
| 138 | { | ||
| 139 | ECDSA_DATA *r = (ECDSA_DATA *)data; | ||
| 140 | |||
| 141 | /* XXX: dummy operation */ | ||
| 142 | if (r == NULL) | ||
| 143 | return NULL; | ||
| 144 | |||
| 145 | return ecdsa_data_new(); | ||
| 146 | } | ||
| 147 | |||
| 148 | static void | ||
| 149 | ecdsa_data_free(void *data) | ||
| 150 | { | ||
| 151 | ECDSA_DATA *r = (ECDSA_DATA *)data; | ||
| 152 | |||
| 153 | #ifndef OPENSSL_NO_ENGINE | ||
| 154 | ENGINE_finish(r->engine); | ||
| 155 | #endif | ||
| 156 | CRYPTO_free_ex_data(CRYPTO_EX_INDEX_ECDSA, r, &r->ex_data); | ||
| 157 | |||
| 158 | freezero(r, sizeof(ECDSA_DATA)); | ||
| 159 | } | ||
| 160 | |||
| 161 | ECDSA_DATA * | ||
| 162 | ecdsa_check(EC_KEY *key) | ||
| 163 | { | ||
| 164 | ECDSA_DATA *ecdsa_data; | ||
| 165 | |||
| 166 | void *data = EC_KEY_get_key_method_data(key, ecdsa_data_dup, | ||
| 167 | ecdsa_data_free, ecdsa_data_free); | ||
| 168 | if (data == NULL) { | ||
| 169 | ecdsa_data = (ECDSA_DATA *)ecdsa_data_new(); | ||
| 170 | if (ecdsa_data == NULL) | ||
| 171 | return NULL; | ||
| 172 | data = EC_KEY_insert_key_method_data(key, (void *)ecdsa_data, | ||
| 173 | ecdsa_data_dup, ecdsa_data_free, ecdsa_data_free); | ||
| 174 | if (data != NULL) { | ||
| 175 | /* Another thread raced us to install the key_method | ||
| 176 | * data and won. */ | ||
| 177 | ecdsa_data_free(ecdsa_data); | ||
| 178 | ecdsa_data = (ECDSA_DATA *)data; | ||
| 179 | } | ||
| 180 | } else | ||
| 181 | ecdsa_data = (ECDSA_DATA *)data; | ||
| 182 | |||
| 183 | return ecdsa_data; | ||
| 184 | } | ||
| 185 | |||
| 186 | int | 92 | int |
| 187 | ECDSA_size(const EC_KEY *r) | 93 | ECDSA_size(const EC_KEY *r) |
| 188 | { | 94 | { |
