0xC0, 0x86, 0xDC, 0xC2, 0xEF, 0x4C, 0xA9, 0x2B
};
+const byte ACPKM_D_const[] = {
+ 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87,
+ 0x88, 0x89, 0x8A, 0x8B, 0x8C, 0x8D, 0x8E, 0x8F,
+ 0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97,
+ 0x98, 0x99, 0x9A, 0x9B, 0x9C, 0x9D, 0x9E, 0x9F,
+};
+
/* Initialization of gost_ctx subst blocks*/
-static void kboxinit(gost_ctx * c, const gost_subst_block * b)
+void kboxinit(gost_ctx * c, const gost_subst_block * b)
{
int i;
gostcrypt(c, inblock, outblock);
}
-/* Set 256 bit key into context */
+/* Set 256 bit gost89 key into context */
void gost_key(gost_ctx * c, const byte * k)
{
int i, j;
}
}
-/* Set 256 bit key into context */
+/* Set 256 bit Magma key into context */
void magma_key(gost_ctx * c, const byte * k)
{
int i, j;
- for (i = 7, j = 0; i >= 0; i--, j += 4) {
+ for (i = 0, j = 0; i < 8; i++, j += 4) {
c->k[i] =
- k[j] | (k[j + 1] << 8) | (k[j + 2] << 16) | ((word32) k[j + 3] <<
- 24);
+ k[j + 3] | (k[j + 2] << 8) | (k[j + 1] << 16) | ((word32) k[j] <<
+ 24);
}
}
-/* Retrieve 256-bit key from context */
+/* Retrieve 256-bit gost89 key from context */
void gost_get_key(gost_ctx * c, byte * k)
{
int i, j;
}
}
+/* Retrieve 256-bit magma key from context */
+void magma_get_key(gost_ctx * c, byte * k)
+{
+ int i, j;
+ for (i = 0, j = 0; i < 8; i++, j += 4) {
+ k[j + 3] = (byte) (c->k[i] & 0xFF);
+ k[j + 2] = (byte) ((c->k[i] >> 8) & 0xFF);
+ k[j + 1] = (byte) ((c->k[i] >> 16) & 0xFF);
+ k[j + 0] = (byte) ((c->k[i] >> 24) & 0xFF);
+ }
+}
+
/* Initalize context. Provides default value for subst_block */
void gost_init(gost_ctx * c, const gost_subst_block * b)
{
/* Implements key meshing algorithm by modifing ctx and IV in place */
void cryptopro_key_meshing(gost_ctx * ctx, unsigned char *iv)
{
- unsigned char newkey[32], newiv[8];
+ unsigned char newkey[32];
/* Set static keymeshing key */
/* "Decrypt" key with keymeshing key */
gost_dec(ctx, CryptoProKeyMeshingKey, newkey, 4);
/* set new key */
gost_key(ctx, newkey);
/* Encrypt iv with new key */
- gostcrypt(ctx, iv, newiv);
- memcpy(iv, newiv, 8);
+ if (iv != NULL ) {
+ unsigned char newiv[8];
+ gostcrypt(ctx, iv, newiv);
+ memcpy(iv, newiv, 8);
+ }
+}
+
+void acpkm_magma_key_meshing(gost_ctx * ctx)
+{
+ unsigned char newkey[32];
+ int i, j;
+ unsigned char buf[8], keybuf[8];
+
+ for (i = 0; i < 4; i++) {
+ for (j = 0; j < 8; j++) {
+ buf[j] = ACPKM_D_const[8 * i + 7 - j];
+ }
+ gostcrypt(ctx, buf, keybuf);
+ memcpy(newkey + 8 * i, keybuf + 4, 4);
+ memcpy(newkey + 8 * i + 4, keybuf, 4);
+ }
+ /* set new key */
+ gost_key(ctx, newkey);
}