Update

hpcc-systems · Jan 6, 2025 · 0fb9b31 · 0fb9b31
1 parent f8a60c3
commit 0fb9b31
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/ecllibrary/teststd/Crypto/TestCrypto_SKE.ecl b/ecllibrary/teststd/Crypto/TestCrypto_SKE.ecl
@@ -38,5 +38,10 @@ EXPORT TestCrypto_SKE := MODULE
     EXPORT DATA dat2 := mod.Encrypt(          (DATA)'0123456789~`!@#$%^&*()-_=+|][}{;:?.>,<');
     EXPORT TS05 := ASSERT(mod.Decrypt(dat2) = (DATA)'0123456789~`!@#$%^&*()-_=+|][}{;:?.>,<');
   END;
+
+  EXPORT TestSKE05 := MODULE // HPCC-33157
+    EXPORT mod := Std.Crypto.SymmetricEncryption('aes-256-cbc', '01234567890123456789012345678901');
+    EXPORT TS05 := ASSERT(mod.Decrypt((DATA)'') = (DATA)'');
+  END;
 END;
 
diff --git a/plugins/cryptolib/cryptolib.cpp b/plugins/cryptolib/cryptolib.cpp
@@ -158,6 +158,10 @@ static void symmDeserialize(size32_t lenPBuffer, const void * pBuffer, StringBuf
 
         sbCipher.append(len, finger);//extract cipher name
     }
+    else
+    {
+        *lenPlainText = 0;
+    }
 }
 
 static void symmSerialize(void * & result, size32_t & lenResult, const char * pIV, size32_t lenIV, size32_t lenPlainText, size32_t lenCipherBuff, const void * pCipherBuff)
-Original file line number
+Diff line change
@@ Expand Up @@
             sbCipher.append(len, finger);//extract cipher name
         }
+        else
+        {
+            *lenPlainText = 0;
+        }
     }
     static void symmSerialize(void * & result, size32_t & lenResult, const char * pIV, size32_t lenIV, size32_t lenPlainText, size32_t lenCipherBuff, const void * pCipherBuff)
@@ Expand Down @@