#include "gost_lcl.h"
/* Implementation of CryptoPro VKO 34.10-2001/2012 algorithm */
-static int VKO_compute_key(unsigned char *shared_key, size_t shared_key_size,
- const EC_POINT *pub_key, EC_KEY *priv_key,
- const unsigned char *ukm, size_t ukm_size,
- int vko_dgst_nid)
+int VKO_compute_key(unsigned char *shared_key,
+ const EC_POINT *pub_key, const EC_KEY *priv_key,
+ const unsigned char *ukm, const size_t ukm_size,
+ const int vko_dgst_nid)
{
unsigned char *databuf = NULL;
- BIGNUM *UKM = NULL, *p = NULL, *order = NULL, *X = NULL, *Y = NULL;
+ BIGNUM *UKM = NULL, *p = NULL, *order = NULL, *X = NULL, *Y = NULL, *cofactor = NULL;
const BIGNUM *key = EC_KEY_get0_private_key(priv_key);
EC_POINT *pnt = EC_POINT_new(EC_KEY_get0_group(priv_key));
BN_CTX *ctx = BN_CTX_new();
UKM = hashsum2bn(ukm, ukm_size);
p = BN_CTX_get(ctx);
order = BN_CTX_get(ctx);
+ cofactor = BN_CTX_get(ctx);
X = BN_CTX_get(ctx);
Y = BN_CTX_get(ctx);
EC_GROUP_get_order(EC_KEY_get0_group(priv_key), order, ctx);
+ EC_GROUP_get_cofactor(EC_KEY_get0_group(priv_key), cofactor, ctx);
+ BN_mod_mul(UKM, UKM, cofactor, order, ctx);
BN_mod_mul(p, key, UKM, order, ctx);
if (!EC_POINT_mul(EC_KEY_get0_group(priv_key), pnt, NULL, pub_key, p, ctx)) {
GOSTerr(GOST_F_VKO_COMPUTE_KEY, GOST_R_ERROR_POINT_MUL);
goto err;
}
- EC_POINT_get_affine_coordinates_GFp(EC_KEY_get0_group(priv_key),
- pnt, X, Y, ctx);
+ if (!EC_POINT_get_affine_coordinates(EC_KEY_get0_group(priv_key),
+ pnt, X, Y, ctx)) {
+ GOSTerr(GOST_F_VKO_COMPUTE_KEY, ERR_R_EC_LIB);
+ goto err;
+ }
half_len = BN_num_bytes(order);
buf_len = 2 * half_len;
* keyout expected to be 64 bytes
* */
static int gost_keg(const unsigned char *ukm_source, int pkey_nid,
- const EC_POINT *pub_key, EC_KEY *priv_key,
+ const EC_POINT *pub_key, const EC_KEY *priv_key,
unsigned char *keyout)
{
/* Adjust UKM */
unsigned char real_ukm[16];
- size_t keylen;
+ size_t keylen = 0;
memset(real_ukm, 0, 16);
if (memcmp(ukm_source, real_ukm, 16) == 0)
real_ukm[15] = 1;
- else
+ else {
memcpy(real_ukm, ukm_source, 16);
+ BUF_reverse(real_ukm, NULL, 16);
+ }
switch (pkey_nid) {
case NID_id_GostR3410_2012_512:
keylen =
- VKO_compute_key(keyout, 64, pub_key, priv_key, real_ukm, 16,
+ VKO_compute_key(keyout, pub_key, priv_key, real_ukm, 16,
NID_id_GostR3411_2012_512);
return (keylen) ? keylen : 0;
break;
{
unsigned char tmpkey[32];
keylen =
- VKO_compute_key(tmpkey, 32, pub_key, priv_key, real_ukm, 16,
- NID_id_GostR3411_2012_256);
+ VKO_compute_key(tmpkey, pub_key, priv_key, real_ukm, 16,
+ NID_id_GostR3411_2012_256);
if (keylen == 0)
return 0;
dgst_nid = NID_id_GostR3411_2012_256;
*keylen =
- VKO_compute_key(key, 32,
+ VKO_compute_key(key,
EC_KEY_get0_public_key(EVP_PKEY_get0(peer_key)),
(EC_KEY *)EVP_PKEY_get0(my_key),
data->shared_ukm, 8, dgst_nid);
* Implementation of GOST2001/12 key transport, cryptopro variation
*/
-int pkey_GOST_ECcp_encrypt(EVP_PKEY_CTX *pctx, unsigned char *out,
+static int pkey_GOST_ECcp_encrypt(EVP_PKEY_CTX *pctx, unsigned char *out,
size_t *out_len, const unsigned char *key,
size_t key_len)
{
EVP_PKEY *sec_key = EVP_PKEY_CTX_get0_peerkey(pctx);
if (data->shared_ukm) {
memcpy(ukm, data->shared_ukm, 8);
- } else if (out) {
-
+ } else {
if (RAND_bytes(ukm, 8) <= 0) {
GOSTerr(GOST_F_PKEY_GOST_ECCP_ENCRYPT, GOST_R_RNG_ERROR);
return 0;
}
}
+ if (!param)
+ goto err;
/* Check for private key in the peer_key of context */
if (sec_key) {
key_is_ephemeral = 0;
}
}
}
- if (!get_gost_engine_param(GOST_PARAM_CRYPT_PARAMS)
- && param == gost_cipher_list) {
- param = gost_cipher_list;
- }
if (out) {
int dgst_nid = NID_undef;
EVP_PKEY_get_default_digest_nid(pubk, &dgst_nid);
if (dgst_nid == NID_id_GostR3411_2012_512)
dgst_nid = NID_id_GostR3411_2012_256;
- if (!VKO_compute_key(shared_key, 32,
+ if (!VKO_compute_key(shared_key,
EC_KEY_get0_public_key(EVP_PKEY_get0(pubk)),
EVP_PKEY_get0(sec_key), ukm, 8, dgst_nid)) {
GOSTerr(GOST_F_PKEY_GOST_ECCP_ENCRYPT,
return -1;
}
-int pkey_gost2018_encrypt(EVP_PKEY_CTX *pctx, unsigned char *out,
+/*
+ * EVP_PKEY_METHOD callback decrypt
+ * Implementation of GOST2018 key transport
+ */
+static int pkey_gost2018_encrypt(EVP_PKEY_CTX *pctx, unsigned char *out,
size_t *out_len, const unsigned char *key,
size_t key_len)
{
int ret = 0;
int mac_nid = NID_undef;
size_t mac_len = 0;
- int exp_len = 0;
+ int exp_len = 0, iv_len = 0;
unsigned char *exp_buf = NULL;
+ int key_is_ephemeral = 0;
switch (data->cipher_nid) {
case NID_magma_ctr:
mac_nid = NID_magma_mac;
mac_len = 8;
+ iv_len = 4;
break;
case NID_grasshopper_ctr:
mac_nid = NID_grasshopper_mac;
mac_len = 16;
+ iv_len = 8;
break;
default:
GOSTerr(GOST_F_PKEY_GOST2018_ENCRYPT, GOST_R_INVALID_CIPHER);
return -1;
}
- if (out) {
- sec_key = EVP_PKEY_new();
- if (!EVP_PKEY_assign(sec_key, EVP_PKEY_base_id(pubk), EC_KEY_new())
- || !EVP_PKEY_copy_parameters(sec_key, pubk)
- || !gost_ec_keygen(EVP_PKEY_get0(sec_key))) {
- GOSTerr(GOST_F_PKEY_GOST2018_ENCRYPT,
- GOST_R_ERROR_COMPUTING_SHARED_KEY);
- goto err;
- }
+ sec_key = EVP_PKEY_CTX_get0_peerkey(pctx);
+ if (!sec_key)
+ {
+ sec_key = EVP_PKEY_new();
+ if (sec_key == NULL) {
+ GOSTerr(GOST_F_PKEY_GOST2018_ENCRYPT, ERR_R_MALLOC_FAILURE );
+ goto err;
+ }
+
+ if (!EVP_PKEY_assign(sec_key, EVP_PKEY_base_id(pubk), EC_KEY_new())
+ || !EVP_PKEY_copy_parameters(sec_key, pubk)
+ || !gost_ec_keygen(EVP_PKEY_get0(sec_key))) {
+ GOSTerr(GOST_F_PKEY_GOST2018_ENCRYPT,
+ GOST_R_ERROR_COMPUTING_SHARED_KEY);
+ goto err;
+ }
+ key_is_ephemeral = 1;
}
- ret =
- gost_keg(data->shared_ukm, pkey_nid,
+
+ if (gost_keg(data->shared_ukm, pkey_nid,
EC_KEY_get0_public_key(EVP_PKEY_get0(pubk)),
- EVP_PKEY_get0(sec_key), expkeys);
- if (ret <= 0) {
+ EVP_PKEY_get0(sec_key), expkeys) <= 0) {
GOSTerr(GOST_F_PKEY_GOST2018_ENCRYPT,
GOST_R_ERROR_COMPUTING_EXPORT_KEYS);
goto err;
}
- ret = gost_kexp15(key, key_len, data->cipher_nid, expkeys + 32,
- mac_nid, expkeys + 0, data->shared_ukm + 24, 4, exp_buf,
- &exp_len);
- if (ret <= 0) {
+ if (gost_kexp15(key, key_len, data->cipher_nid, expkeys + 32,
+ mac_nid, expkeys + 0, data->shared_ukm + 24, iv_len,
+ exp_buf, &exp_len) <= 0) {
GOSTerr(GOST_F_PKEY_GOST2018_ENCRYPT, GOST_R_CANNOT_PACK_EPHEMERAL_KEY);
goto err;
}
goto err;
}
- EVP_PKEY_free(sec_key);
-
if ((*out_len = i2d_PSKeyTransport_gost(pst, out ? &out : NULL)) > 0)
ret = 1;
err:
+ if (key_is_ephemeral)
+ EVP_PKEY_free(sec_key);
+
PSKeyTransport_gost_free(pst);
OPENSSL_free(exp_buf);
return ret;
}
+int pkey_gost_encrypt(EVP_PKEY_CTX *pctx, unsigned char *out,
+ size_t *out_len, const unsigned char *key, size_t key_len)
+{
+ struct gost_pmeth_data *data = EVP_PKEY_CTX_get_data(pctx);
+ if (data->shared_ukm == NULL || data->shared_ukm_size == 8)
+ return pkey_GOST_ECcp_encrypt(pctx, out, out_len, key, key_len);
+ else if (data->shared_ukm_size == 32)
+ return pkey_gost2018_encrypt(pctx, out, out_len, key, key_len);
+ else {
+ GOSTerr(GOST_F_PKEY_GOST_ENCRYPT, ERR_R_INTERNAL_ERROR);
+ return -1;
+ }
+}
+
/*
* EVP_PKEY_METHOD callback decrypt
- * Implementation of GOST2001 key transport, cryptopro variation
+ * Implementation of GOST2001/12 key transport, cryptopro variation
*/
-int pkey_GOST_ECcp_decrypt(EVP_PKEY_CTX *pctx, unsigned char *key,
+static int pkey_GOST_ECcp_decrypt(EVP_PKEY_CTX *pctx, unsigned char *key,
size_t *key_len, const unsigned char *in,
size_t in_len)
{
if (dgst_nid == NID_id_GostR3411_2012_512)
dgst_nid = NID_id_GostR3411_2012_256;
- if (!VKO_compute_key(sharedKey, 32,
+ if (!VKO_compute_key(sharedKey,
EC_KEY_get0_public_key(EVP_PKEY_get0(peerkey)),
EVP_PKEY_get0(priv), wrappedKey, 8, dgst_nid)) {
GOSTerr(GOST_F_PKEY_GOST_ECCP_DECRYPT,
GOST_KEY_TRANSPORT_free(gkt);
return ret;
}
+
+/*
+ * EVP_PKEY_METHOD callback decrypt
+ * Implementation of GOST2018 key transport
+ */
+static int pkey_gost2018_decrypt(EVP_PKEY_CTX *pctx, unsigned char *key,
+ size_t *key_len, const unsigned char *in,
+ size_t in_len)
+{
+ const unsigned char *p = in;
+ struct gost_pmeth_data *data = EVP_PKEY_CTX_get_data(pctx);
+ EVP_PKEY *priv = EVP_PKEY_CTX_get0_pkey(pctx);
+ PSKeyTransport_gost *pst = NULL;
+ int ret = 0;
+ unsigned char expkeys[64];
+ EVP_PKEY *eph_key = NULL;
+ int pkey_nid = EVP_PKEY_base_id(priv);
+ int mac_nid = NID_undef;
+ int iv_len = 0;
+
+ switch (data->cipher_nid) {
+ case NID_magma_ctr:
+ mac_nid = NID_magma_mac;
+ iv_len = 4;
+ break;
+ case NID_grasshopper_ctr:
+ mac_nid = NID_grasshopper_mac;
+ iv_len = 8;
+ break;
+ default:
+ GOSTerr(GOST_F_PKEY_GOST2018_DECRYPT, GOST_R_INVALID_CIPHER);
+ return -1;
+ break;
+ }
+ if (!key) {
+ *key_len = 32;
+ return 1;
+ }
+
+ pst = d2i_PSKeyTransport_gost(NULL, (const unsigned char **)&p, in_len);
+ if (!pst) {
+ GOSTerr(GOST_F_PKEY_GOST2018_DECRYPT,
+ GOST_R_ERROR_PARSING_KEY_TRANSPORT_INFO);
+ return -1;
+ }
+
+ eph_key = X509_PUBKEY_get(pst->ephem_key);
+/*
+ * TODO beldmit
+ 1. Checks the next three conditions fulfilling and terminates the
+ connection with fatal error if not.
+
+ o Q_eph is on the same curve as server public key;
+
+ o Q_eph is not equal to zero point;
+
+ o q * Q_eph is not equal to zero point.
+*/
+ if (gost_keg(data->shared_ukm, pkey_nid,
+ EC_KEY_get0_public_key(EVP_PKEY_get0(eph_key)),
+ EVP_PKEY_get0(priv), expkeys) <= 0) {
+ GOSTerr(GOST_F_PKEY_GOST2018_DECRYPT,
+ GOST_R_ERROR_COMPUTING_EXPORT_KEYS);
+ goto err;
+ }
+
+ if (gost_kimp15(ASN1_STRING_get0_data(pst->psexp),
+ ASN1_STRING_length(pst->psexp), data->cipher_nid,
+ expkeys + 32, mac_nid, expkeys + 0, data->shared_ukm + 24,
+ iv_len, key) <= 0) {
+ GOSTerr(GOST_F_PKEY_GOST2018_DECRYPT, GOST_R_CANNOT_UNPACK_EPHEMERAL_KEY);
+ goto err;
+ }
+
+ ret = 1;
+ err:
+ EVP_PKEY_free(eph_key);
+ PSKeyTransport_gost_free(pst);
+ return ret;
+}
+
+int pkey_gost_decrypt(EVP_PKEY_CTX *pctx, unsigned char *key,
+ size_t *key_len, const unsigned char *in, size_t in_len)
+{
+ struct gost_pmeth_data *data = EVP_PKEY_CTX_get_data(pctx);
+ if (data->shared_ukm == NULL || data->shared_ukm_size == 8)
+ return pkey_GOST_ECcp_decrypt(pctx, key, key_len, in, in_len);
+ else if (data->shared_ukm_size == 32)
+ return pkey_gost2018_decrypt(pctx, key, key_len, in, in_len);
+ else {
+ GOSTerr(GOST_F_PKEY_GOST_DECRYPT, ERR_R_INTERNAL_ERROR);
+ return -1;
+ }
+}
projects / openssl-gost / engine.git / blobdiff