Skip to content

Fix sm4 cbc decrypt failed when in and out buf address is same. Fix load sm2 private key failed. #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lynchen wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix sm4 cbc decrypt failed when in and out buf address is same. Fix load sm2 private key failed. #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
40eefd8
Fix sm4 cbc decrypt failed when in and out buf address is same.
Jul 27, 2019
214cb34
Fix load sm2 private key failed.
Jul 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/libcharon/plugins/vici/vici_cred.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,10 @@ CALLBACK(load_key, vici_message_t*,
{
type = KEY_BLISS;
}
else if (strcaseeq(str, "sm2"))
{
type = KEY_SM2;
}
else
{
return create_reply("invalid key type: %s", str);
Expand Down
30 changes: 23 additions & 7 deletions src/libstrongswan/plugins/gmalg/gmalg/sm4.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,17 +257,17 @@ void sm4_cbc_encrypt(sm4_ctx *ctx, u8 *key, u8 *iv, u8 *in, u8 len, u8 *out)
#if DEBUG
printf(" function: %s , line= %d \n", __FUNCTION__, __LINE__);
#endif
u8 temp[16];
int i;

sm4_set_key(ctx, key, 16);
memcpy(temp, iv, 16 );
while(len > 0)
{
for(i = 0; i < 16; i++)
out[i] = (u8)(in[i] ^ temp[i]);
{
out[i] = (u8)(in[i] ^ iv[i]);
}
sm4_one_round(ctx->sk_enc, out, out);
memcpy(temp, out, 16);
iv = out;
in += 16;
out += 16;
len -= 16;
Expand All @@ -280,18 +280,34 @@ void sm4_cbc_decrypt(sm4_ctx *ctx, u8 *key, u8 *iv, u8 *in, u8 len, u8 *out)
printf(" function: %s , line= %d \n", __FUNCTION__, __LINE__);
#endif
u8 temp[16];
u8 temp_iv[16];
int i;

sm4_set_key(ctx, key, 16);
memcpy(temp, iv, 16 );

while(len > 0)
{
if(in == out)
{
memcpy(temp, in, 16); /* /if in and out are same buf, bakup in as next iv. */
}
sm4_one_round(ctx->sk_dec, in, out);
for(i = 0; i < 16; i++)
out[i] = (u8)(out[i] ^ temp[i] );
memcpy(temp, in, 16);
{
out[i] = (u8)(out[i] ^ iv[i]);
}
if(in == out)
{
memcpy(temp_iv, temp, 16);
iv = temp_iv;
}
else
{
iv = in;
}
in += 16;
out += 16;
len -= 16;
}

}
4 changes: 4 additions & 0 deletions src/swanctl/commands/load_creds.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,9 @@ static bool load_key_anytype(load_ctx_t *ctx, char *path,
case KEY_BLISS:
loaded = load_key(ctx, path, "bliss", encoding);
break;
case KEY_SM2:
loaded = load_key(ctx, path, "sm2", encoding);
break;
default:
fprintf(stderr, "unsupported key type in '%s'\n", path);
break;
Expand Down Expand Up @@ -278,6 +281,7 @@ static bool determine_credtype(char *type, credential_type_t *credtype,
{ "ecdsa", CRED_PRIVATE_KEY, KEY_ECDSA, },
{ "bliss", CRED_PRIVATE_KEY, KEY_BLISS, },
{ "pkcs12", CRED_CONTAINER, CONTAINER_PKCS12, },
{ "sm2", CRED_PRIVATE_KEY, KEY_SM2, },
};
int i;

Expand Down