Disabled vpsm4_cbc and vpsm4_ex_cbc in cipher_sm4_hw.c.

Author: yapolyak

include/crypto/sm4_platform.h

@@ -18,15 +18,10 @@ extern unsigned int OPENSSL_arm_midr;
 static inline int vpsm4_capable(void)
 {
     return (OPENSSL_armcap_P & ARMV7_NEON);
-    //return (OPENSSL_armcap_P & ARMV8_CPUID) &&
-    //        (MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_ARM, ARM_CPU_PART_V1) ||
-    //         MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_ARM, ARM_CPU_PART_N1));
 }
 static inline int vpsm4_ex_capable(void)
 {
     return (OPENSSL_armcap_P & (ARMV7_NEON | ARMV8_AES));
-    //return (OPENSSL_armcap_P & ARMV8_CPUID) &&
-    //        (MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, HISI_CPU_IMP, HISI_CPU_PART_KP920));
 }
 #   if defined(VPSM4_ASM)
 #    define VPSM4_CAPABLE vpsm4_capable()

providers/implementations/ciphers/cipher_sm4_hw.c

@@ -43,26 +43,22 @@ static int cipher_hw_sm4_initkey(PROV_CIPHER_CTX *ctx,
         } else
 #endif
 #ifdef VPSM4_EX_CAPABLE
-        if (VPSM4_EX_CAPABLE) {
+        if (VPSM4_EX_CAPABLE && (ctx->mode != EVP_CIPH_CBC_MODE)) {
             vpsm4_ex_set_encrypt_key(key, ks);
             ctx->block = (block128_f)vpsm4_ex_encrypt;
             ctx->stream.cbc = NULL;
-            if (ctx->mode == EVP_CIPH_CBC_MODE)
-                ctx->stream.cbc = (cbc128_f)vpsm4_ex_cbc_encrypt;
-            else if (ctx->mode == EVP_CIPH_ECB_MODE)
+            if (ctx->mode == EVP_CIPH_ECB_MODE)
                 ctx->stream.ecb = (ecb128_f)vpsm4_ex_ecb_encrypt;
             else if (ctx->mode == EVP_CIPH_CTR_MODE)
                 ctx->stream.ctr = (ctr128_f)vpsm4_ex_ctr32_encrypt_blocks;
         } else
 #endif
 #ifdef VPSM4_CAPABLE
-        if (VPSM4_CAPABLE) {
+        if (VPSM4_CAPABLE && (ctx->mode != EVP_CIPH_CBC_MODE)) {
             vpsm4_set_encrypt_key(key, ks);
             ctx->block = (block128_f)vpsm4_encrypt;
             ctx->stream.cbc = NULL;
-            if (ctx->mode == EVP_CIPH_CBC_MODE)
-                ctx->stream.cbc = (cbc128_f)vpsm4_cbc_encrypt;
-            else if (ctx->mode == EVP_CIPH_ECB_MODE)
+            if (ctx->mode == EVP_CIPH_ECB_MODE)
                 ctx->stream.ecb = (ecb128_f)vpsm4_ecb_encrypt;
             else if (ctx->mode == EVP_CIPH_CTR_MODE)
                 ctx->stream.ctr = (ctr128_f)vpsm4_ctr32_encrypt_blocks;
@@ -89,23 +85,19 @@ static int cipher_hw_sm4_initkey(PROV_CIPHER_CTX *ctx,
         } else
 #endif
 #ifdef VPSM4_EX_CAPABLE
-        if (VPSM4_EX_CAPABLE) {
+        if (VPSM4_EX_CAPABLE && (ctx->mode != EVP_CIPH_CBC_MODE)) {
             vpsm4_ex_set_decrypt_key(key, ks);
             ctx->block = (block128_f)vpsm4_ex_decrypt;
             ctx->stream.cbc = NULL;
-            if (ctx->mode == EVP_CIPH_CBC_MODE)
-                ctx->stream.cbc = (cbc128_f)vpsm4_ex_cbc_encrypt;
             else if (ctx->mode == EVP_CIPH_ECB_MODE)
                 ctx->stream.ecb = (ecb128_f)vpsm4_ex_ecb_encrypt;
         } else
 #endif
 #ifdef VPSM4_CAPABLE
-        if (VPSM4_CAPABLE) {
+        if (VPSM4_CAPABLE && (ctx->mode != EVP_CIPH_CBC_MODE)) {
             vpsm4_set_decrypt_key(key, ks);
             ctx->block = (block128_f)vpsm4_decrypt;
             ctx->stream.cbc = NULL;
-            if (ctx->mode == EVP_CIPH_CBC_MODE)
-                ctx->stream.cbc = (cbc128_f)vpsm4_cbc_encrypt;
             else if (ctx->mode == EVP_CIPH_ECB_MODE)
                 ctx->stream.ecb = (ecb128_f)vpsm4_ecb_encrypt;
         } else