abc/GmSSL
1
0
Fork 0
mirror of https://github.com/guanzhi/GmSSL.git synced 2026-05-11 10:56:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add 128-EEA3, 128-EIA3, ZUC-MAC, ZUC256, ZUC256-MAC and EVP_zuc256

Browse Source
This commit is contained in:
Zhi Guan
2019-09-03 14:51:33 +08:00
parent c4455c96ae
commit 12505f111f
18 changed files with 6196 additions and 5520 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/openssl/evp.h
View File

@@ -938,6 +938,7 @@ const EVP_CIPHER *EVP_sms4_wrap_pad(void);
# ifndef OPENSSL_NO_ZUC
const EVP_CIPHER *EVP_zuc(void);
const EVP_CIPHER *EVP_zuc256(void);
# endif
# if OPENSSL_API_COMPAT < 0x10100000L

30
include/openssl/obj_mac.h
View File

@@ -5140,6 +5140,36 @@
#define NID_zuc_128eia3 1187
#define OBJ_zuc_128eia3 OBJ_zuc,2L
#define SN_zuc_mac "ZUC-MAC"
#define LN_zuc_mac "zuc-mac"
#define NID_zuc_mac 1213
#define OBJ_zuc_mac OBJ_zuc,3L
#define SN_zuc256 "ZUC256"
#define LN_zuc256 "zuc256"
#define NID_zuc256 1212
#define OBJ_zuc256 OBJ_zuc,4L
#define SN_zuc256_mac "ZUC256-MAC"
#define LN_zuc256_mac "zuc256-mac"
#define NID_zuc256_mac 1214
#define OBJ_zuc256_mac OBJ_zuc,5L
#define SN_zuc256_mac32 "ZUC256-MAC32"
#define LN_zuc256_mac32 "zuc256-mac32"
#define NID_zuc256_mac32 1215
#define OBJ_zuc256_mac32 OBJ_zuc256_mac,1L
#define SN_zuc256_mac64 "ZUC256-MAC64"
#define LN_zuc256_mac64 "zuc256-mac64"
#define NID_zuc256_mac64 1216
#define OBJ_zuc256_mac64 OBJ_zuc256_mac,2L
#define SN_zuc256_mac128 "ZUC256-MAC128"
#define LN_zuc256_mac128 "zuc256-mac128"
#define NID_zuc256_mac128 1217
#define OBJ_zuc256_mac128 OBJ_zuc256_mac,3L
#define SN_bwips "bwips"
#define NID_bwips 1188
#define OBJ_bwips OBJ_ISO_CN,11235L

4
include/openssl/opensslv.h
View File

@@ -41,9 +41,9 @@ extern "C" {
*/
# define OPENSSL_VERSION_NUMBER 0x1010004fL
# ifdef OPENSSL_FIPS
# define OPENSSL_VERSION_TEXT "GmSSL 2.5.3 - OpenSSL 1.1.0d-fips 28 Aug 2019"
# define OPENSSL_VERSION_TEXT "GmSSL 2.5.4 - OpenSSL 1.1.0d-fips 3 Sep 2019"
# else
# define OPENSSL_VERSION_TEXT "GmSSL 2.5.3 - OpenSSL 1.1.0d 28 Aug 2019"
# define OPENSSL_VERSION_TEXT "GmSSL 2.5.4 - OpenSSL 1.1.0d 3 Sep 2019"
# endif
/*-

79
include/openssl/zuc.h
View File

@@ -1,5 +1,5 @@
/* ====================================================================
* Copyright (c) 2015 - 2018 The GmSSL Project. All rights reserved.
* Copyright (c) 2015 - 2019 The GmSSL Project. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -56,12 +56,9 @@
# include <stdlib.h>
# include <openssl/e_os2.h>
# define ZUC_IV_LENGTH 16
# define ZUC_KEY_LENGTH 16
# define ZUC256_KEY_LENGTH 32
typedef uint32_t ZUC_UINT1;
typedef uint32_t ZUC_BIT;
typedef uint32_t ZUC_UINT5;
typedef uint8_t ZUC_UINT6;
typedef uint32_t ZUC_UINT15;
typedef uint32_t ZUC_UINT31;
typedef uint32_t ZUC_UINT32;
@@ -71,20 +68,72 @@ extern "C" {
# endif
typedef struct zuc_key_st {
# define ZUC_KEY_LENGTH 16
# define ZUC_IV_LENGTH 16
# define ZUC_MAC_LENGTH 4
typedef struct ZUC_KEY_st {
ZUC_UINT31 LFSR[16];
uint32_t R1;
uint32_t R2;
ZUC_UINT32 R1;
ZUC_UINT32 R2;
} ZUC_KEY;
void ZUC_set_key(ZUC_KEY *key, const unsigned char user_key[16], const unsigned char iv[16]);
void ZUC_generate_keystream(ZUC_KEY *key, size_t nwords, ZUC_UINT32 *words);
ZUC_UINT32 ZUC_generate_keyword(ZUC_KEY *key);
void ZUC_set_key(ZUC_KEY *key, const unsigned char *user_key, const unsigned char *iv);
void ZUC_generate_keystream(ZUC_KEY *key, size_t nwords, uint32_t *words);
uint32_t ZUC_generate_keyword(ZUC_KEY *key);
typedef struct ZUC_MAC_CTX_st {
ZUC_UINT31 LFSR[16];
ZUC_UINT32 R1;
ZUC_UINT32 R2;
ZUC_UINT32 T;
ZUC_UINT32 K0;
unsigned char buf[4];
int buflen;
} ZUC_MAC_CTX;
void ZUC_MAC_init(ZUC_MAC_CTX *ctx, const unsigned char key[16], const unsigned char iv[16]);
void ZUC_MAC_update(ZUC_MAC_CTX *ctx, const unsigned char *data, size_t len);
void ZUC_MAC_final(ZUC_MAC_CTX *ctx, const unsigned char *data, size_t nbits, unsigned char mac[4]);
void ZUC_eea_encrypt(const ZUC_UINT32 *in, ZUC_UINT32 *out, size_t nbits,
const unsigned char key[16], ZUC_UINT32 count, ZUC_UINT5 bearer,
ZUC_BIT direction);
ZUC_UINT32 ZUC_eia_generate_mac(const ZUC_UINT32 *data, size_t nbits,
const unsigned char user_key[16], ZUC_UINT32 count, ZUC_UINT5 bearer,
ZUC_BIT direction);
# define ZUC256_KEY_LENGTH 32
# define ZUC256_IV_LENGTH 23
# define ZUC256_MAC32_LENGTH 4
# define ZUC256_MAC64_LENGTH 8
# define ZUC256_MAC128_LENGTH 16
# define ZUC256_MIN_MAC_LENGTH ZUC256_MAC32_LENGTH
# define ZUC256_MAX_MAC_LENGTH ZUC256_MAC128_LENGTH
typedef ZUC_KEY ZUC256_KEY;
void ZUC256_set_key(ZUC256_KEY *key, const unsigned char user_key[32],
const unsigned char iv[23]);
#define ZUC256_generate_keystream(k,n,out) ZUC_generate_keystream(k,n,out)
#define ZUC256_generate_keyword(k) ZUC_generate_keyword(k)
typedef struct ZUC256_MAC_CTX_st {
ZUC_UINT31 LFSR[16];
ZUC_UINT32 R1;
ZUC_UINT32 R2;
ZUC_UINT32 T[4];
ZUC_UINT32 K0[4];
unsigned char buf[4];
int buflen;
int macbits;
} ZUC256_MAC_CTX;
void ZUC256_MAC_init(ZUC256_MAC_CTX *ctx, const unsigned char key[32], const unsigned char iv[23], int macbits);
void ZUC256_MAC_update(ZUC256_MAC_CTX *ctx, const unsigned char *data, size_t len);
void ZUC256_MAC_final(ZUC256_MAC_CTX *ctx, const unsigned char *data, size_t nbits, unsigned char *mac);
void ZUC256_set_key(ZUC_KEY *key, const unsigned char *K, const unsigned char *IV);
int ZUC256_set_mac_key(ZUC_KEY *key, const unsigned char *K, const unsigned char *IV,
int macbits /* macbits in {32, 64, 128} */);
# ifdef __cplusplus
}