diff --git a/Configure b/Configure
index 1d07a04c..beab5dea 100755
--- a/Configure
+++ b/Configure
@@ -312,7 +312,7 @@ $config{sdirs} = [
     "evp", "asn1", "pem", "x509", "x509v3", "conf", "txt_db", "pkcs7", "pkcs12", "comp", "ocsp", "ui",
     "cms", "ts", "srp", "cmac", "ct", "async", "kdf",
     "sm3", "sms4", "kdf2", "ecies", "ffx", "sm2", "paillier", "cpk", "otp", "gmapi", "ec2",
-    "bfibe", "bb1ibe", "sm9", "saf", "sdf", "skf", "sof"
+    "bfibe", "bb1ibe", "sm9", "saf", "sdf", "skf", "sof", "zuc"
     ];
 
 # Known TLS and DTLS protocols
@@ -407,7 +407,7 @@ my @disablables = (
     "zlib",
     "zlib-dynamic",
     "sm3", "sms4", "kdf2", "ecies", "ffx", "sm2", "paillier", "cpk", "otp", "gmapi", "ec2",
-    "bfibe", "bb1ibe", "sm9", "saf", "sdf", "skf", "sof"
+    "bfibe", "bb1ibe", "sm9", "saf", "sdf", "skf", "sof", "zuc"
     );
 foreach my $proto ((@tls, @dtls))
 	{
diff --git a/crypto/zuc/build.info b/crypto/zuc/build.info
new file mode 100644
index 00000000..016d75fb
--- /dev/null
+++ b/crypto/zuc/build.info
@@ -0,0 +1,2 @@
+LIBS=../../libcrypto
+SOURCE[../../libcrypto]=zuc.c zuc_spec.c
diff --git a/crypto/zuc/zuc.c b/crypto/zuc/zuc.c
new file mode 100755
index 00000000..92d88319
--- /dev/null
+++ b/crypto/zuc/zuc.c
@@ -0,0 +1,70 @@
+/* ====================================================================
+ * Copyright (c) 2015 - 2016 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the GmSSL Project.
+ *    (http://gmssl.org/)"
+ *
+ * 4. The name "GmSSL Project" must not be used to endorse or promote
+ *    products derived from this software without prior written
+ *    permission. For written permission, please contact
+ *    guanzhi1980@gmail.com.
+ *
+ * 5. Products derived from this software may not be called "GmSSL"
+ *    nor may "GmSSL" appear in their names without prior written
+ *    permission of the GmSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the GmSSL Project
+ *    (http://gmssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE GmSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE GmSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ */
+
+#include <string.h>
+#include <openssl/zuc.h>
+
+
+void zuc_set_key(zuc_key_t *key, const unsigned char *user_key, const unsigned char *iv)
+{
+}
+
+void zuc_generate_keystream(zuc_key_t *key,  size_t nwords, uint32_t *words)
+{
+}
+
+void zuc_ctx_init(zuc_ctx_t *ctx, const unsigned char *user_key, const unsigned char *iv)
+{
+}
+
+void zuc_encrypt(zuc_ctx_t *ctx, size_t len, const unsigned char *in, unsigned char *out)
+{
+	memcpy(out, in, len);
+}
diff --git a/crypto/zuc/zuc_core.c b/crypto/zuc/zuc_core.c
new file mode 100644
index 00000000..d89ac1d3
--- /dev/null
+++ b/crypto/zuc/zuc_core.c
@@ -0,0 +1,388 @@
+/* ====================================================================
+ * Copyright (c) 2015 - 2016 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the GmSSL Project.
+ *    (http://gmssl.org/)"
+ *
+ * 4. The name "GmSSL Project" must not be used to endorse or promote
+ *    products derived from this software without prior written
+ *    permission. For written permission, please contact
+ *    guanzhi1980@gmail.com.
+ *
+ * 5. Products derived from this software may not be called "GmSSL"
+ *    nor may "GmSSL" appear in their names without prior written
+ *    permission of the GmSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the GmSSL Project
+ *    (http://gmssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE GmSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE GmSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ */
+
+/* code from ZUC 3GPP Specifications, version 1.6
+ */
+
+#include <stdlib.h>
+#include "zuc_spec.h"
+
+/* the state registers of LFSR */
+
+typedef struct {
+	uint32_t lfsr_state[16];
+	uint32_t f_reg[2];
+	uint32_t brc_x[4];
+} zuc_key_t;
+
+
+/* the s-boxes */
+const unsigned char ZUC_S0[256] = {
+	0x3e,0x72,0x5b,0x47,0xca,0xe0,0x00,0x33,0x04,0xd1,0x54,0x98,0x09,0xb9,0x6d,0xcb,
+	0x7b,0x1b,0xf9,0x32,0xaf,0x9d,0x6a,0xa5,0xb8,0x2d,0xfc,0x1d,0x08,0x53,0x03,0x90,
+	0x4d,0x4e,0x84,0x99,0xe4,0xce,0xd9,0x91,0xdd,0xb6,0x85,0x48,0x8b,0x29,0x6e,0xac,
+	0xcd,0xc1,0xf8,0x1e,0x73,0x43,0x69,0xc6,0xb5,0xbd,0xfd,0x39,0x63,0x20,0xd4,0x38,
+	0x76,0x7d,0xb2,0xa7,0xcf,0xed,0x57,0xc5,0xf3,0x2c,0xbb,0x14,0x21,0x06,0x55,0x9b,
+	0xe3,0xef,0x5e,0x31,0x4f,0x7f,0x5a,0xa4,0x0d,0x82,0x51,0x49,0x5f,0xba,0x58,0x1c,
+	0x4a,0x16,0xd5,0x17,0xa8,0x92,0x24,0x1f,0x8c,0xff,0xd8,0xae,0x2e,0x01,0xd3,0xad,
+	0x3b,0x4b,0xda,0x46,0xeb,0xc9,0xde,0x9a,0x8f,0x87,0xd7,0x3a,0x80,0x6f,0x2f,0xc8,
+	0xb1,0xb4,0x37,0xf7,0x0a,0x22,0x13,0x28,0x7c,0xcc,0x3c,0x89,0xc7,0xc3,0x96,0x56,
+	0x07,0xbf,0x7e,0xf0,0x0b,0x2b,0x97,0x52,0x35,0x41,0x79,0x61,0xa6,0x4c,0x10,0xfe,
+	0xbc,0x26,0x95,0x88,0x8a,0xb0,0xa3,0xfb,0xc0,0x18,0x94,0xf2,0xe1,0xe5,0xe9,0x5d,
+	0xd0,0xdc,0x11,0x66,0x64,0x5c,0xec,0x59,0x42,0x75,0x12,0xf5,0x74,0x9c,0xaa,0x23,
+	0x0e,0x86,0xab,0xbe,0x2a,0x02,0xe7,0x67,0xe6,0x44,0xa2,0x6c,0xc2,0x93,0x9f,0xf1,
+	0xf6,0xfa,0x36,0xd2,0x50,0x68,0x9e,0x62,0x71,0x15,0x3d,0xd6,0x40,0xc4,0xe2,0x0f,
+	0x8e,0x83,0x77,0x6b,0x25,0x05,0x3f,0x0c,0x30,0xea,0x70,0xb7,0xa1,0xe8,0xa9,0x65,
+	0x8d,0x27,0x1a,0xdb,0x81,0xb3,0xa0,0xf4,0x45,0x7a,0x19,0xdf,0xee,0x78,0x34,0x60
+};
+
+const unsigned char ZUC_S1[256] = {
+	0x55,0xc2,0x63,0x71,0x3b,0xc8,0x47,0x86,0x9f,0x3c,0xda,0x5b,0x29,0xaa,0xfd,0x77,
+	0x8c,0xc5,0x94,0x0c,0xa6,0x1a,0x13,0x00,0xe3,0xa8,0x16,0x72,0x40,0xf9,0xf8,0x42,
+	0x44,0x26,0x68,0x96,0x81,0xd9,0x45,0x3e,0x10,0x76,0xc6,0xa7,0x8b,0x39,0x43,0xe1,
+	0x3a,0xb5,0x56,0x2a,0xc0,0x6d,0xb3,0x05,0x22,0x66,0xbf,0xdc,0x0b,0xfa,0x62,0x48,
+	0xdd,0x20,0x11,0x06,0x36,0xc9,0xc1,0xcf,0xf6,0x27,0x52,0xbb,0x69,0xf5,0xd4,0x87,
+	0x7f,0x84,0x4c,0xd2,0x9c,0x57,0xa4,0xbc,0x4f,0x9a,0xdf,0xfe,0xd6,0x8d,0x7a,0xeb,
+	0x2b,0x53,0xd8,0x5c,0xa1,0x14,0x17,0xfb,0x23,0xd5,0x7d,0x30,0x67,0x73,0x08,0x09,
+	0xee,0xb7,0x70,0x3f,0x61,0xb2,0x19,0x8e,0x4e,0xe5,0x4b,0x93,0x8f,0x5d,0xdb,0xa9,
+	0xad,0xf1,0xae,0x2e,0xcb,0x0d,0xfc,0xf4,0x2d,0x46,0x6e,0x1d,0x97,0xe8,0xd1,0xe9,
+	0x4d,0x37,0xa5,0x75,0x5e,0x83,0x9e,0xab,0x82,0x9d,0xb9,0x1c,0xe0,0xcd,0x49,0x89,
+	0x01,0xb6,0xbd,0x58,0x24,0xa2,0x5f,0x38,0x78,0x99,0x15,0x90,0x50,0xb8,0x95,0xe4,
+	0xd0,0x91,0xc7,0xce,0xed,0x0f,0xb4,0x6f,0xa0,0xcc,0xf0,0x02,0x4a,0x79,0xc3,0xde,
+	0xa3,0xef,0xea,0x51,0xe6,0x6b,0x18,0xec,0x1b,0x2c,0x80,0xf7,0x74,0xe7,0xff,0x21,
+	0x5a,0x6a,0x54,0x1e,0x41,0x31,0x92,0x35,0xc4,0x33,0x07,0x0a,0xba,0x7e,0x0e,0x34,
+	0x88,0xb1,0x98,0x7c,0xf3,0x3d,0x60,0x6c,0x7b,0xca,0xd3,0x1f,0x32,0x65,0x04,0x28,
+	0x64,0xbe,0x85,0x9b,0x2f,0x59,0x8a,0xd7,0xb0,0x25,0xac,0xaf,0x12,0x03,0xe2,0xf2
+};
+
+/* the constants D */
+const uint32_t EK_d[16] = {
+	0x44D7, 0x26BC, 0x626B, 0x135E, 0x5789, 0x35E2, 0x7135, 0x09AF,
+	0x4D78, 0x2F13, 0x6BC4, 0x1AF1, 0x5E26, 0x3C4D, 0x789A, 0x47AC
+};
+
+/* c = a + b mod (2^31 – 1) */
+uint32_t AddM(uint32_t a, uint32_t b)
+{
+	uint32_t c = a + b;
+	return (c & 0x7FFFFFFF) + (c >> 31);
+}
+
+/* LFSR with initialization mode */
+#define MulByPow2(x, k) ((((x) << k) | ((x) >> (31 - k))) & 0x7FFFFFFF)
+
+void LFSRWithInitialisationMode(u32 u)
+{
+	uint32_t f, v;
+	f = key->lfsr_state[0];
+	v = MulByPow2(key->lfsr_state[0], 8);
+	f = AddM(f, v);
+	v = MulByPow2(key->lfsr_state[4], 20);
+	f = AddM(f, v);
+	v = MulByPow2(key->lfsr_state[10], 21);
+	f = AddM(f, v);
+	v = MulByPow2(key->lfsr_state[13], 17);
+	f = AddM(f, v);
+	v = MulByPow2(key->lfsr_state[15], 15);
+	f = AddM(f, v);
+	f = AddM(f, u);
+	/* update the state */
+	key->lfsr_state[0] = key->lfsr_state[1];
+	key->lfsr_state[1] = key->lfsr_state[2];
+	key->lfsr_state[2] = key->lfsr_state[3];
+	key->lfsr_state[3] = key->lfsr_state[4];
+	key->lfsr_state[4] = key->lfsr_state[5];
+	key->lfsr_state[5] = key->lfsr_state[6];
+	key->lfsr_state[6] = key->lfsr_state[7];
+	key->lfsr_state[7] = key->lfsr_state[8];
+	key->lfsr_state[8] = key->lfsr_state[9];
+	key->lfsr_state[9] = key->lfsr_state[10];
+	key->lfsr_state[10] = key->lfsr_state[11];
+	key->lfsr_state[11] = key->lfsr_state[12];
+	key->lfsr_state[12] = key->lfsr_state[13];
+	key->lfsr_state[13] = key->lfsr_state[14];
+	key->lfsr_state[14] = key->lfsr_state[15];
+	key->lfsr_state[15] = f;
+}
+
+/* LFSR with work mode */
+void LFSRWithWorkMode(void)
+{
+	u32 f, v;
+	f = key->lfsr_state[0];
+	v = MulByPow2(key->lfsr_state[0], 8);
+	f = AddM(f, v);
+	v = MulByPow2(key->lfsr_state[4], 20);
+	f = AddM(f, v);
+	v = MulByPow2(key->lfsr_state[10], 21);
+	f = AddM(f, v);
+	v = MulByPow2(key->lfsr_state[13], 17);
+	f = AddM(f, v);
+	v = MulByPow2(key->lfsr_state[15], 15);
+	f = AddM(f, v);
+	/* update the state */
+	key->lfsr_state[0] = key->lfsr_state[1];
+	key->lfsr_state[1] = key->lfsr_state[2];
+	key->lfsr_state[2] = key->lfsr_state[3];
+	key->lfsr_state[3] = key->lfsr_state[4];
+	key->lfsr_state[4] = key->lfsr_state[5];
+	key->lfsr_state[5] = key->lfsr_state[6];
+	key->lfsr_state[6] = key->lfsr_state[7];
+	key->lfsr_state[7] = key->lfsr_state[8];
+	key->lfsr_state[8] = key->lfsr_state[9];
+	key->lfsr_state[9] = key->lfsr_state[10];
+	key->lfsr_state[10] = key->lfsr_state[11];
+	key->lfsr_state[11] = key->lfsr_state[12];
+	key->lfsr_state[12] = key->lfsr_state[13];
+	key->lfsr_state[13] = key->lfsr_state[14];
+	key->lfsr_state[14] = key->lfsr_state[15];
+	key->lfsr_state[15] = f;
+}
+
+/* BitReorganization */
+void BitReorganization(void)
+{
+	BRC_X0 = ((key->lfsr_state[15] & 0x7FFF8000) << 1) | (key->lfsr_state[14] & 0xFFFF);
+	BRC_X1 = ((key->lfsr_state[11] & 0xFFFF) << 16) | (key->lfsr_state[9] >> 15);
+	BRC_X2 = ((key->lfsr_state[7] & 0xFFFF) << 16) | (key->lfsr_state[5] >> 15);
+	BRC_X3 = ((key->lfsr_state[2] & 0xFFFF) << 16) | (key->lfsr_state[0] >> 15);
+}
+
+#define ROT(a, k) (((a) << k) | ((a) >> (32 - k)))
+
+/* L1 */
+u32 L1(u32 X)
+{
+	return (X ^ ROT(X, 2) ^ ROT(X, 10) ^ ROT(X, 18) ^ ROT(X, 24));
+}
+
+/* L2 */
+u32 L2(u32 X)
+{
+	return (X ^ ROT(X, 8) ^ ROT(X, 14) ^ ROT(X, 22) ^ ROT(X, 30));
+}
+
+#define MAKEU32(a, b, c, d) \
+	(((u32)(a) << 24) | ((u32)(b) << 16) | ((u32)(c) << 8) | ((u32)(d)))
+
+/* F */
+u32 F()
+{
+	u32 W, W1, W2, u, v;
+	W = (BRC_X0 ^ F_R1) + F_R2;
+	W1 = F_R1 + BRC_X1;
+	W2 = F_R2 ^ BRC_X2;
+	u = L1((W1 << 16) | (W2 >> 16));
+	v = L2((W2 << 16) | (W1 >> 16));
+	F_R1 = MAKEU32(S0[u >> 24], S1[(u >> 16) & 0xFF],
+			S0[(u >> 8) & 0xFF], S1[u & 0xFF]);
+	F_R2 = MAKEU32(S0[v >> 24], S1[(v >> 16) & 0xFF],
+			S0[(v >> 8) & 0xFF], S1[v & 0xFF]);
+	return W;
+}
+
+#define MAKEU31(a, b, c) (((u32)(a) << 23) | ((u32)(b) << 8) | (u32)(c))
+
+/* initialize */
+void Initialization(u8* k, u8* iv)
+{
+	u32 w, nCount;
+
+	/* expand key */
+	key->lfsr_state[0 = MAKEU31(k[0], EK_d[0], iv[0]);
+	key->lfsr_state[1 = MAKEU31(k[1], EK_d[1], iv[1]);
+	key->lfsr_state[2 = MAKEU31(k[2], EK_d[2], iv[2]);
+	key->lfsr_state[3 = MAKEU31(k[3], EK_d[3], iv[3]);
+	key->lfsr_state[4 = MAKEU31(k[4], EK_d[4], iv[4]);
+	key->lfsr_state[5 = MAKEU31(k[5], EK_d[5], iv[5]);
+	key->lfsr_state[6 = MAKEU31(k[6], EK_d[6], iv[6]);
+	key->lfsr_state[7 = MAKEU31(k[7], EK_d[7], iv[7]);
+	key->lfsr_state[8 = MAKEU31(k[8], EK_d[8], iv[8]);
+	key->lfsr_state[9 = MAKEU31(k[9], EK_d[9], iv[9]);
+	key->lfsr_state[10 = MAKEU31(k[10], EK_d[10], iv[10]);
+	key->lfsr_state[11 = MAKEU31(k[11], EK_d[11], iv[11]);
+	key->lfsr_state[12 = MAKEU31(k[12], EK_d[12], iv[12]);
+	key->lfsr_state[13 = MAKEU31(k[13], EK_d[13], iv[13]);
+	key->lfsr_state[14 = MAKEU31(k[14], EK_d[14], iv[14]);
+	key->lfsr_state[15 = MAKEU31(k[15], EK_d[15], iv[15]);
+
+	/* set F_R1 and F_R2 to zero */
+	F_R1 = 0;
+	F_R2 = 0;
+	nCount = 32;
+	while (nCount > 0)
+	{
+		BitReorganization();
+		w = F();
+		LFSRWithInitialisationMode(w >> 1);
+		nCount --;
+	}
+}
+
+void GenerateKeystream(u32* pKeystream, int KeystreamLen)
+{
+	int i;
+
+	{
+		BitReorganization();
+		F(); /* discard the output of F */
+		LFSRWithWorkMode();
+	}
+
+	for (i = 0; i < KeystreamLen; i ++)
+	{
+		BitReorganization();
+		pKeystream[i] = F() ^ BRC_X3;
+		LFSRWithWorkMode();
+	}
+}
+
+/* The ZUC algorithm, see ref. [3]*/
+void ZUC(u8* k, u8* iv, u32* ks, int len)
+{
+	/* The initialization of ZUC, see page 17 of ref. [3]*/
+	Initialization(k, iv);
+	/* The procedure of generating keystream of ZUC, see page 18 of ref. [3]*/
+	GenerateKeystream(ks, len);
+}
+
+void EEA3(u8* CK, u32 COUNT, u32 BEARER, u32 DIRECTION, u32 LENGTH, u32* M, u32* C)
+{
+	u32 *z, L, i;
+	u8 IV[16];
+
+	L = (LENGTH+31)/32;
+	z = (u32 *) malloc(L*sizeof(u32));
+	IV[0] = (COUNT>>24) & 0xFF;
+	IV[1] = (COUNT>>16) & 0xFF;
+	IV[2] = (COUNT>>8) & 0xFF;
+	IV[3] = COUNT & 0xFF;
+
+	IV[4] = ((BEARER << 3) | ((DIRECTION&1)<<2)) & 0xFC;
+	IV[5] = 0;
+	IV[6] = 0;
+	IV[7] = 0;
+
+	IV[8] = IV[0];
+	IV[9] = IV[1];
+	IV[10] = IV[2];
+	IV[11] = IV[3];
+
+	IV[12] = IV[4];
+	IV[13] = IV[5];
+	IV[14] = IV[6];
+	IV[15] = IV[7];
+
+	ZUC(CK, IV, z, L);
+	for (i=0; i<L; i++) {
+		C[i] = M[i] ^ z[i];
+	}
+	free(z);
+}
+
+
+u32 GET_WORD(u32 * DATA, u32 i)
+{
+	u32 WORD, ti;
+	ti = i % 32;
+
+	if (ti == 0) {
+		WORD = DATA[i/32];
+	}
+	else {
+		WORD = (DATA[i/32]<<ti) | (DATA[i/32+1]>>(32-ti));
+	}
+	return WORD;
+}
+
+u8 GET_BIT(u32 * DATA, u32 i)
+{
+	return (DATA[i/32] & (1<<(31-(i%32)))) ? 1 : 0;
+}
+
+void EIA3(u8* IK, u32 COUNT, u32 DIRECTION, u32 BEARER, u32 LENGTH, u32* M, u32* MAC)
+{
+	u32 *z, N, L, T, i;
+	u8 IV[16];
+
+	IV[0] = (COUNT>>24) & 0xFF;
+	IV[1] = (COUNT>>16) & 0xFF;
+	IV[2] = (COUNT>>8) & 0xFF;
+	IV[3] = COUNT & 0xFF;
+
+	IV[4] = (BEARER << 3) & 0xF8;
+	IV[5] = IV[6] = IV[7] = 0;
+
+	IV[8] = ((COUNT>>24) & 0xFF) ^ ((DIRECTION&1)<<7);
+	IV[9] = (COUNT>>16) & 0xFF;
+	IV[10] = (COUNT>>8) & 0xFF;
+	IV[11] = COUNT & 0xFF;
+
+	IV[12] = IV[4];
+	IV[13] = IV[5];
+	IV[14] = IV[6] ^ ((DIRECTION&1)<<7);
+	IV[15] = IV[7];
+
+	N = LENGTH + 64;
+	L = (N + 31) / 32;
+	z = (u32 *) malloc(L*sizeof(u32));
+	ZUC(IK, IV, z, L);
+
+	T = 0;
+	for (i = 0; i < LENGTH; i++) {
+		if (GET_BIT(M,i)) {
+			T ^= GET_WORD(z,i);
+		}
+	}
+	T ^= GET_WORD(z,LENGTH);
+
+	*MAC = T ^ z[L-1];
+	free(z);
+}
+
diff --git a/crypto/zuc/zuc_spec.c b/crypto/zuc/zuc_spec.c
new file mode 100644
index 00000000..9544843b
--- /dev/null
+++ b/crypto/zuc/zuc_spec.c
@@ -0,0 +1,407 @@
+/* ====================================================================
+ * Copyright (c) 2015 - 2016 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the GmSSL Project.
+ *    (http://gmssl.org/)"
+ *
+ * 4. The name "GmSSL Project" must not be used to endorse or promote
+ *    products derived from this software without prior written
+ *    permission. For written permission, please contact
+ *    guanzhi1980@gmail.com.
+ *
+ * 5. Products derived from this software may not be called "GmSSL"
+ *    nor may "GmSSL" appear in their names without prior written
+ *    permission of the GmSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the GmSSL Project
+ *    (http://gmssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE GmSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE GmSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ */
+
+/* code from ZUC 3GPP Specifications, version 1.6
+ */
+
+#include <stdlib.h>
+#include "zuc_spec.h"
+
+/* the state registers of LFSR */
+u32 LFSR_S0;
+u32 LFSR_S1;
+u32 LFSR_S2;
+u32 LFSR_S3;
+u32 LFSR_S4;
+u32 LFSR_S5;
+u32 LFSR_S6;
+u32 LFSR_S7;
+u32 LFSR_S8;
+u32 LFSR_S9;
+u32 LFSR_S10;
+u32 LFSR_S11;
+u32 LFSR_S12;
+u32 LFSR_S13;
+u32 LFSR_S14;
+u32 LFSR_S15;
+
+/* the registers of F */
+u32 F_R1;
+u32 F_R2;
+
+/* the outputs of BitReorganization */
+u32 BRC_X0;
+u32 BRC_X1;
+u32 BRC_X2;
+u32 BRC_X3;
+
+/* the s-boxes */
+u8 S0[256] = {
+	0x3e,0x72,0x5b,0x47,0xca,0xe0,0x00,0x33,0x04,0xd1,0x54,0x98,0x09,0xb9,0x6d,0xcb,
+	0x7b,0x1b,0xf9,0x32,0xaf,0x9d,0x6a,0xa5,0xb8,0x2d,0xfc,0x1d,0x08,0x53,0x03,0x90,
+	0x4d,0x4e,0x84,0x99,0xe4,0xce,0xd9,0x91,0xdd,0xb6,0x85,0x48,0x8b,0x29,0x6e,0xac,
+	0xcd,0xc1,0xf8,0x1e,0x73,0x43,0x69,0xc6,0xb5,0xbd,0xfd,0x39,0x63,0x20,0xd4,0x38,
+	0x76,0x7d,0xb2,0xa7,0xcf,0xed,0x57,0xc5,0xf3,0x2c,0xbb,0x14,0x21,0x06,0x55,0x9b,
+	0xe3,0xef,0x5e,0x31,0x4f,0x7f,0x5a,0xa4,0x0d,0x82,0x51,0x49,0x5f,0xba,0x58,0x1c,
+	0x4a,0x16,0xd5,0x17,0xa8,0x92,0x24,0x1f,0x8c,0xff,0xd8,0xae,0x2e,0x01,0xd3,0xad,
+	0x3b,0x4b,0xda,0x46,0xeb,0xc9,0xde,0x9a,0x8f,0x87,0xd7,0x3a,0x80,0x6f,0x2f,0xc8,
+	0xb1,0xb4,0x37,0xf7,0x0a,0x22,0x13,0x28,0x7c,0xcc,0x3c,0x89,0xc7,0xc3,0x96,0x56,
+	0x07,0xbf,0x7e,0xf0,0x0b,0x2b,0x97,0x52,0x35,0x41,0x79,0x61,0xa6,0x4c,0x10,0xfe,
+	0xbc,0x26,0x95,0x88,0x8a,0xb0,0xa3,0xfb,0xc0,0x18,0x94,0xf2,0xe1,0xe5,0xe9,0x5d,
+	0xd0,0xdc,0x11,0x66,0x64,0x5c,0xec,0x59,0x42,0x75,0x12,0xf5,0x74,0x9c,0xaa,0x23,
+	0x0e,0x86,0xab,0xbe,0x2a,0x02,0xe7,0x67,0xe6,0x44,0xa2,0x6c,0xc2,0x93,0x9f,0xf1,
+	0xf6,0xfa,0x36,0xd2,0x50,0x68,0x9e,0x62,0x71,0x15,0x3d,0xd6,0x40,0xc4,0xe2,0x0f,
+	0x8e,0x83,0x77,0x6b,0x25,0x05,0x3f,0x0c,0x30,0xea,0x70,0xb7,0xa1,0xe8,0xa9,0x65,
+	0x8d,0x27,0x1a,0xdb,0x81,0xb3,0xa0,0xf4,0x45,0x7a,0x19,0xdf,0xee,0x78,0x34,0x60
+};
+
+u8 S1[256] = {
+	0x55,0xc2,0x63,0x71,0x3b,0xc8,0x47,0x86,0x9f,0x3c,0xda,0x5b,0x29,0xaa,0xfd,0x77,
+	0x8c,0xc5,0x94,0x0c,0xa6,0x1a,0x13,0x00,0xe3,0xa8,0x16,0x72,0x40,0xf9,0xf8,0x42,
+	0x44,0x26,0x68,0x96,0x81,0xd9,0x45,0x3e,0x10,0x76,0xc6,0xa7,0x8b,0x39,0x43,0xe1,
+	0x3a,0xb5,0x56,0x2a,0xc0,0x6d,0xb3,0x05,0x22,0x66,0xbf,0xdc,0x0b,0xfa,0x62,0x48,
+	0xdd,0x20,0x11,0x06,0x36,0xc9,0xc1,0xcf,0xf6,0x27,0x52,0xbb,0x69,0xf5,0xd4,0x87,
+	0x7f,0x84,0x4c,0xd2,0x9c,0x57,0xa4,0xbc,0x4f,0x9a,0xdf,0xfe,0xd6,0x8d,0x7a,0xeb,
+	0x2b,0x53,0xd8,0x5c,0xa1,0x14,0x17,0xfb,0x23,0xd5,0x7d,0x30,0x67,0x73,0x08,0x09,
+	0xee,0xb7,0x70,0x3f,0x61,0xb2,0x19,0x8e,0x4e,0xe5,0x4b,0x93,0x8f,0x5d,0xdb,0xa9,
+	0xad,0xf1,0xae,0x2e,0xcb,0x0d,0xfc,0xf4,0x2d,0x46,0x6e,0x1d,0x97,0xe8,0xd1,0xe9,
+	0x4d,0x37,0xa5,0x75,0x5e,0x83,0x9e,0xab,0x82,0x9d,0xb9,0x1c,0xe0,0xcd,0x49,0x89,
+	0x01,0xb6,0xbd,0x58,0x24,0xa2,0x5f,0x38,0x78,0x99,0x15,0x90,0x50,0xb8,0x95,0xe4,
+	0xd0,0x91,0xc7,0xce,0xed,0x0f,0xb4,0x6f,0xa0,0xcc,0xf0,0x02,0x4a,0x79,0xc3,0xde,
+	0xa3,0xef,0xea,0x51,0xe6,0x6b,0x18,0xec,0x1b,0x2c,0x80,0xf7,0x74,0xe7,0xff,0x21,
+	0x5a,0x6a,0x54,0x1e,0x41,0x31,0x92,0x35,0xc4,0x33,0x07,0x0a,0xba,0x7e,0x0e,0x34,
+	0x88,0xb1,0x98,0x7c,0xf3,0x3d,0x60,0x6c,0x7b,0xca,0xd3,0x1f,0x32,0x65,0x04,0x28,
+	0x64,0xbe,0x85,0x9b,0x2f,0x59,0x8a,0xd7,0xb0,0x25,0xac,0xaf,0x12,0x03,0xe2,0xf2
+};
+
+/* the constants D */
+u32 EK_d[16] = {
+	0x44D7, 0x26BC, 0x626B, 0x135E, 0x5789, 0x35E2, 0x7135, 0x09AF,
+	0x4D78, 0x2F13, 0x6BC4, 0x1AF1, 0x5E26, 0x3C4D, 0x789A, 0x47AC
+};
+
+/* c = a + b mod (2^31 – 1) */
+u32 AddM(u32 a, u32 b)
+{
+	u32 c = a + b;
+	return (c & 0x7FFFFFFF) + (c >> 31);
+}
+
+/* LFSR with initialization mode */
+#define MulByPow2(x, k) ((((x) << k) | ((x) >> (31 - k))) & 0x7FFFFFFF)
+
+void LFSRWithInitialisationMode(u32 u)
+{
+	u32 f, v;
+	f = LFSR_S0;
+	v = MulByPow2(LFSR_S0, 8);
+	f = AddM(f, v);
+	v = MulByPow2(LFSR_S4, 20);
+	f = AddM(f, v);
+	v = MulByPow2(LFSR_S10, 21);
+	f = AddM(f, v);
+	v = MulByPow2(LFSR_S13, 17);
+	f = AddM(f, v);
+	v = MulByPow2(LFSR_S15, 15);
+	f = AddM(f, v);
+	f = AddM(f, u);
+	/* update the state */
+	LFSR_S0 = LFSR_S1;
+	LFSR_S1 = LFSR_S2;
+	LFSR_S2 = LFSR_S3;
+	LFSR_S3 = LFSR_S4;
+	LFSR_S4 = LFSR_S5;
+	LFSR_S5 = LFSR_S6;
+	LFSR_S6 = LFSR_S7;
+	LFSR_S7 = LFSR_S8;
+	LFSR_S8 = LFSR_S9;
+	LFSR_S9 = LFSR_S10;
+	LFSR_S10 = LFSR_S11;
+	LFSR_S11 = LFSR_S12;
+	LFSR_S12 = LFSR_S13;
+	LFSR_S13 = LFSR_S14;
+	LFSR_S14 = LFSR_S15;
+	LFSR_S15 = f;
+}
+
+/* LFSR with work mode */
+void LFSRWithWorkMode(void)
+{
+	u32 f, v;
+	f = LFSR_S0;
+	v = MulByPow2(LFSR_S0, 8);
+	f = AddM(f, v);
+	v = MulByPow2(LFSR_S4, 20);
+	f = AddM(f, v);
+	v = MulByPow2(LFSR_S10, 21);
+	f = AddM(f, v);
+	v = MulByPow2(LFSR_S13, 17);
+	f = AddM(f, v);
+	v = MulByPow2(LFSR_S15, 15);
+	f = AddM(f, v);
+	/* update the state */
+	LFSR_S0 = LFSR_S1;
+	LFSR_S1 = LFSR_S2;
+	LFSR_S2 = LFSR_S3;
+	LFSR_S3 = LFSR_S4;
+	LFSR_S4 = LFSR_S5;
+	LFSR_S5 = LFSR_S6;
+	LFSR_S6 = LFSR_S7;
+	LFSR_S7 = LFSR_S8;
+	LFSR_S8 = LFSR_S9;
+	LFSR_S9 = LFSR_S10;
+	LFSR_S10 = LFSR_S11;
+	LFSR_S11 = LFSR_S12;
+	LFSR_S12 = LFSR_S13;
+	LFSR_S13 = LFSR_S14;
+	LFSR_S14 = LFSR_S15;
+	LFSR_S15 = f;
+}
+
+/* BitReorganization */
+void BitReorganization(void)
+{
+	BRC_X0 = ((LFSR_S15 & 0x7FFF8000) << 1) | (LFSR_S14 & 0xFFFF);
+	BRC_X1 = ((LFSR_S11 & 0xFFFF) << 16) | (LFSR_S9 >> 15);
+	BRC_X2 = ((LFSR_S7 & 0xFFFF) << 16) | (LFSR_S5 >> 15);
+	BRC_X3 = ((LFSR_S2 & 0xFFFF) << 16) | (LFSR_S0 >> 15);
+}
+
+#define ROT(a, k) (((a) << k) | ((a) >> (32 - k)))
+
+/* L1 */
+u32 L1(u32 X)
+{
+	return (X ^ ROT(X, 2) ^ ROT(X, 10) ^ ROT(X, 18) ^ ROT(X, 24));
+}
+
+/* L2 */
+u32 L2(u32 X)
+{
+	return (X ^ ROT(X, 8) ^ ROT(X, 14) ^ ROT(X, 22) ^ ROT(X, 30));
+}
+
+#define MAKEU32(a, b, c, d) \
+	(((u32)(a) << 24) | ((u32)(b) << 16) | ((u32)(c) << 8) | ((u32)(d)))
+
+/* F */
+u32 F()
+{
+	u32 W, W1, W2, u, v;
+	W = (BRC_X0 ^ F_R1) + F_R2;
+	W1 = F_R1 + BRC_X1;
+	W2 = F_R2 ^ BRC_X2;
+	u = L1((W1 << 16) | (W2 >> 16));
+	v = L2((W2 << 16) | (W1 >> 16));
+	F_R1 = MAKEU32(S0[u >> 24], S1[(u >> 16) & 0xFF],
+			S0[(u >> 8) & 0xFF], S1[u & 0xFF]);
+	F_R2 = MAKEU32(S0[v >> 24], S1[(v >> 16) & 0xFF],
+			S0[(v >> 8) & 0xFF], S1[v & 0xFF]);
+	return W;
+}
+
+#define MAKEU31(a, b, c) (((u32)(a) << 23) | ((u32)(b) << 8) | (u32)(c))
+
+/* initialize */
+void Initialization(u8* k, u8* iv)
+{
+	u32 w, nCount;
+
+	/* expand key */
+	LFSR_S0 = MAKEU31(k[0], EK_d[0], iv[0]);
+	LFSR_S1 = MAKEU31(k[1], EK_d[1], iv[1]);
+	LFSR_S2 = MAKEU31(k[2], EK_d[2], iv[2]);
+	LFSR_S3 = MAKEU31(k[3], EK_d[3], iv[3]);
+	LFSR_S4 = MAKEU31(k[4], EK_d[4], iv[4]);
+	LFSR_S5 = MAKEU31(k[5], EK_d[5], iv[5]);
+	LFSR_S6 = MAKEU31(k[6], EK_d[6], iv[6]);
+	LFSR_S7 = MAKEU31(k[7], EK_d[7], iv[7]);
+	LFSR_S8 = MAKEU31(k[8], EK_d[8], iv[8]);
+	LFSR_S9 = MAKEU31(k[9], EK_d[9], iv[9]);
+	LFSR_S10 = MAKEU31(k[10], EK_d[10], iv[10]);
+	LFSR_S11 = MAKEU31(k[11], EK_d[11], iv[11]);
+	LFSR_S12 = MAKEU31(k[12], EK_d[12], iv[12]);
+	LFSR_S13 = MAKEU31(k[13], EK_d[13], iv[13]);
+	LFSR_S14 = MAKEU31(k[14], EK_d[14], iv[14]);
+	LFSR_S15 = MAKEU31(k[15], EK_d[15], iv[15]);
+
+	/* set F_R1 and F_R2 to zero */
+	F_R1 = 0;
+	F_R2 = 0;
+	nCount = 32;
+	while (nCount > 0)
+	{
+		BitReorganization();
+		w = F();
+		LFSRWithInitialisationMode(w >> 1);
+		nCount --;
+	}
+}
+
+void GenerateKeystream(u32* pKeystream, int KeystreamLen)
+{
+	int i;
+
+	{
+		BitReorganization();
+		F(); /* discard the output of F */
+		LFSRWithWorkMode();
+	}
+
+	for (i = 0; i < KeystreamLen; i ++)
+	{
+		BitReorganization();
+		pKeystream[i] = F() ^ BRC_X3;
+		LFSRWithWorkMode();
+	}
+}
+
+/* The ZUC algorithm, see ref. [3]*/
+void ZUC(u8* k, u8* iv, u32* ks, int len)
+{
+	/* The initialization of ZUC, see page 17 of ref. [3]*/
+	Initialization(k, iv);
+	/* The procedure of generating keystream of ZUC, see page 18 of ref. [3]*/
+	GenerateKeystream(ks, len);
+}
+
+void EEA3(u8* CK, u32 COUNT, u32 BEARER, u32 DIRECTION, u32 LENGTH, u32* M, u32* C)
+{
+	u32 *z, L, i;
+	u8 IV[16];
+
+	L = (LENGTH+31)/32;
+	z = (u32 *) malloc(L*sizeof(u32));
+	IV[0] = (COUNT>>24) & 0xFF;
+	IV[1] = (COUNT>>16) & 0xFF;
+	IV[2] = (COUNT>>8) & 0xFF;
+	IV[3] = COUNT & 0xFF;
+
+	IV[4] = ((BEARER << 3) | ((DIRECTION&1)<<2)) & 0xFC;
+	IV[5] = 0;
+	IV[6] = 0;
+	IV[7] = 0;
+
+	IV[8] = IV[0];
+	IV[9] = IV[1];
+	IV[10] = IV[2];
+	IV[11] = IV[3];
+
+	IV[12] = IV[4];
+	IV[13] = IV[5];
+	IV[14] = IV[6];
+	IV[15] = IV[7];
+
+	ZUC(CK, IV, z, L);
+	for (i=0; i<L; i++) {
+		C[i] = M[i] ^ z[i];
+	}
+	free(z);
+}
+
+
+u32 GET_WORD(u32 * DATA, u32 i)
+{
+	u32 WORD, ti;
+	ti = i % 32;
+
+	if (ti == 0) {
+		WORD = DATA[i/32];
+	}
+	else {
+		WORD = (DATA[i/32]<<ti) | (DATA[i/32+1]>>(32-ti));
+	}
+	return WORD;
+}
+
+u8 GET_BIT(u32 * DATA, u32 i)
+{
+	return (DATA[i/32] & (1<<(31-(i%32)))) ? 1 : 0;
+}
+
+void EIA3(u8* IK, u32 COUNT, u32 DIRECTION, u32 BEARER, u32 LENGTH, u32* M, u32* MAC)
+{
+	u32 *z, N, L, T, i;
+	u8 IV[16];
+
+	IV[0] = (COUNT>>24) & 0xFF;
+	IV[1] = (COUNT>>16) & 0xFF;
+	IV[2] = (COUNT>>8) & 0xFF;
+	IV[3] = COUNT & 0xFF;
+
+	IV[4] = (BEARER << 3) & 0xF8;
+	IV[5] = IV[6] = IV[7] = 0;
+
+	IV[8] = ((COUNT>>24) & 0xFF) ^ ((DIRECTION&1)<<7);
+	IV[9] = (COUNT>>16) & 0xFF;
+	IV[10] = (COUNT>>8) & 0xFF;
+	IV[11] = COUNT & 0xFF;
+
+	IV[12] = IV[4];
+	IV[13] = IV[5];
+	IV[14] = IV[6] ^ ((DIRECTION&1)<<7);
+	IV[15] = IV[7];
+
+	N = LENGTH + 64;
+	L = (N + 31) / 32;
+	z = (u32 *) malloc(L*sizeof(u32));
+	ZUC(IK, IV, z, L);
+
+	T = 0;
+	for (i = 0; i < LENGTH; i++) {
+		if (GET_BIT(M,i)) {
+			T ^= GET_WORD(z,i);
+		}
+	}
+	T ^= GET_WORD(z,LENGTH);
+
+	*MAC = T ^ z[L-1];
+	free(z);
+}
+
diff --git a/crypto/zuc/zuc_spec.h b/crypto/zuc/zuc_spec.h
new file mode 100644
index 00000000..e3d911ff
--- /dev/null
+++ b/crypto/zuc/zuc_spec.h
@@ -0,0 +1,71 @@
+/* ====================================================================
+ * Copyright (c) 2015 - 2016 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the GmSSL Project.
+ *    (http://gmssl.org/)"
+ *
+ * 4. The name "GmSSL Project" must not be used to endorse or promote
+ *    products derived from this software without prior written
+ *    permission. For written permission, please contact
+ *    guanzhi1980@gmail.com.
+ *
+ * 5. Products derived from this software may not be called "GmSSL"
+ *    nor may "GmSSL" appear in their names without prior written
+ *    permission of the GmSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the GmSSL Project
+ *    (http://gmssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE GmSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE GmSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ */
+/*
+ * code from ZUC 3GPP Specifications, version 1.6
+ */
+
+#ifndef HEADER_ZUC_SPEC_H
+#define HEADER_ZUC_SPEC_H
+
+typedef unsigned char u8;
+typedef unsigned int u32;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void ZUC(u8* k, u8* iv, u32* ks, int len);
+void EEA3(u8* CK, u32 COUNT, u32 BEARER, u32 DIRECTION, u32 LENGTH, u32* M, u32* C);
+void EIA3(u8* IK, u32 COUNT, u32 DIRECTION, u32 BEARER, u32 LENGTH, u32* M, u32* MAC);
+
+#ifdef __cplusplus
+}
+#endif
+#endif
+
diff --git a/include/openssl/zuc.h b/include/openssl/zuc.h
new file mode 100755
index 00000000..abd7dee8
--- /dev/null
+++ b/include/openssl/zuc.h
@@ -0,0 +1,115 @@
+/* ====================================================================
+ * Copyright (c) 2015 - 2016 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the GmSSL Project.
+ *    (http://gmssl.org/)"
+ *
+ * 4. The name "GmSSL Project" must not be used to endorse or promote
+ *    products derived from this software without prior written
+ *    permission. For written permission, please contact
+ *    guanzhi1980@gmail.com.
+ *
+ * 5. Products derived from this software may not be called "GmSSL"
+ *    nor may "GmSSL" appear in their names without prior written
+ *    permission of the GmSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the GmSSL Project
+ *    (http://gmssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE GmSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE GmSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ */
+
+#ifndef HEADER_ZUC_H
+#define HEADER_ZUC_H
+
+#include <stdint.h>
+#include <stdlib.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+typedef struct {
+	uint32_t state[22];
+} zuc_key_t;
+
+void zuc_set_key(zuc_key_t *key, const unsigned char *user_key, const unsigned char *iv);
+void zuc_generate_keystream(zuc_key_t *key, size_t nwords, uint32_t *words);
+
+
+typedef struct {
+	zuc_key_t key;
+	unsigned char buf[4];
+	size_t buflen;
+} zuc_ctx_t;
+
+void zuc_ctx_init(zuc_ctx_t *ctx, const unsigned char *user_key, const unsigned char *iv);
+void zuc_encrypt(zuc_ctx_t *ctx, size_t len, const unsigned char *in, unsigned char *out);
+#define zuc_decrypt(ctx,len,in,out)  zuc_encrypt(ctx,len,in,out)
+
+#define EEA3_MIN_BITS	1
+#define EEA3_MAX_BITS	65504
+#define EEA3_MIN_BYTES	((EEA3_MIN_BITS + 7)/8)
+#define EEA3_MAX_BYTES	((EEA3_MAX_BITS + 7)/8)
+
+typedef struct {
+	zuc_ctx_t zuc;
+	size_t length;
+	/* maybe buffer */
+} eea3_ctx_t;
+
+void eea3_init(eea3_ctx_t *ctx, const unsigned char *user_key, uint32_t count, uint32_t bearer, int direction);
+void eea3_encrypt(eea3_ctx_t *ctx, size_t len, const unsigned char *in, unsigned char *out);
+#define eea3_decrypt(ctx,len,in,out) eea3_encrypt(ctx,len,in,out)
+void eea3(const unsigned char *key, uint32_t count, uint32_t bearer, int direction,
+	size_t len, const unsigned char *in, unsigned char *out);
+
+#define EIA3_MIN_BYTES	EEA3_MIN_BYTES
+#define EIA3_MAX_BYTES	EEA3_MAX_BYTES
+#define EIA3_MAC_SIZE	4
+
+typedef struct {
+	zuc_ctx_t zuc;
+	size_t length;
+	/* maybe buffer */
+} eia3_ctx_t;
+
+void eia3_init(eia3_ctx_t *ctx, const unsigned char *user_key, uint32_t count, uint32_t bearer, int direction);
+void eia3_update(eia3_ctx_t *ctx, const unsigned char *data, size_t datalen);
+void eia3_final(eia3_ctx_t *ctx, uint32_t *mac);
+void eia3(const unsigned char *key, uint32_t count, uint32_t bearer, int direction,
+	const unsigned char *data, size_t len, uint32_t *mac);
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/test/build.info b/test/build.info
index 572d8703..602f95ef 100644
--- a/test/build.info
+++ b/test/build.info
@@ -19,7 +19,8 @@ IF[{- !$disabled{tests} -}]
           bioprinttest sslapitest dtlstest sslcorrupttest bio_enc_test \
           sm3test sms4test kdf2test eciestest ffxtest sm2test \
           pailliertest cpktest otptest gmapitest ec2test \
-          bfibetest bb1ibetest sm9test
+          bfibetest bb1ibetest sm9test \
+          saftest sdftest skftest softest zuctest
 
   SOURCE[aborttest]=aborttest.c
   INCLUDE[aborttest]=../include
@@ -342,6 +343,26 @@ IF[{- !$disabled{tests} -}]
   INCLUDE[sm9test]=../include
   DEPEND[sm9test]=../libcrypto
 
+  SOURCE[saftest]=saftest.c
+  INCLUDE[saftest]=../include
+  DEPEND[saftest]=../libcrypto
+
+  SOURCE[sdftest]=sdftest.c
+  INCLUDE[sdftest]=../include
+  DEPEND[sdftest]=../libcrypto
+
+  SOURCE[skftest]=skftest.c
+  INCLUDE[skftest]=../include
+  DEPEND[skftest]=../libcrypto
+
+  SOURCE[softest]=softest.c
+  INCLUDE[softest]=../include
+  DEPEND[softest]=../libcrypto
+
+  SOURCE[zuctest]=zuctest.c
+  INCLUDE[zuctest]=../include
+  DEPEND[zuctest]=../libcrypto
+
   IF[{- !$disabled{shared} -}]
     PROGRAMS_NO_INST=shlibloadtest
     SOURCE[shlibloadtest]=shlibloadtest.c
diff --git a/test/recipes/05-test_zuc.t b/test/recipes/05-test_zuc.t
new file mode 100644
index 00000000..47d303be
--- /dev/null
+++ b/test/recipes/05-test_zuc.t
@@ -0,0 +1,12 @@
+#! /usr/bin/env perl
+# Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved.
+#
+# Licensed under the OpenSSL license (the "License").  You may not use
+# this file except in compliance with the License.  You can obtain a copy
+# in the file LICENSE in the source distribution or at
+# https://www.openssl.org/source/license.html
+
+
+use OpenSSL::Test::Simple;
+
+simple_test("test_zuc", "zuctest", "zuc");
diff --git a/test/recipes/30-test_saf.t b/test/recipes/30-test_saf.t
new file mode 100644
index 00000000..2be82169
--- /dev/null
+++ b/test/recipes/30-test_saf.t
@@ -0,0 +1,12 @@
+#! /usr/bin/env perl
+# Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved.
+#
+# Licensed under the OpenSSL license (the "License").  You may not use
+# this file except in compliance with the License.  You can obtain a copy
+# in the file LICENSE in the source distribution or at
+# https://www.openssl.org/source/license.html
+
+
+use OpenSSL::Test::Simple;
+
+simple_test("test_saf", "saftest", "saf");
diff --git a/test/recipes/30-test_sdf.t b/test/recipes/30-test_sdf.t
new file mode 100644
index 00000000..5adcd612
--- /dev/null
+++ b/test/recipes/30-test_sdf.t
@@ -0,0 +1,12 @@
+#! /usr/bin/env perl
+# Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved.
+#
+# Licensed under the OpenSSL license (the "License").  You may not use
+# this file except in compliance with the License.  You can obtain a copy
+# in the file LICENSE in the source distribution or at
+# https://www.openssl.org/source/license.html
+
+
+use OpenSSL::Test::Simple;
+
+simple_test("test_sdf", "sdftest", "sdf");
diff --git a/test/recipes/30-test_skf.t b/test/recipes/30-test_skf.t
new file mode 100644
index 00000000..52ad3948
--- /dev/null
+++ b/test/recipes/30-test_skf.t
@@ -0,0 +1,12 @@
+#! /usr/bin/env perl
+# Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved.
+#
+# Licensed under the OpenSSL license (the "License").  You may not use
+# this file except in compliance with the License.  You can obtain a copy
+# in the file LICENSE in the source distribution or at
+# https://www.openssl.org/source/license.html
+
+
+use OpenSSL::Test::Simple;
+
+simple_test("test_skf", "skftest", "skf");
diff --git a/test/recipes/30-test_sof.t b/test/recipes/30-test_sof.t
new file mode 100644
index 00000000..36d0c301
--- /dev/null
+++ b/test/recipes/30-test_sof.t
@@ -0,0 +1,12 @@
+#! /usr/bin/env perl
+# Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved.
+#
+# Licensed under the OpenSSL license (the "License").  You may not use
+# this file except in compliance with the License.  You can obtain a copy
+# in the file LICENSE in the source distribution or at
+# https://www.openssl.org/source/license.html
+
+
+use OpenSSL::Test::Simple;
+
+simple_test("test_sof", "softest", "sof");
diff --git a/test/saftest.c b/test/saftest.c
new file mode 100644
index 00000000..091a5256
--- /dev/null
+++ b/test/saftest.c
@@ -0,0 +1,69 @@
+/* ====================================================================
+ * Copyright (c) 2014 - 2016 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the GmSSL Project.
+ *    (http://gmssl.org/)"
+ *
+ * 4. The name "GmSSL Project" must not be used to endorse or promote
+ *    products derived from this software without prior written
+ *    permission. For written permission, please contact
+ *    guanzhi1980@gmail.com.
+ *
+ * 5. Products derived from this software may not be called "GmSSL"
+ *    nor may "GmSSL" appear in their names without prior written
+ *    permission of the GmSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the GmSSL Project
+ *    (http://gmssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE GmSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE GmSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include "../e_os.h"
+
+#ifdef OPENSSL_NO_SAF
+int main(int argc, char **argv)
+{
+	printf("NO SAF support\n");
+	return 0;
+}
+#else
+# include <openssl/evp.h>
+
+int main(int argc, char **argv)
+{
+	int err = 0;
+	return err;
+}
+#endif
diff --git a/test/sdftest.c b/test/sdftest.c
new file mode 100644
index 00000000..9d6b16bf
--- /dev/null
+++ b/test/sdftest.c
@@ -0,0 +1,69 @@
+/* ====================================================================
+ * Copyright (c) 2014 - 2016 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the GmSSL Project.
+ *    (http://gmssl.org/)"
+ *
+ * 4. The name "GmSSL Project" must not be used to endorse or promote
+ *    products derived from this software without prior written
+ *    permission. For written permission, please contact
+ *    guanzhi1980@gmail.com.
+ *
+ * 5. Products derived from this software may not be called "GmSSL"
+ *    nor may "GmSSL" appear in their names without prior written
+ *    permission of the GmSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the GmSSL Project
+ *    (http://gmssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE GmSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE GmSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include "../e_os.h"
+
+#ifdef OPENSSL_NO_SDF
+int main(int argc, char **argv)
+{
+	printf("NO SDF support\n");
+	return 0;
+}
+#else
+# include <openssl/evp.h>
+
+int main(int argc, char **argv)
+{
+	int err = 0;
+	return err;
+}
+#endif
diff --git a/test/skftest.c b/test/skftest.c
new file mode 100644
index 00000000..7252e60a
--- /dev/null
+++ b/test/skftest.c
@@ -0,0 +1,69 @@
+/* ====================================================================
+ * Copyright (c) 2014 - 2016 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the GmSSL Project.
+ *    (http://gmssl.org/)"
+ *
+ * 4. The name "GmSSL Project" must not be used to endorse or promote
+ *    products derived from this software without prior written
+ *    permission. For written permission, please contact
+ *    guanzhi1980@gmail.com.
+ *
+ * 5. Products derived from this software may not be called "GmSSL"
+ *    nor may "GmSSL" appear in their names without prior written
+ *    permission of the GmSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the GmSSL Project
+ *    (http://gmssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE GmSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE GmSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include "../e_os.h"
+
+#ifdef OPENSSL_NO_SKF
+int main(int argc, char **argv)
+{
+	printf("NO SKF support\n");
+	return 0;
+}
+#else
+# include <openssl/evp.h>
+
+int main(int argc, char **argv)
+{
+	int err = 0;
+	return err;
+}
+#endif
diff --git a/test/softest.c b/test/softest.c
new file mode 100644
index 00000000..6f188213
--- /dev/null
+++ b/test/softest.c
@@ -0,0 +1,69 @@
+/* ====================================================================
+ * Copyright (c) 2014 - 2016 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the GmSSL Project.
+ *    (http://gmssl.org/)"
+ *
+ * 4. The name "GmSSL Project" must not be used to endorse or promote
+ *    products derived from this software without prior written
+ *    permission. For written permission, please contact
+ *    guanzhi1980@gmail.com.
+ *
+ * 5. Products derived from this software may not be called "GmSSL"
+ *    nor may "GmSSL" appear in their names without prior written
+ *    permission of the GmSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the GmSSL Project
+ *    (http://gmssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE GmSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE GmSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include "../e_os.h"
+
+#ifdef OPENSSL_NO_SOF
+int main(int argc, char **argv)
+{
+	printf("NO SOF support\n");
+	return 0;
+}
+#else
+# include <openssl/evp.h>
+
+int main(int argc, char **argv)
+{
+	int err = 0;
+	return err;
+}
+#endif
diff --git a/test/zuctest.c b/test/zuctest.c
new file mode 100644
index 00000000..46d11caf
--- /dev/null
+++ b/test/zuctest.c
@@ -0,0 +1,114 @@
+/* ====================================================================
+ * Copyright (c) 2014 - 2016 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the GmSSL Project.
+ *    (http://gmssl.org/)"
+ *
+ * 4. The name "GmSSL Project" must not be used to endorse or promote
+ *    products derived from this software without prior written
+ *    permission. For written permission, please contact
+ *    guanzhi1980@gmail.com.
+ *
+ * 5. Products derived from this software may not be called "GmSSL"
+ *    nor may "GmSSL" appear in their names without prior written
+ *    permission of the GmSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the GmSSL Project
+ *    (http://gmssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE GmSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE GmSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include "../e_os.h"
+
+#ifdef OPENSSL_NO_ZUC
+int main(int argc, char **argv)
+{
+	printf("NO ZUC support\n");
+	return 0;
+}
+#else
+# include <openssl/evp.h>
+# include <openssl/zuc.h>
+
+static int zuc_eia3_test1(void)
+{
+	unsigned char key[16] = {0};
+	uint32_t count = 0;
+	uint32_t bearer = 0;
+	int direction = 0;
+	uint32_t m[1] = {0};
+	uint32_t mac1 = 0xc8a9595e;
+	uint32_t mac2 = 0;
+
+	eia3(key, count, bearer, direction, m, sizeof(m), &mac2);
+	if (mac1 != mac2) {
+		return 0;
+	}
+
+	return 1;
+}
+
+static int zuc_eia3_test2(int verbose)
+{
+	unsigned char key[16] = {
+		0xc9, 0xe6, 0xce, 0xc4, 0x60, 0x7c, 0x72, 0xdb,
+		0x00, 0x0a, 0xef, 0xa8, 0x83, 0x85, 0xab, 0x0a,
+	};
+	uint32_t count = 0xa94059da;
+	uint32_t bearer = 0x0a;
+	int direction = 1;
+	int length = 241;
+	uint32_t m[] = {
+		0x01,
+	};
+	uint32_t mac1;
+	uint32_t mac2;
+
+	eia3(key, count, bearer, direction, m, sizeof(m), &mac2);
+	if (mac1 != mac2) {
+		return 0;
+	}
+
+	return 1;
+}
+
+int main(int argc, char **argv)
+{
+	int err = 0;
+
+
+	return err;
+}
+#endif
diff --git a/util/mkdef.pl b/util/mkdef.pl
index d1a3c245..6a0103e0 100755
--- a/util/mkdef.pl
+++ b/util/mkdef.pl
@@ -133,7 +133,7 @@ my @known_algorithms = ( "RC2", "RC4", "RC5", "IDEA", "DES", "BF",
                          # APPLINK (win build feature?)
                          "APPLINK",
                          "SM3", "SMS4", "KDF2", "ECIES", "FFX", "PAILLIER", "CPK", "OTP", "GMAPI", "EC2",
-                         "BFIBE", "BB1IBE", "SM9", "SAF", "SDF", "SKF", "SOF"
+                         "BFIBE", "BB1IBE", "SM9", "SAF", "SDF", "SKF", "SOF", "ZUC"
                      );
 
 my %disabled_algorithms;
diff --git a/util/shlib_wrap.sh b/util/shlib_wrap.sh
new file mode 100755
index 00000000..811a08d6
--- /dev/null
+++ b/util/shlib_wrap.sh
@@ -0,0 +1,92 @@
+#!/bin/sh
+
+[ $# -ne 0 ] || set -x		# debug mode without arguments:-)
+
+THERE="`echo $0 | sed -e 's|[^/]*$||' 2>/dev/null`.."
+[ -d "${THERE}" ] || exec "$@"	# should never happen...
+
+# Alternative to this is to parse ${THERE}/Makefile...
+LIBCRYPTOSO="${THERE}/libcrypto.so"
+if [ -f "$LIBCRYPTOSO" ]; then
+    while [ -h "$LIBCRYPTOSO" ]; do
+	LIBCRYPTOSO="${THERE}/`ls -l "$LIBCRYPTOSO" | sed -e 's|.*\-> ||'`"
+    done
+    SOSUFFIX=`echo ${LIBCRYPTOSO} | sed -e 's|.*\.so||' 2>/dev/null`
+    LIBSSLSO="${THERE}/libssl.so${SOSUFFIX}"
+fi
+
+SYSNAME=`(uname -s) 2>/dev/null`;
+case "$SYSNAME" in
+SunOS|IRIX*)
+	# SunOS and IRIX run-time linkers evaluate alternative
+	# variables depending on target ABI...
+	rld_var=LD_LIBRARY_PATH
+	case "`(/usr/bin/file "$LIBCRYPTOSO") 2>/dev/null`" in
+	*ELF\ 64*SPARC*|*ELF\ 64*AMD64*)
+		[ -n "$LD_LIBRARY_PATH_64" ] && rld_var=LD_LIBRARY_PATH_64
+		LD_PRELOAD_64="$LIBCRYPTOSO $LIBSSLSO"; export LD_PRELOAD_64
+		preload_var=LD_PRELOAD_64
+		;;
+	*ELF\ 32*SPARC*|*ELF\ 32*80386*)
+		# We only need to change LD_PRELOAD_32 and LD_LIBRARY_PATH_32
+		# on a multi-arch system.  Otherwise, trust the fallbacks.
+		if [ -f /lib/64/ld.so.1 ]; then
+		    [ -n "$LD_LIBRARY_PATH_32" ] && rld_var=LD_LIBRARY_PATH_32
+		    LD_PRELOAD_32="$LIBCRYPTOSO $LIBSSLSO"; export LD_PRELOAD_32
+		    preload_var=LD_PRELOAD_32
+		fi
+		;;
+	# Why are newly built .so's preloaded anyway? Because run-time
+	# .so lookup path embedded into application takes precedence
+	# over LD_LIBRARY_PATH and as result application ends up linking
+	# to previously installed .so's. On IRIX instead of preloading
+	# newly built .so's we trick run-time linker to fail to find
+	# the installed .so by setting _RLD_ROOT variable.
+	*ELF\ 32*MIPS*)
+		#_RLD_LIST="$LIBCRYPTOSO:$LIBSSLSO:DEFAULT"; export _RLD_LIST
+		_RLD_ROOT=/no/such/dir; export _RLD_ROOT
+		eval $rld_var=\"/usr/lib'${'$rld_var':+:$'$rld_var'}'\"
+		preload_var=_RLD_LIST
+		;;
+	*ELF\ N32*MIPS*)
+		[ -n "$LD_LIBRARYN32_PATH" ] && rld_var=LD_LIBRARYN32_PATH
+		#_RLDN32_LIST="$LIBCRYPTOSO:$LIBSSLSO:DEFAULT"; export _RLDN32_LIST
+		_RLDN32_ROOT=/no/such/dir; export _RLDN32_ROOT
+		eval $rld_var=\"/usr/lib32'${'$rld_var':+:$'$rld_var'}'\"
+		preload_var=_RLDN32_LIST
+		;;
+	*ELF\ 64*MIPS*)
+		[ -n "$LD_LIBRARY64_PATH"  ] && rld_var=LD_LIBRARY64_PATH
+		#_RLD64_LIST="$LIBCRYPTOSO:$LIBSSLSO:DEFAULT"; export _RLD64_LIST
+		_RLD64_ROOT=/no/such/dir; export _RLD64_ROOT
+		eval $rld_var=\"/usr/lib64'${'$rld_var':+:$'$rld_var'}'\"
+		preload_var=_RLD64_LIST
+		;;
+	esac
+	eval $rld_var=\"${THERE}'${'$rld_var':+:$'$rld_var'}'\"; export $rld_var
+	unset rld_var
+	;;
+*)	LD_LIBRARY_PATH="${THERE}:$LD_LIBRARY_PATH"	# Linux, ELF HP-UX
+	DYLD_LIBRARY_PATH="${THERE}:$DYLD_LIBRARY_PATH"	# MacOS X
+	SHLIB_PATH="${THERE}:$SHLIB_PATH"		# legacy HP-UX
+	LIBPATH="${THERE}:$LIBPATH"			# AIX, OS/2
+	export LD_LIBRARY_PATH DYLD_LIBRARY_PATH SHLIB_PATH LIBPATH
+	# Even though $PATH is adjusted [for Windows sake], it doesn't
+	# necessarily does the trick. Trouble is that with introduction
+	# of SafeDllSearchMode in XP/2003 it's more appropriate to copy
+	# .DLLs in vicinity of executable, which is done elsewhere...
+	if [ "$OSTYPE" != msdosdjgpp ]; then
+		PATH="${THERE}:$PATH"; export PATH
+	fi
+	;;
+esac
+
+
+
+cmd="$1"; [ -x "$cmd" ] || cmd="$cmd${EXE_EXT}"
+shift
+if [ $# -eq 0 ]; then
+	exec "$cmd"	# old sh, such as Tru64 4.x, fails to expand empty "$@"
+else
+	exec "$cmd" "$@"
+fi