mirror of
https://github.com/openssl/openssl.git
synced 2024-12-15 06:01:37 +08:00
e077455e9e
Since OPENSSL_malloc() and friends report ERR_R_MALLOC_FAILURE, and at least handle the file name and line number they are called from, there's no need to report ERR_R_MALLOC_FAILURE where they are called directly, or when SSLfatal() and RLAYERfatal() is used, the reason `ERR_R_MALLOC_FAILURE` is changed to `ERR_R_CRYPTO_LIB`. There were a number of places where `ERR_R_MALLOC_FAILURE` was reported even though it was a function from a different sub-system that was called. Those places are changed to report ERR_R_{lib}_LIB, where {lib} is the name of that sub-system. Some of them are tricky to get right, as we have a lot of functions that belong in the ASN1 sub-system, and all the `sk_` calls or from the CRYPTO sub-system. Some extra adaptation was necessary where there were custom OPENSSL_malloc() wrappers, and some bugs are fixed alongside these changes. Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Hugo Landau <hlandau@openssl.org> (Merged from https://github.com/openssl/openssl/pull/19301)
168 lines
4.2 KiB
C
168 lines
4.2 KiB
C
/*
|
|
* Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved.
|
|
*
|
|
* Licensed under the Apache License 2.0 (the "License"). You may not use
|
|
* this file except in compliance with the License. You can obtain a copy
|
|
* in the file LICENSE in the source distribution or at
|
|
* https://www.openssl.org/source/license.html
|
|
*/
|
|
|
|
#include <string.h>
|
|
#include <openssl/err.h>
|
|
#include <openssl/proverr.h>
|
|
#include "crypto/ecx.h"
|
|
#include "internal/common.h" /* for ossl_assert() */
|
|
|
|
#ifdef S390X_EC_ASM
|
|
# include "s390x_arch.h"
|
|
#endif
|
|
|
|
ECX_KEY *ossl_ecx_key_new(OSSL_LIB_CTX *libctx, ECX_KEY_TYPE type, int haspubkey,
|
|
const char *propq)
|
|
{
|
|
ECX_KEY *ret = OPENSSL_zalloc(sizeof(*ret));
|
|
|
|
if (ret == NULL)
|
|
return NULL;
|
|
|
|
ret->libctx = libctx;
|
|
ret->haspubkey = haspubkey;
|
|
switch (type) {
|
|
case ECX_KEY_TYPE_X25519:
|
|
ret->keylen = X25519_KEYLEN;
|
|
break;
|
|
case ECX_KEY_TYPE_X448:
|
|
ret->keylen = X448_KEYLEN;
|
|
break;
|
|
case ECX_KEY_TYPE_ED25519:
|
|
ret->keylen = ED25519_KEYLEN;
|
|
break;
|
|
case ECX_KEY_TYPE_ED448:
|
|
ret->keylen = ED448_KEYLEN;
|
|
break;
|
|
}
|
|
ret->type = type;
|
|
ret->references = 1;
|
|
|
|
if (propq != NULL) {
|
|
ret->propq = OPENSSL_strdup(propq);
|
|
if (ret->propq == NULL)
|
|
goto err;
|
|
}
|
|
|
|
ret->lock = CRYPTO_THREAD_lock_new();
|
|
if (ret->lock == NULL) {
|
|
ERR_raise(ERR_LIB_EC, ERR_R_CRYPTO_LIB);
|
|
goto err;
|
|
}
|
|
return ret;
|
|
err:
|
|
if (ret != NULL) {
|
|
OPENSSL_free(ret->propq);
|
|
CRYPTO_THREAD_lock_free(ret->lock);
|
|
}
|
|
OPENSSL_free(ret);
|
|
return NULL;
|
|
}
|
|
|
|
void ossl_ecx_key_free(ECX_KEY *key)
|
|
{
|
|
int i;
|
|
|
|
if (key == NULL)
|
|
return;
|
|
|
|
CRYPTO_DOWN_REF(&key->references, &i, key->lock);
|
|
REF_PRINT_COUNT("ECX_KEY", key);
|
|
if (i > 0)
|
|
return;
|
|
REF_ASSERT_ISNT(i < 0);
|
|
|
|
OPENSSL_free(key->propq);
|
|
OPENSSL_secure_clear_free(key->privkey, key->keylen);
|
|
CRYPTO_THREAD_lock_free(key->lock);
|
|
OPENSSL_free(key);
|
|
}
|
|
|
|
void ossl_ecx_key_set0_libctx(ECX_KEY *key, OSSL_LIB_CTX *libctx)
|
|
{
|
|
key->libctx = libctx;
|
|
}
|
|
|
|
int ossl_ecx_key_up_ref(ECX_KEY *key)
|
|
{
|
|
int i;
|
|
|
|
if (CRYPTO_UP_REF(&key->references, &i, key->lock) <= 0)
|
|
return 0;
|
|
|
|
REF_PRINT_COUNT("ECX_KEY", key);
|
|
REF_ASSERT_ISNT(i < 2);
|
|
return ((i > 1) ? 1 : 0);
|
|
}
|
|
|
|
unsigned char *ossl_ecx_key_allocate_privkey(ECX_KEY *key)
|
|
{
|
|
key->privkey = OPENSSL_secure_zalloc(key->keylen);
|
|
|
|
return key->privkey;
|
|
}
|
|
|
|
int ossl_ecx_compute_key(ECX_KEY *peer, ECX_KEY *priv, size_t keylen,
|
|
unsigned char *secret, size_t *secretlen, size_t outlen)
|
|
{
|
|
if (priv == NULL
|
|
|| priv->privkey == NULL
|
|
|| peer == NULL) {
|
|
ERR_raise(ERR_LIB_PROV, PROV_R_MISSING_KEY);
|
|
return 0;
|
|
}
|
|
|
|
if (!ossl_assert(keylen == X25519_KEYLEN
|
|
|| keylen == X448_KEYLEN)) {
|
|
ERR_raise(ERR_LIB_PROV, PROV_R_INVALID_KEY_LENGTH);
|
|
return 0;
|
|
}
|
|
|
|
if (secret == NULL) {
|
|
*secretlen = keylen;
|
|
return 1;
|
|
}
|
|
if (outlen < keylen) {
|
|
ERR_raise(ERR_LIB_PROV, PROV_R_OUTPUT_BUFFER_TOO_SMALL);
|
|
return 0;
|
|
}
|
|
|
|
if (keylen == X25519_KEYLEN) {
|
|
#ifdef S390X_EC_ASM
|
|
if (OPENSSL_s390xcap_P.pcc[1]
|
|
& S390X_CAPBIT(S390X_SCALAR_MULTIPLY_X25519)) {
|
|
if (s390x_x25519_mul(secret, peer->pubkey, priv->privkey) == 0) {
|
|
ERR_raise(ERR_LIB_PROV, PROV_R_FAILED_DURING_DERIVATION);
|
|
return 0;
|
|
}
|
|
} else
|
|
#endif
|
|
if (ossl_x25519(secret, priv->privkey, peer->pubkey) == 0) {
|
|
ERR_raise(ERR_LIB_PROV, PROV_R_FAILED_DURING_DERIVATION);
|
|
return 0;
|
|
}
|
|
} else {
|
|
#ifdef S390X_EC_ASM
|
|
if (OPENSSL_s390xcap_P.pcc[1]
|
|
& S390X_CAPBIT(S390X_SCALAR_MULTIPLY_X448)) {
|
|
if (s390x_x448_mul(secret, peer->pubkey, priv->privkey) == 0) {
|
|
ERR_raise(ERR_LIB_PROV, PROV_R_FAILED_DURING_DERIVATION);
|
|
return 0;
|
|
}
|
|
} else
|
|
#endif
|
|
if (ossl_x448(secret, priv->privkey, peer->pubkey) == 0) {
|
|
ERR_raise(ERR_LIB_PROV, PROV_R_FAILED_DURING_DERIVATION);
|
|
return 0;
|
|
}
|
|
}
|
|
*secretlen = keylen;
|
|
return 1;
|
|
}
|