eosswedenorg/libantelope
1
0
Fork 0
mirror of https://github.com/eosswedenorg/libantelope synced 2026-07-03 23:13:40 +02:00
Code Releases Activity

src/openssl/ec.cpp: make calculate_pubkey() output an EC_POINT instead of encoding to binary, also pass group as a parameter.

Browse source
This commit is contained in:
Henrik Hautakoski 2023-03-22 14:03:03 +01:00
parent 7ead6f6bde
commit b1da6552f7
1 changed files with 22 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

41
src/openssl/ec.cpp
View file

@ -78,16 +78,8 @@ int ec_generate_privkey(ec_privkey_t *priv) {
} }
// Calcualte a public key from a EC_KEY object. // Calcualte a public key from a EC_KEY object.
int calculate_pubkey(EC_KEY *ec_key, ec_pubkey_t *pub) { int calculate_pubkey(const EC_GROUP *group, const EC_KEY *ec_key, EC_POINT **point) {
const BIGNUM* pk; const BIGNUM* pk;
const EC_GROUP *group;
EC_POINT *point;
int rc;
// Get the curve (group) number first.
if ((group = EC_KEY_get0_group(ec_key)) == NULL) {
return 0;
}
// Then get the private key number // Then get the private key number
if ((pk = EC_KEY_get0_private_key(ec_key)) == NULL) { if ((pk = EC_KEY_get0_private_key(ec_key)) == NULL) {
@ -95,29 +87,40 @@ int calculate_pubkey(EC_KEY *ec_key, ec_pubkey_t *pub) {
} }
// Create a new point. // Create a new point.
if ((point = EC_POINT_new(group)) == NULL) { if ((*point = EC_POINT_new(group)) == NULL) {
return 0; return 0;
} }
// Multiply curve (group) and private key to get the public key. // Multiply curve (group) and private key to get the public key.
rc = EC_POINT_mul(group, point, pk, NULL, NULL, ctx); return EC_POINT_mul(group, *point, pk, NULL, NULL, NULL);
if (rc != 0) {
// Encode public key
rc = EC_POINT_encode(group, point, pub->data(), EC_PUBKEY_SIZE, ctx);
}
EC_POINT_free(point);
return rc;
} }
int ec_get_publickey(const ec_privkey_t *priv, ec_pubkey_t* pub) { int ec_get_publickey(const ec_privkey_t *priv, ec_pubkey_t* pub) {
int rc = -1;
const EC_GROUP *group;
EC_POINT *point;
// Load private key // Load private key
if (EC_KEY_oct2priv(k, priv->data(), EC_PRIVKEY_SIZE) == 0) { if (EC_KEY_oct2priv(k, priv->data(), EC_PRIVKEY_SIZE) == 0) {
return -1; return -1;
} }
return calculate_pubkey(k, pub) == 0 ? -1 : 0; if ((group = EC_KEY_get0_group(k)) == NULL) {
return -1;
}
if (calculate_pubkey(group, k, &point) == 0) {
return -1;
}
// Encode public key
if (EC_POINT_encode(group, point, pub->data(), EC_PUBKEY_SIZE, ctx) != 0) {
rc = 0;
}
EC_POINT_free(point);
return rc;
} }
int ec_generate_key(struct ec_keypair *pair) { int ec_generate_key(struct ec_keypair *pair) {