Skip to content

Commit

Permalink
[crypto] move sms4_standard and zuc to engine dir
Browse files Browse the repository at this point in the history
  • Loading branch information
zhaoxiaomeng committed Jul 9, 2017
1 parent ba94076 commit 44890ce
Show file tree
Hide file tree
Showing 9 changed files with 7 additions and 423 deletions.
3 changes: 1 addition & 2 deletions crypto/sms4/build.info
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
LIBS=../../libcrypto
SOURCE[../../libcrypto]=\
sms4_common.c sms4_setkey.c sms4_enc.c sms4_enc_nblks.c \
sms4_ecb.c sms4_cbc.c sms4_cfb.c sms4_ctr.c sms4_ofb.c sms4_wrap.c \
sms4_standard.c
sms4_ecb.c sms4_cbc.c sms4_cfb.c sms4_ctr.c sms4_ofb.c sms4_wrap.c
2 changes: 1 addition & 1 deletion crypto/zuc/build.info
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
LIBS=../../libcrypto
SOURCE[../../libcrypto]=zuc.c zuc_spec.c zuc_standard.c
SOURCE[../../libcrypto]=zuc.c zuc_spec.c
27 changes: 1 addition & 26 deletions crypto/sms4/sms4_standard.c → engines/sm_standard/sms4/sms4_standard.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
* ====================================================================
*/

#include <openssl/sms4_standard.h>
#include "sms4_standard.h"
//rotate n bits to the left in a 32bit buffer
#define SM4_ROTL32(buf, n) (((buf)<<n)|((buf)>>(32-n)))
uint32_t SM4_CK[32] = {0x00070e15, 0x1c232a31, 0x383f464d, 0x545b6269,
Expand Down Expand Up @@ -179,29 +179,4 @@ void sms4_standard_decrypt(const unsigned char *in, unsigned char *out, const un
out[4 * j + 2] = (X[35 - j] >> 8) & 0xFF;
out[4 * j + 3] = (X[35 - j]) & 0xFF;
}
}
int sm4_standard_self_check()
{
int i;

//Standard data
unsigned char key[16] = {0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef, 0xfe, 0xdc, 0xba, 0x98, 0x76, 0x54, 0x32, 0x10};
unsigned char plain[16] = {0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef, 0xfe, 0xdc, 0xba, 0x98, 0x76, 0x54, 0x32, 0x10};
unsigned char cipher[16] = {0x68, 0x1e, 0xdf, 0x34, 0xd2, 0x06, 0x96, 0x5e, 0x86, 0xb3, 0xe9, 0x4f, 0x53, 0x6e, 0x42, 0x46};

unsigned char En_output[16];
unsigned char De_output[16];

sms4_standard_encrypt(plain, En_output,key);
sms4_standard_decrypt(cipher, De_output,key);

for (i = 0; i < 16; i++)
{
if ( (En_output[i] != cipher[i]) | (De_output[i] != plain[i]) )
{
return 1;
}
}
return 0;

}
2 changes: 1 addition & 1 deletion include/openssl/sms4_standard.h → engines/sm_standard/sms4/sms4_standard.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
#ifndef NO_GMSSL

#include <sys/types.h>
#include <stdint.h>
#include <openssl/e_os2.h>
#include <string.h>

#ifdef __cplusplus
Expand Down
0 crypto/zuc/zuc_standard.h → engines/sm_standard/zuc/zuc.h
View file
File renamed without changes.
302 changes: 1 addition & 301 deletions crypto/zuc/zuc_standard.c → engines/sm_standard/zuc/zuc_standard.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
*/

#include "zuc_standard.h"
#include "openssl/zuc.h"
#include "zuc.h"

/************************************************************
Function: add_mod
Expand Down Expand Up @@ -525,306 +525,6 @@ uint32_t zuc_integrity(unsigned char IK[], uint32_t COUNT, unsigned char BEARER,
return MAC;
}

/****************************************************************
Function: ZUC_SelfCheck
Description: Self-check with standard data
Calls: zuc_genkeystream,zuc_confidentiality,zuc_integrity
Called By:
Input:
Output:
Return: 0:success
1:error
Others:
****************************************************************/
int ZUC_SelfCheck()
{
int i;
/**************** KeyStream generation validation data ***************************/
// (all 0)
/* unsigned char
k[16]={0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
unsigned char
iv[16]={0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
uint32_t Std_Keystream[2]={0x27bede74,0x018082da};*/
//(all 1)
/*unsigned char
k[16]={0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff};
unsigned char
iv[16]={0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff};
uint32_t Std_Keystream[2]={0x0657cfa0,0x7096398b};*/
//(random)
unsigned char
k[16] = {0x3d, 0x4c, 0x4b, 0xe9, 0x6a, 0x82, 0xfd, 0xae, 0xb5, 0x8f, 0x64, 0x1d, 0xb1, 0x7b, 0x45, 0x5b};
unsigned char
iv[16] = {0x84, 0x31, 0x9a, 0xa8, 0xde, 0x69, 0x15, 0xca, 0x1f, 0x6b, 0xda, 0x6b, 0xfb, 0xd8, 0xc7, 0x66};
uint32_t Std_Keystream[2] = {0x14f1c272, 0x3279c419};
int KeystreamLen = 2; //the length of key stream
uint32_t Keystream[2];

/******************* Confidentiality validation data ***************************/
unsigned char key[16] =
{0x17, 0x3d, 0x14, 0xba, 0x50, 0x03, 0x73, 0x1d, 0x7a, 0x60, 0x04, 0x94, 0x70, 0xf0, 0x0a, 0x29};
uint32_t COUNT = 0x66035492;
unsigned char BEARER = 0x0f;
unsigned char DIRECTION = 0x00;
uint32_t plain[7] =
{0x6cf65340, 0x735552ab, 0x0c9752fa, 0x6f9025fe, 0x0bd675d9, 0x005875b2, 0x00000000};
uint32_t Std_cipher[7] =
{0xa6c85fc6, 0x6afb8533, 0xaafc2518, 0xdfe78494, 0x0ee1e4b0, 0x30238cc8, 0x00000000};
int plainlen = 0xc1;
uint32_t cipher[7];
//2
//unsigned char key[16] =
{0xe5, 0xbd, 0x3e, 0xa0, 0xeb, 0x55, 0xad, 0xe8, 0x66, 0xc6, 0xac, 0x58, 0xbd, 0x54, 0x30, 0x2a};
//uint32_t COUNT=0x00056823;
//unsigned char BEARER=0x18;
//unsigned char DIRECTION=0x01;
//uint32_t plain[25] =
{ 0x14a8ef69, 0x3d678507, 0xbbe7270a, 0x7f67ff50, 0x06c3525b, 0x9807e467, 0xc4e56000,
//
0xba338f5d, 0x42955903, 0x67518222, 0x46c80d3b, 0x38f07f4b, 0xe2d8ff58, 0x05f51322, 0x29bde93b, 0xbb
dcaf38,
//
0x2bf1ee97, 0x2fbf9977, 0xbada8945, 0x847a2a6c, 0x9ad34a66, 0x7554e04d, 0x1f7fa2c3, 0x3241bd8f, 0x01
ba220d
};
//uint32_t Std_cipher[25] =
{ 0x131d43e0, 0xdea1be5c, 0x5a1bfd97, 0x1d852cbf, 0x712d7b4f, 0x57961fea, 0x3208afa8,
//
0xbca433f4, 0x56ad09c7, 0x417e58bc, 0x69cf8866, 0xd1353f74, 0x865e8078, 0x1d202dfb, 0x3ecff7fc, 0xbc
3b190f,
//
0xe82a204e, 0xd0e350fc, 0x0f6f2613, 0xb2f2bca6, 0xdf5a473a, 0x57a4a00d, 0x985ebad8, 0x80d6f238, 0x64
a07b01
};
//int plainlen = 0x0320;
//uint32_t cipher[25];
//3
//unsigned char key[16] =
{0xe1, 0x3f, 0xed, 0x21, 0xb4, 0x6e, 0x4e, 0x7e, 0xc3, 0x12, 0x53, 0xb2, 0xbb, 0x17, 0xb3, 0xe0};
//uint32_t COUNT=0x2738cdaa;
//unsigned char BEARER=0x1a;
//unsigned char DIRECTION=0x00;
//uint32_t plain[126] =
{ 0x8d74e20d, 0x54894e06, 0xd3cb13cb, 0x3933065e, 0x8674be62, 0xadb1c72b, 0x3a646965,
//
0xab63cb7b, 0x7854dfdc, 0x27e84929, 0xf49c64b8, 0x72a490b1, 0x3f957b64, 0x827e71f4, 0x1fbd4269, 0xa4
2c97f8,
//
0x24537027, 0xf86e9f4a, 0xd82d1df4, 0x51690fdd, 0x98b6d03f, 0x3a0ebe3a, 0x312d6b84, 0x0ba5a182, 0x0b
2a2c97,
//
0x09c090d2, 0x45ed267c, 0xf845ae41, 0xfa975d33, 0x33ac3009, 0xfd40eba9, 0xeb5b8857, 0x14b768b6, 0x97
138baf,
//
0x21380eca, 0x49f644d4, 0x8689e421, 0x5760b906, 0x739f0d2b, 0x3f091133, 0xca15d981, 0xcbe401ba, 0xf7
2d05ac,
//
0xe05cccb2, 0xd297f4ef, 0x6a5f58d9, 0x1246cfa7, 0x7215b892, 0xab441d52, 0x78452795, 0xccb7f5d7, 0x90
57a1c4,
//
0xf77f80d4, 0x6db2033c, 0xb79bedf8, 0xe60551ce, 0x10c667f6, 0x2a97abaf, 0xabbcd677, 0x2018df96, 0xa2
82ea73,
//
0x7ce2cb33, 0x1211f60d, 0x5354ce78, 0xf9918d9c, 0x206ca042, 0xc9b62387, 0xdd709604, 0xa50af16d, 0x8d
35a890,
//
0x6be484cf, 0x2e74a928, 0x99403643, 0x53249b27, 0xb4c9ae29, 0xeddfc7da, 0x6418791a, 0x4e7baa06, 0x60
fa6451,
//
0x1f2d685c, 0xc3a5ff70, 0xe0d2b742, 0x92e3b8a0, 0xcd6b04b1, 0xc790b8ea, 0xd2703708, 0x540dea2f, 0xc0
9c3da7,
//
0x70f65449, 0xe84d817a, 0x4f551055, 0xe19ab850, 0x18a0028b, 0x71a144d9, 0x6791e9a3, 0x57793350, 0x4e
ee0060,
//
0x340c69d2, 0x74e1bf9d, 0x805dcbcc, 0x1a6faa97, 0x6800b6ff, 0x2b671dc4, 0x63652fa8, 0xa33ee509, 0x74
c1c21b,
//
0xe01eabb2, 0x16743026, 0x9d72ee51, 0x1c9dde30, 0x797c9a25, 0xd86ce74f, 0x5b961be5, 0xfdfb6807, 0x81
4039e7,
//
0x137636bd, 0x1d7fa9e0, 0x9efd2007, 0x505906a5, 0xac45dfde, 0xed7757bb, 0xee745749, 0xc2963335, 0x0b
ee0ea6,
// 0xf409df45,0x80160000};
//uint32_t Std_cipher[126] =
{ 0x94eaa4aa, 0x30a57137, 0xddf09b97, 0xb25618a2, 0x0a13e2f1, 0x0fa5bf81, 0x61a879cc,
//
0x2ae797a6, 0xb4cf2d9d, 0xf31debb9, 0x905ccfec, 0x97de605d, 0x21c61ab8, 0x531b7f3c, 0x9da5f039, 0x31
f8a064,
//
0x2de48211, 0xf5f52ffe, 0xa10f392a, 0x04766998, 0x5da454a2, 0x8f080961, 0xa6c2b62d, 0xaa17f33c, 0xd6
0a4971,
//
0xf48d2d90, 0x9394a55f, 0x48117ace, 0x43d708e6, 0xb77d3dc4, 0x6d8bc017, 0xd4d1abb7, 0x7b7428c0, 0x42
b06f2f,
//
0x99d8d07c, 0x9879d996, 0x00127a31, 0x985f1099, 0xbbd7d6c1, 0x519ede8f, 0x5eeb4a61, 0x0b349ac0, 0x1e
a23506,
//
0x91756bd1, 0x05c974a5, 0x3eddb35d, 0x1d4100b0, 0x12e522ab, 0x41f4c5f2, 0xfde76b59, 0xcb8b96d8, 0x85
cfe408,
//
0x0d1328a0, 0xd636cc0e, 0xdc05800b, 0x76acca8f, 0xef672084, 0xd1f52a8b, 0xbd8e0993, 0x320992c7, 0xff
bae17c,
//
0x408441e0, 0xee883fc8, 0xa8b05e22, 0xf5ff7f8d, 0x1b48c74c, 0x468c467a, 0x028f09fd, 0x7ce91109, 0xa5
70a2d5,
//
0xc4d5f4fa, 0x18c5dd3e, 0x4562afe2, 0x4ef77190, 0x1f59af64, 0x5898acef, 0x088abae0, 0x7e92d52e, 0xb2
de5504,
//
0x5bb1b7c4, 0x164ef2d7, 0xa6cac15e, 0xeb926d7e, 0xa2f08b66, 0xe1f759f3, 0xaee44614, 0x725aa3c7, 0x48
2b3084,
//
0x4c143ff8, 0x5b53f1e5, 0x83c50125, 0x7dddd096, 0xb81268da, 0xa303f172, 0x34c23335, 0x41f0bb8e, 0x19
0648c5,
//
0x807c866d, 0x71932286, 0x09adb948, 0x686f7de2, 0x94a802cc, 0x38f7fe52, 0x08f5ea31, 0x96d0167b, 0x9b
dd02f0,
//
0xd2a5221c, 0xa508f893, 0xaf5c4b4b, 0xb9f4f520, 0xfd84289b, 0x3dbe7e61, 0x497a7e2a, 0x584037ea, 0x63
7b6981,
//
0x127174af, 0x57b471df, 0x4b2768fd, 0x79c1540f, 0xb3edf2ea, 0x22cb69be, 0xc0cf8d93, 0x3d9c6fdd, 0x64
5e8505,
// 0x91cca3d6,0x2c0cc000};
//int plainlen = 0x0fb3;
//uint32_t cipher[126];

/******************* Integrity validation data ***************************/
//1
unsigned char IK[16] =
{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
uint32_t counter = 0x00000000;
unsigned char bear = 0x00;
unsigned char direc = 0x00;
uint32_t message[1] = {0x00000000};
int length = 1;
uint32_t Std_MAC = 0xc8a9595e;
//2
//unsigned char IK[16] =
{0xc9, 0xe6, 0xce, 0xc4, 0x60, 0x7c, 0x72, 0xdb, 0x00, 0x0a, 0xef, 0xa8, 0x83, 0x85, 0xab, 0x0a};
//uint32_t counter=0xa94059da;
//unsigned char bear=0x0a;
//unsigned char direc=0x01;
//uint32_t message[19] =
{ 0x983b41d4, 0x7d780c9e, 0x1ad11d7e, 0xb70391b1, 0xde0b35da, 0x2dc62f83, 0xe7b78d63,
//
0x06ca0ea0, 0x7e941b7b, 0xe91348f9, 0xfcb170e2, 0x217fecd9, 0x7f9f68ad, 0xb16e5d7d, 0x21e569d2, 0x80
ed775c,
// 0xebde3f40,0x93c53881,0x00000000};
//int length = 0x0241;
//uint32_t Std_MAC=0xfae8ff0b;
//3
/* unsigned char IK[16] =
{0x6b,0x8b,0x08,0xee,0x79,0xe0,0xb5,0x98,0x2d,0x6d,0x12,0x8e,0xa9,0xf2,0x20,0xcb};
uint32_t counter=0x561eb2dd;
unsigned char bear=0x1c;
unsigned char direc=0x00;
uint32_t message[178] =
{0x5bad7247,0x10ba1c56,0xd5a315f8,0xd40f6e09,0x3780be8e,0x8de07b69,0x92432018,
0xe08ed96a,0x5734af8b,0xad8a575d,0x3a1f162f,0x85045cc7,0x70925571,0xd9f5b94e,0x454a77c1,0x6e
72936b,
0xf016ae15,0x7499f054,0x3b5d52ca,0xa6dbeab6,0x97d2bb73,0xe41b8075,0xdce79b4b,0x86044f66,0x1d
4485a5,
0x43dd7860,0x6e0419e8,0x059859d3,0xcb2b67ce,0x0977603f,0x81ff839e,0x33185954,0x4cfbc8d0,0x0f
ef1a4c,
0x8510fb54,0x7d6b06c6,0x11ef44f1,0xbce107cf,0xa45a06aa,0xb360152b,0x28dc1ebe,0x6f7fe09b,0x05
16f9a5,
0xb02a1bd8,0x4bb0181e,0x2e89e19b,0xd8125930,0xd178682f,0x3862dc51,0xb636f04e,0x720c47c3,0xce
51ad70,
0xd94b9b22,0x55fbae90,0x6549f499,0xf8c6d399,0x47ed5e5d,0xf8e2def1,0x13253e7b,0x08d0a76b,0x6b
fc68c8,
0x12f375c7,0x9b8fe5fd,0x85976aa6,0xd46b4a23,0x39d8ae51,0x47f680fb,0xe70f978b,0x38effd7b,0x2f
7866a2,
0x2554e193,0xa94e98a6,0x8b74bd25,0xbb2b3f5f,0xb0a5fd59,0x887f9ab6,0x8159b717,0x8d5b7b67,0x7c
b546bf,
0x41eadca2,0x16fc1085,0x0128f8bd,0xef5c8d89,0xf96afa4f,0xa8b54885,0x565ed838,0xa950fee5,0xf1
c3b0a4,
0xf6fb71e5,0x4dfd169e,0x82cecc72,0x66c850e6,0x7c5ef0ba,0x960f5214,0x060e71eb,0x172a75fc,0x14
86835c,
0xbea65344,0x65b055c9,0x6a72e410,0x52241823,0x25d83041,0x4b40214d,0xaa8091d2,0xe0fb010a,0xe1
5c6de9,
0x0850973b,0xdf1e423b,0xe148a237,0xb87a0c9f,0x34d4b476,0x05b803d7,0x43a86a90,0x399a4af3,0x96
d3a120,
0x0a62f3d9,0x507962e8,0xe5bee6d3,0xda2bb3f7,0x237664ac,0x7a292823,0x900bc635,0x03b29e80,0xd6
3f6067,
0xbf8e1716,0xac25beba,0x350deb62,0xa99fe031,0x85eb4f69,0x937ecd38,0x7941fda5,0x44ba67db,0x09
117749,
0x38b01827,0xbcc69c92,0xb3f772a9,0xd2859ef0,0x03398b1f,0x6bbad7b5,0x74f7989a,0x1d10b2df,0x79
8e0dbf,
0x30d65874,0x64d24878,0xcd00c0ea,0xee8a1a0c,0xc753a279,0x79e11b41,0xdb1de3d5,0x038afaf4,0x9f
5c682c,
0x3748d8a3,0xa9ec54e6,0xa371275f,0x1683510f,0x8e4f9093,0x8f9ab6e1,0x34c2cfdf,0x4841cba8,0x8e
0cff2b,
0x0bcc8e6a,0xdcb71109,0xb5198fec,0xf1bb7e5c,0x531aca50,0xa56a8a3b,0x6de59862,0xd41fa113,0xd9
cd9578,
0x08f08571,0xd9a4bb79,0x2af271f6,0xcc6dbb8d,0xc7ec36e3,0x6be1ed30,0x8164c31c,0x7c0afc54,0x1c
000000};
int length = 0x1626;
uint32_t Std_MAC=0x0ca12792;*/

uint32_t MAC;
/**************** KeyStream generation testing ***************************/
zuc_genkeystream(k, iv, Keystream, KeystreamLen);
for (i = 0; i < KeystreamLen; i++)
{
printf("%s", "z = ");
printf("%08x\n", Keystream[i]);
}
if (memcmp(Keystream, Std_Keystream, KeystreamLen * 8))
return 1;

/**************** Confidentialitym testing ***************************/
printf("\n****************confidentiality validation******************");
zuc_confidentiality(key, COUNT, BEARER, DIRECTION, plain, plainlen, cipher);
printf("\nIBS:\n");
for (i = 0; i < (plainlen + 31) / 32; i++)
{
printf("%08x ", plain[i]);
}
printf("\nOBS:\n");
for (i = 0; i < (plainlen + 31) / 32; i++)
{
printf("%08x ", cipher[i]);
}
if (memcmp(cipher, Std_cipher, (plainlen + 31) / 32))
return 1;

/**************** Integrity testing ***************************/
printf("\n\n****************Integrity validation****************");
MAC = zuc_integrity(IK, counter, bear, direc, message, length);
printf("\nMAC = %08x ", MAC);
if (MAC != Std_MAC)
return 1;

return 0;
}








0 include/openssl/zuc_standard.h → engines/sm_standard/zuc/zuc_standard.h
View file
File renamed without changes.
2 changes: 2 additions & 0 deletions util/libcrypto.num
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4843,3 +4843,5 @@ o2i_SM2CiphertextValue 4684 1_1_0d EXIST::FUNCTION:
i2o_SM2CiphertextValue 4685 1_1_0d EXIST::FUNCTION:
SM2_compute_message_digest 4686 1_1_0d EXIST::FUNCTION:
serpent_set_decrypt_key 4687 1_1_0d EXIST::FUNCTION:
sms4_standard_encrypt 4688 1_1_0d EXIST::FUNCTION:
sms4_standard_decrypt 4689 1_1_0d EXIST::FUNCTION:
Loading

0 comments on commit 44890ce

Please sign in to comment.