diff --git a/crypto/speck/speck.c b/crypto/speck/speck.c
index 1b95eb03..0fcbd9e6 100644
--- a/crypto/speck/speck.c
+++ b/crypto/speck/speck.c
@@ -49,61 +49,146 @@
 
 #include <openssl/speck.h>
 
-#define ROR(x, r) ((x >> r) | (x << ((sizeof(SPECK_TYPE) * 8) - r)))//循环右移
-#define ROL(x, r) ((x << r) | (x >> ((sizeof(SPECK_TYPE) * 8) - r)))//循环左移
-
-#ifdef SPECK_32_64
-#define R(x, y, k) (x = ROR(x, 7), x += y, x ^= k, y = ROL(y, 2), y ^= x)
-#define RR(x, y, k) (y ^= x, y = ROR(y, 2), x ^= k, x -= y, x = ROL(x, 7))
-#else
-#define R(x, y, k) (x = ROR(x, 8), x += y, x ^= k, y = ROL(y, 3), y ^= x)
-#define RR(x, y, k) (y ^= x, y = ROR(y, 3), x ^= k, x -= y, x = ROL(x, 8))
-#endif
-
-void speck_set_encrypt_key(speck_key_t *key, const unsigned char *user_key)
+void speck_set_encrypt_key16(SPECK_TYPE16 const K[SPECK_KEY_LEN16], SPECK_TYPE16 S[SPECK_ROUNDS16])
 {
-	int i;
-	for (i = 0; i < num_word; i++)
-	{
-		if (user_key[i] == '\0')
-			break;
-		key->rk[i] = user_key[i];
-	}
-	int j = 0;
-	for (; i < num_word; i++)
-	{
-		key->rk[i] = user_key[j++];
-	}
-}
-void speck_expand(SPECK_TYPE const K[ SPECK_KEY_LEN], SPECK_TYPE S[ SPECK_ROUNDS])
-{
-	SPECK_TYPE i, b = K[0];
-	SPECK_TYPE a[SPECK_KEY_LEN - 1];
-	for (i = 0; i < (SPECK_KEY_LEN - 1); i++)
+	SPECK_TYPE16 i, b = K[0];
+	SPECK_TYPE16 a[SPECK_KEY_LEN16 - 1];
+	for (i = 0; i < (SPECK_KEY_LEN16 - 1); i++)
 	{
 		a[i] = K[i + 1];
 	}
 	S[0] = b;
-	for (i = 0; i < SPECK_ROUNDS - 1; i++) {
-		R(a[i % (SPECK_KEY_LEN - 1)], b, i);
+	for (i = 0; i < SPECK_ROUNDS16 - 1; i++) {
+		R16(a[i % (SPECK_KEY_LEN16 - 1)], b, i);
 		S[i + 1] = b;
 	}
 }
-void speck_encrypt(SPECK_TYPE const pt[ 2], SPECK_TYPE ct[ 2], SPECK_TYPE const K[ SPECK_ROUNDS])
+void speck_set_decrypt_key16(SPECK_TYPE16 const K[SPECK_KEY_LEN16], SPECK_TYPE16 S[SPECK_ROUNDS16])
 {
-	SPECK_TYPE i;
+	SPECK_TYPE16 i, b = K[0];
+	SPECK_TYPE16 a[SPECK_KEY_LEN16 - 1];
+	for (i = 0; i < (SPECK_KEY_LEN16 - 1); i++)
+	{
+		a[i] = K[i + 1];
+	}
+	S[0] = b;
+	for (i = 0; i < SPECK_ROUNDS16 - 1; i++) {
+		R16(a[i % (SPECK_KEY_LEN16 - 1)], b, i);
+		S[i + 1] = b;
+	}
+}
+void speck_encrypt16(SPECK_TYPE16 const pt[2], SPECK_TYPE16 ct[2], SPECK_TYPE16 const K[SPECK_ROUNDS16])
+{
+	SPECK_TYPE16 i;
 	ct[0] = pt[0]; ct[1] = pt[1];
-	for (i = 0; i < SPECK_ROUNDS; i++){
-		R(ct[1], ct[0], K[i]);
+	for (i = 0; i < SPECK_ROUNDS16; i++){
+		R16(ct[1], ct[0], K[i]);
 	}
 }
 
-void speck_decrypt(SPECK_TYPE const ct[ 2], SPECK_TYPE pt[ 2], SPECK_TYPE const K[ SPECK_ROUNDS])
+void speck_decrypt16(SPECK_TYPE16 const ct[2], SPECK_TYPE16 pt[2], SPECK_TYPE16 const K[SPECK_ROUNDS16])
 {
-	SPECK_TYPE i;
+	SPECK_TYPE16 i;
 	pt[0] = ct[0]; pt[1] = ct[1];
 
-	for (i = 0; i < SPECK_ROUNDS; i++){
-		RR(pt[1], pt[0], K[(SPECK_ROUNDS - 1) - i]);
+	for (i = 0; i < SPECK_ROUNDS16; i++){
+		RR16(pt[1], pt[0], K[(SPECK_ROUNDS16 - 1) - i]);
+	}
+}
+
+
+
+void speck_set_encrypt_key32(SPECK_TYPE32 const K[SPECK_KEY_LEN32], SPECK_TYPE32 S[SPECK_ROUNDS32])
+{
+	SPECK_TYPE32 i, b = K[0];
+	SPECK_TYPE32 a[SPECK_KEY_LEN32 - 1];
+	for (i = 0; i < (SPECK_KEY_LEN32 - 1); i++)
+	{
+		a[i] = K[i + 1];
+	}
+	S[0] = b;
+	for (i = 0; i < SPECK_ROUNDS32 - 1; i++) {
+		R32(a[i % (SPECK_KEY_LEN32 - 1)], b, i);
+		S[i + 1] = b;
+	}
+}
+void speck_set_decrypt_key32(SPECK_TYPE32 const K[SPECK_KEY_LEN32], SPECK_TYPE32 S[SPECK_ROUNDS32])
+{
+	SPECK_TYPE32 i, b = K[0];
+	SPECK_TYPE32 a[SPECK_KEY_LEN32 - 1];
+	for (i = 0; i < (SPECK_KEY_LEN32 - 1); i++)
+	{
+		a[i] = K[i + 1];
+	}
+	S[0] = b;
+	for (i = 0; i < SPECK_ROUNDS32 - 1; i++) {
+		R32(a[i % (SPECK_KEY_LEN32 - 1)], b, i);
+		S[i + 1] = b;
+	}
+}
+void speck_encrypt32(SPECK_TYPE32 const pt[2], SPECK_TYPE32 ct[2], SPECK_TYPE32 const K[SPECK_ROUNDS32])
+{
+	SPECK_TYPE32 i;
+	ct[0] = pt[0]; ct[1] = pt[1];
+	for (i = 0; i < SPECK_ROUNDS32; i++){
+		R32(ct[1], ct[0], K[i]);
+	}
+}
+
+void speck_decrypt32(SPECK_TYPE32 const ct[2], SPECK_TYPE32 pt[2], SPECK_TYPE32 const K[SPECK_ROUNDS32])
+{
+	SPECK_TYPE32 i;
+	pt[0] = ct[0]; pt[1] = ct[1];
+
+	for (i = 0; i < SPECK_ROUNDS32; i++){
+		RR32(pt[1], pt[0], K[(SPECK_ROUNDS32 - 1) - i]);
+	}
+}
+
+
+void speck_set_encrypt_key64(SPECK_TYPE64 const K[SPECK_KEY_LEN64], SPECK_TYPE64 S[SPECK_ROUNDS64])
+{
+	SPECK_TYPE64 i, b = K[0];
+	SPECK_TYPE64 a[SPECK_KEY_LEN64 - 1];
+	for (i = 0; i < (SPECK_KEY_LEN64 - 1); i++)
+	{
+		a[i] = K[i + 1];
+	}
+	S[0] = b;
+	for (i = 0; i < SPECK_ROUNDS64 - 1; i++) {
+		R64(a[i % (SPECK_KEY_LEN64 - 1)], b, i);
+		S[i + 1] = b;
+	}
+}
+void speck_set_decrypt_key64(SPECK_TYPE64 const K[SPECK_KEY_LEN64], SPECK_TYPE64 S[SPECK_ROUNDS64])
+{
+	SPECK_TYPE64 i, b = K[0];
+	SPECK_TYPE64 a[SPECK_KEY_LEN64 - 1];
+	for (i = 0; i < (SPECK_KEY_LEN64 - 1); i++)
+	{
+		a[i] = K[i + 1];
+	}
+	S[0] = b;
+	for (i = 0; i < SPECK_ROUNDS64 - 1; i++) {
+		R64(a[i % (SPECK_KEY_LEN64 - 1)], b, i);
+		S[i + 1] = b;
+	}
+}
+void speck_encrypt64(SPECK_TYPE64 const pt[2], SPECK_TYPE64 ct[2], SPECK_TYPE64 const K[SPECK_ROUNDS64])
+{
+	SPECK_TYPE64 i;
+	ct[0] = pt[0]; ct[1] = pt[1];
+	for (i = 0; i < SPECK_ROUNDS64; i++){
+		R64(ct[1], ct[0], K[i]);
+	}
+}
+
+void speck_decrypt64(SPECK_TYPE64 const ct[2], SPECK_TYPE64 pt[2], SPECK_TYPE64 const K[SPECK_ROUNDS64])
+{
+	SPECK_TYPE64 i;
+	pt[0] = ct[0]; pt[1] = ct[1];
+
+	for (i = 0; i < SPECK_ROUNDS64; i++){
+		RR64(pt[1], pt[0], K[(SPECK_ROUNDS64 - 1) - i]);
 	}
 }