diff --git a/[refs] b/[refs]
index 43e5cdd7c1ff..ba509f30627a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ef2736fc741316913a457abd3731053071c86241
+refs/heads/master: 3cc3816f93e3f94f88503da8e6090302fa986bd6
diff --git a/trunk/crypto/tcrypt.c b/trunk/crypto/tcrypt.c
index 5a95b4a14c2b..85a88a71ff53 100644
--- a/trunk/crypto/tcrypt.c
+++ b/trunk/crypto/tcrypt.c
@@ -266,16 +266,16 @@ static void test_cipher(char *algo, int mode, int enc,
 	char *key;
 	struct cipher_testvec *cipher_tv;
 	struct scatterlist sg[8];
-	char e[11], m[4];
+	const char *e, *m;
 
 	if (enc == ENCRYPT)
-	        strncpy(e, "encryption", 11);
+	        e = "encryption";
 	else
-		strncpy(e, "decryption", 11);
+		e = "decryption";
 	if (mode == MODE_ECB)
-		strncpy(m, "ECB", 4);
+		m = "ECB";
 	else
-		strncpy(m, "CBC", 4);
+		m = "CBC";
 
 	printk("\ntesting %s %s %s\n", algo, m, e);