abc/GmSSL
1
0
Fork 0
mirror of https://github.com/guanzhi/GmSSL.git synced 2026-08-07 21:53:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

sms4 evp bug fixes

Browse Source
This commit is contained in:
Zhi Guan
2017-12-26 22:59:02 +08:00
parent b920f5af10
commit f87ae5dba7
2 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
crypto/evp/e_sms4.c
View File

@@ -56,7 +56,6 @@
*/ */
#include <stdio.h> #include <stdio.h>
#include <openssl/evp.h> #include <openssl/evp.h>
#include <openssl/crypto.h> #include <openssl/crypto.h>
#include <openssl/objects.h> #include <openssl/objects.h>
@@ -69,22 +68,29 @@
# include <openssl/sms4.h> # include <openssl/sms4.h>
typedef struct { typedef struct {
block128_f block;
union {
cbc128_f cbc;
ctr128_f ctr;
} stream;
sms4_key_t ks; sms4_key_t ks;
} EVP_SMS4_KEY; } EVP_SMS4_KEY;
static int sms4_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, static int sms4_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
const unsigned char *iv, int enc) const unsigned char *iv, int enc)
{ {
if (!enc) { int mode;
if (EVP_CIPHER_CTX_mode(ctx) == EVP_CIPH_OFB_MODE) EVP_SMS4_KEY *dat = EVP_C_DATA(EVP_SMS4_KEY, ctx);
enc = 1; mode = EVP_CIPHER_CTX_mode(ctx);
else if (EVP_CIPHER_CTX_mode(ctx) == EVP_CIPH_CFB_MODE)
enc = 1; //encrypt key == decrypt key
}
if (enc) if ((mode == EVP_CIPH_ECB_MODE || mode == EVP_CIPH_CBC_MODE) && !enc) {
sms4_set_encrypt_key(ctx->cipher_data, key); sms4_set_decrypt_key(&dat->ks, key);
else sms4_set_decrypt_key(ctx->cipher_data, key); } else {
sms4_set_decrypt_key(&dat->ks, key);
}
dat->block = (block128_f)sms4_encrypt;
dat->stream.cbc = mode == EVP_CIPH_CBC_MODE ? (cbc128_f) sms4_cbc_encrypt : NULL;
return 1; return 1;
} }
@@ -170,13 +176,15 @@ const EVP_CIPHER *EVP_sms4_cfb8(void)
static int sms4_ctr_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, static int sms4_ctr_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
const unsigned char *in, size_t len) const unsigned char *in, size_t len)
{ {
unsigned int num = ctx->num; unsigned int num = EVP_CIPHER_CTX_num(ctx);
EVP_SMS4_KEY *sms4 = (EVP_SMS4_KEY *)ctx->cipher_data; EVP_SMS4_KEY *sms4 = (EVP_SMS4_KEY *)ctx->cipher_data;
CRYPTO_ctr128_encrypt_ctr32(in, out, len, &sms4->ks, ctx->iv, ctx->buf, CRYPTO_ctr128_encrypt(in, out, len, &sms4->ks,
&num, (ctr128_f)sms4_encrypt); EVP_CIPHER_CTX_iv_noconst(ctx),
EVP_CIPHER_CTX_buf_noconst(ctx), &num,
sms4->block);
ctx->num = (size_t)num; EVP_CIPHER_CTX_set_num(ctx, num);
return 1; return 1;
} }

1
crypto/evp/e_sms4_ccm.c
View File

@@ -335,7 +335,6 @@ static const EVP_CIPHER sms4_ccm = {
}; };
const EVP_CIPHER *EVP_sms4_ccm(void) { const EVP_CIPHER *EVP_sms4_ccm(void) {
return NULL;
return &sms4_ccm; return &sms4_ccm;
} }
#endif /* OPENSSL_NO_SMS4 */ #endif /* OPENSSL_NO_SMS4 */