diff options
| author | Vsevolod Stakhov <vsevolod@rspamd.com> | 2023-06-12 12:23:15 +0100 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@rspamd.com> | 2023-06-12 12:23:15 +0100 |
| commit | 639abbadd8c08352210ef99e162013e77b784ec9 (patch) | |
| tree | 3bee23920d6d61742c99e918bea43dc858ad43c5 /src/libcryptobox | |
| parent | 6facd3641c1fb9ba2947a45e20fe70bd9564c61c (diff) | |
| download | rspamd-639abbadd8c08352210ef99e162013e77b784ec9.tar.gz rspamd-639abbadd8c08352210ef99e162013e77b784ec9.zip | |
[Minor] Fix another usage of EC_POINT_point2bn
Diffstat (limited to 'src/libcryptobox')
| -rw-r--r-- | src/libcryptobox/cryptobox.c | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/src/libcryptobox/cryptobox.c b/src/libcryptobox/cryptobox.c index 87c50797a..aa79f875d 100644 --- a/src/libcryptobox/cryptobox.c +++ b/src/libcryptobox/cryptobox.c @@ -391,9 +391,8 @@ rspamd_cryptobox_keypair_sig (rspamd_sig_pk_t pk, rspamd_sig_sk_t sk, #else EC_KEY *ec_sec; const BIGNUM *bn_sec; - BIGNUM *bn_pub; const EC_POINT *ec_pub; - gint len; + gsize len; ec_sec = EC_KEY_new_by_curve_name (CRYPTOBOX_CURVE_NID); g_assert (ec_sec != NULL); @@ -403,16 +402,27 @@ rspamd_cryptobox_keypair_sig (rspamd_sig_pk_t pk, rspamd_sig_sk_t sk, g_assert (bn_sec != NULL); ec_pub = EC_KEY_get0_public_key (ec_sec); g_assert (ec_pub != NULL); + +#if OPENSSL_VERSION_MAJOR >= 3 + unsigned char *buf = NULL; /* Thanks openssl for this API (no) */ + len = EC_POINT_point2buf (EC_KEY_get0_group (ec_sec), ec_pub, + POINT_CONVERSION_UNCOMPRESSED, &buf, NULL); + g_assert (len <= (gint)rspamd_cryptobox_pk_bytes (mode)); + memcpy (pk, buf, len); + OPENSSL_free (buf); +#else + BIGNUM *bn_pub; bn_pub = EC_POINT_point2bn (EC_KEY_get0_group (ec_sec), ec_pub, POINT_CONVERSION_UNCOMPRESSED, NULL, NULL); - - len = BN_num_bytes (bn_sec); - g_assert (len <= (gint)sizeof (rspamd_sk_t)); - BN_bn2bin (bn_sec, sk); len = BN_num_bytes (bn_pub); g_assert (len <= (gint)rspamd_cryptobox_pk_bytes (mode)); BN_bn2bin (bn_pub, pk); BN_free (bn_pub); +#endif + + len = BN_num_bytes (bn_sec); + g_assert (len <= (gint)sizeof (rspamd_sk_t)); + BN_bn2bin (bn_sec, sk); EC_KEY_free (ec_sec); #endif } |