mirror of
https://github.com/openssl/openssl.git
synced 2024-12-09 05:51:54 +08:00
ecd1550be9
Currently, when configuring OpenSSL using -DREF_PRINT the following
compilation error is generated:
In file included from include/crypto/ecx.h:21,
from crypto/ec/ecx_key.c:11:
crypto/ec/ecx_key.c: In function 'ecx_key_free':
crypto/ec/ecx_key.c:65:32: error: 'r' undeclared
(first use in this function)
65 | REF_PRINT_COUNT("ECX_KEY", r);
| ^
include/internal/refcount.h:169:40: note: in definition of macro
'REF_PRINT_COUNT'
169 | fprintf(stderr, "%p:%4d:%s\n", b, b->references, a)
| ^
crypto/ec/ecx_key.c:65:32: note: each undeclared identifier is reported
only once for each function it appears in
65 | REF_PRINT_COUNT("ECX_KEY", r);
| ^
include/internal/refcount.h:169:40: note: in definition of macro
'REF_PRINT_COUNT'
169 | fprintf(stderr, "%p:%4d:%s\n", b, b->references, a)
| ^
make[1]: *** [Makefile:14929: crypto/ec/libcrypto-lib-ecx_key.o] Error 1
This commit updates the argument passed in to be the ECX_KEY* key.
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/13298)
94 lines
2.1 KiB
C
94 lines
2.1 KiB
C
/*
|
|
* Copyright 2020 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 <openssl/err.h>
|
|
#include "crypto/ecx.h"
|
|
|
|
ECX_KEY *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);
|
|
ERR_raise(ERR_LIB_EC, ERR_R_MALLOC_FAILURE);
|
|
if (ret->propq == NULL)
|
|
goto err;
|
|
}
|
|
|
|
ret->lock = CRYPTO_THREAD_lock_new();
|
|
if (ret->lock == NULL)
|
|
goto err;
|
|
return ret;
|
|
err:
|
|
ERR_raise(ERR_LIB_EC, ERR_R_MALLOC_FAILURE);
|
|
OPENSSL_free(ret);
|
|
return NULL;
|
|
}
|
|
|
|
void 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);
|
|
}
|
|
|
|
int 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 *ecx_key_allocate_privkey(ECX_KEY *key)
|
|
{
|
|
key->privkey = OPENSSL_secure_zalloc(key->keylen);
|
|
|
|
return key->privkey;
|
|
}
|