/* 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, int dgst_nid)
+ const unsigned char *ukm, size_t ukm_size,
+ int vko_dgst_nid)
{
unsigned char *databuf = NULL;
BIGNUM *UKM = NULL, *p = NULL, *order = NULL, *X = NULL, *Y = NULL;
BN_CTX *ctx = BN_CTX_new();
EVP_MD_CTX *mdctx = NULL;
const EVP_MD *md = NULL;
- int effective_dgst_nid = (dgst_nid == NID_id_GostR3411_2012_512) ?
- NID_id_GostR3411_2012_256 : dgst_nid;
- int buf_len = (dgst_nid == NID_id_GostR3411_2012_512) ? 128 : 64,
- half_len = buf_len >> 1;
- int ret = 0;
+ int buf_len, half_len;
+ int ret = 0;
if (!ctx) {
GOSTerr(GOST_F_VKO_COMPUTE_KEY, ERR_R_MALLOC_FAILURE);
}
BN_CTX_start(ctx);
- databuf = OPENSSL_zalloc(buf_len);
- if (!databuf) {
- GOSTerr(GOST_F_VKO_COMPUTE_KEY, ERR_R_MALLOC_FAILURE);
- goto err;
- }
-
- md = EVP_get_digestbynid(effective_dgst_nid);
+ md = EVP_get_digestbynid(vko_dgst_nid);
if (!md) {
GOSTerr(GOST_F_VKO_COMPUTE_KEY, GOST_R_INVALID_DIGEST_TYPE);
goto err;
}
- UKM = hashsum2bn(ukm, 8);
+ UKM = hashsum2bn(ukm, ukm_size);
p = BN_CTX_get(ctx);
order = 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);
BN_mod_mul(p, key, UKM, order, ctx);
- if (!EC_POINT_mul
- (EC_KEY_get0_group(priv_key), pnt, NULL, pub_key, p, 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);
+
+ half_len = BN_num_bytes(order);
+ buf_len = 2 * half_len;
+ databuf = OPENSSL_zalloc(buf_len);
+ if (!databuf) {
+ GOSTerr(GOST_F_VKO_COMPUTE_KEY, ERR_R_MALLOC_FAILURE);
+ goto err;
+ }
+
/*
* Serialize elliptic curve point same way as we do it when saving key
*/
store_bignum(Y, databuf, half_len);
store_bignum(X, databuf + half_len, half_len);
/* And reverse byte order of whole buffer */
- BUF_reverse(databuf, NULL, buf_len);
+ BUF_reverse(databuf, NULL, buf_len);
mdctx = EVP_MD_CTX_new();
if (!mdctx) {
EVP_DigestInit_ex(mdctx, md, NULL);
EVP_DigestUpdate(mdctx, databuf, buf_len);
EVP_DigestFinal_ex(mdctx, shared_key, NULL);
- ret = 32;
+ ret = (EVP_MD_size(md) > 0) ? EVP_MD_size(md) : 0;
err:
BN_free(UKM);
return ret;
}
+/*
+ * 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,
+ unsigned char *keyout)
+{
+/* Adjust UKM */
+ unsigned char real_ukm[16];
+ size_t keylen;
+
+ memset(real_ukm, 0, 16);
+ if (memcmp(ukm_source, real_ukm, 16) == 0)
+ real_ukm[15] = 1;
+ else
+ memcpy(real_ukm, ukm_source, 16);
+
+ switch (pkey_nid) {
+ case NID_id_GostR3410_2012_512:
+ keylen =
+ VKO_compute_key(keyout, 64, pub_key, priv_key, real_ukm, 16,
+ NID_id_GostR3411_2012_512);
+ return (keylen) ? keylen : 0;
+ break;
+
+ case NID_id_GostR3410_2012_256:
+ {
+ unsigned char tmpkey[32];
+ keylen =
+ VKO_compute_key(tmpkey, 32, pub_key, priv_key, real_ukm, 16,
+ NID_id_GostR3411_2012_256);
+
+ if (keylen == 0)
+ return 0;
+
+ if (gost_kdftree2012_256
+ (keyout, 64, tmpkey, 32, (const unsigned char *)"kdf tree", 8,
+ ukm_source + 16, 8, 1) > 0)
+ keylen = 64;
+ else
+ keylen = 0;
+
+ OPENSSL_cleanse(tmpkey, 32);
+ return (keylen) ? keylen : 0;
+ break;
+ }
+ default:
+ return 0;
+ }
+}
+
/*
* EVP_PKEY_METHOD callback derive.
* Implements VKO R 34.10-2001/2012 algorithms
GOSTerr(GOST_F_PKEY_GOST_EC_DERIVE, GOST_R_UKM_NOT_SET);
return 0;
}
+ /*
+ * shared_ukm_size = 8 stands for pre-2018 cipher suites
+ * It means 32 bytes of key length, 8 byte UKM, 32-bytes hash
+ *
+ * shared_ukm_size = 32 stands for pre-2018 cipher suites
+ * It means 64 bytes of shared_key, 16 bytes of UKM and either
+ * 64 bytes of hash or 64 bytes of TLSTREE output
+ * */
- if (key == NULL) {
- *keylen = 32;
- return 1;
- }
+ switch (data->shared_ukm_size) {
+ case 8:
+ {
+ if (key == NULL) {
+ *keylen = 32;
+ return 1;
+ }
- EVP_PKEY_get_default_digest_nid(my_key, &dgst_nid);
+ EVP_PKEY_get_default_digest_nid(my_key, &dgst_nid);
+ if (dgst_nid == NID_id_GostR3411_2012_512)
+ dgst_nid = NID_id_GostR3411_2012_256;
- *keylen =
- VKO_compute_key(key, 32,
- EC_KEY_get0_public_key(EVP_PKEY_get0(peer_key)),
- (EC_KEY *)EVP_PKEY_get0(my_key), data->shared_ukm,
- dgst_nid);
- return (*keylen) ? 1 : 0;
+ *keylen =
+ VKO_compute_key(key, 32,
+ EC_KEY_get0_public_key(EVP_PKEY_get0(peer_key)),
+ (EC_KEY *)EVP_PKEY_get0(my_key),
+ data->shared_ukm, 8, dgst_nid);
+ return (*keylen) ? 1 : 0;
+ }
+ break;
+ case 32:
+ {
+ if (key == NULL) {
+ *keylen = 64;
+ return 1;
+ }
+
+ *keylen = gost_keg(data->shared_ukm, EVP_PKEY_id(my_key),
+ EC_KEY_get0_public_key(EVP_PKEY_get0(peer_key)),
+ (EC_KEY *)EVP_PKEY_get0(my_key), key);
+ return (*keylen) ? 1 : 0;
+ }
+
+ break;
+ default:
+ return 0;
+ }
}
/*
/*
* EVP_PKEY_METHOD callback encrypt
- * Implementation of GOST2001 key transport, cryptopo variation
+ * Implementation of GOST2001/12 key transport, cryptopro variation
*/
int pkey_GOST_ECcp_encrypt(EVP_PKEY_CTX *pctx, unsigned char *out,
key_is_ephemeral = 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_GOST_ECCP_ENCRYPT,
- GOST_R_ERROR_COMPUTING_SHARED_KEY);
+ 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_GOST_ECCP_ENCRYPT,
+ GOST_R_ERROR_COMPUTING_SHARED_KEY);
goto err;
}
}
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,
EC_KEY_get0_public_key(EVP_PKEY_get0(pubk)),
- EVP_PKEY_get0(sec_key), ukm, dgst_nid)) {
+ EVP_PKEY_get0(sec_key), ukm, 8, dgst_nid)) {
GOSTerr(GOST_F_PKEY_GOST_ECCP_ENCRYPT,
GOST_R_ERROR_COMPUTING_SHARED_KEY);
goto err;
return -1;
}
+int pkey_gost2018_encrypt(EVP_PKEY_CTX *pctx, unsigned char *out,
+ size_t *out_len, const unsigned char *key,
+ size_t key_len)
+{
+ PSKeyTransport_gost *pst = NULL;
+ EVP_PKEY *pubk = EVP_PKEY_CTX_get0_pkey(pctx);
+ struct gost_pmeth_data *data = EVP_PKEY_CTX_get_data(pctx);
+ int pkey_nid = EVP_PKEY_base_id(pubk);
+ unsigned char expkeys[64];
+ EVP_PKEY *sec_key = NULL;
+ int ret = 0;
+ int mac_nid = NID_undef;
+ size_t mac_len = 0;
+ int exp_len = 0;
+ unsigned char *exp_buf = NULL;
+
+ switch (data->cipher_nid) {
+ case NID_magma_ctr:
+ mac_nid = NID_magma_mac;
+ mac_len = 8;
+ break;
+ case NID_grasshopper_ctr:
+ mac_nid = NID_grasshopper_mac;
+ mac_len = 16;
+ break;
+ default:
+ GOSTerr(GOST_F_PKEY_GOST2018_ENCRYPT, GOST_R_INVALID_CIPHER);
+ return -1;
+ break;
+ }
+ exp_len = key_len + mac_len;
+ exp_buf = OPENSSL_malloc(exp_len);
+ if (!exp_buf) {
+ GOSTerr(GOST_F_PKEY_GOST2018_ENCRYPT, ERR_R_MALLOC_FAILURE);
+ 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;
+ }
+ }
+ ret =
+ 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) {
+ 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) {
+ GOSTerr(GOST_F_PKEY_GOST2018_ENCRYPT, GOST_R_CANNOT_PACK_EPHEMERAL_KEY);
+ goto err;
+ }
+
+ pst = PSKeyTransport_gost_new();
+ if (!pst) {
+ GOSTerr(GOST_F_PKEY_GOST2018_ENCRYPT, ERR_R_MALLOC_FAILURE);
+ goto err;
+ }
+
+ if (!ASN1_OCTET_STRING_set(pst->psexp, exp_buf, exp_len)) {
+ GOSTerr(GOST_F_PKEY_GOST2018_ENCRYPT, ERR_R_MALLOC_FAILURE);
+ goto err;
+ }
+
+ if (!X509_PUBKEY_set(&pst->ephem_key, out ? sec_key : pubk)) {
+ GOSTerr(GOST_F_PKEY_GOST2018_ENCRYPT, GOST_R_CANNOT_PACK_EPHEMERAL_KEY);
+ goto err;
+ }
+
+ EVP_PKEY_free(sec_key);
+
+ if ((*out_len = i2d_PSKeyTransport_gost(pst, out ? &out : NULL)) > 0)
+ ret = 1;
+ err:
+ PSKeyTransport_gost_free(pst);
+ OPENSSL_free(exp_buf);
+ return ret;
+}
+
/*
* EVP_PKEY_METHOD callback decrypt
- * Implementation of GOST2001 key transport, cryptopo variation
+ * Implementation of GOST2001 key transport, cryptopro variation
*/
int pkey_GOST_ECcp_decrypt(EVP_PKEY_CTX *pctx, unsigned char *key,
size_t *key_len, const unsigned char *in,
memcpy(wrappedKey + 40, gkt->key_info->imit->data, 4);
EVP_PKEY_get_default_digest_nid(priv, &dgst_nid);
+ if (dgst_nid == NID_id_GostR3411_2012_512)
+ dgst_nid = NID_id_GostR3411_2012_256;
+
if (!VKO_compute_key(sharedKey, 32,
EC_KEY_get0_public_key(EVP_PKEY_get0(peerkey)),
- EVP_PKEY_get0(priv), wrappedKey, dgst_nid)) {
+ EVP_PKEY_get0(priv), wrappedKey, 8, dgst_nid)) {
GOSTerr(GOST_F_PKEY_GOST_ECCP_DECRYPT,
GOST_R_ERROR_COMPUTING_SHARED_KEY);
goto err;