123

@@ -29,11 +29,15 @@ class WXBizDataCrypt
      */
      */
     public function decryptData( $encryptedData, $iv, &$data )
     public function decryptData( $encryptedData, $iv, &$data )
     {
     {
-
+        if (strlen($this->sessionKey) != 24) {
+            return ErrorCode::$IllegalAesKey;
+        }
         $aesKey=base64_decode($this->sessionKey);
         $aesKey=base64_decode($this->sessionKey);
 
 
 
 
-
+        if (strlen($iv) != 24) {
+            return ErrorCode::$IllegalIv;
+        }
         $aesIV=base64_decode($iv);
         $aesIV=base64_decode($iv);
 
 
         $aesCipher=base64_decode($encryptedData);
         $aesCipher=base64_decode($encryptedData);
@@ -41,10 +45,24 @@ class WXBizDataCrypt
         $result=openssl_decrypt( $aesCipher, "AES-128-CBC", $aesKey, 1, $aesIV);
         $result=openssl_decrypt( $aesCipher, "AES-128-CBC", $aesKey, 1, $aesIV);
 
 
         $dataObj=json_decode( $result );
         $dataObj=json_decode( $result );
-
-
+        if( $dataObj  == NULL )
+        {
+            return ErrorCode::$IllegalBuffer;
+        }
+        if( $dataObj->watermark->appid != $this->appid )
+        {
+            return ErrorCode::$IllegalBuffer;
+        }
         $data = $result;
         $data = $result;
-
+        return  ErrorCode::$OK;
     }
     }
 
 
 }
 }
+class ErrorCode
+{
+    public static $OK = 0;
+    public static $IllegalAesKey = -41001;
+    public static $IllegalIv = -41002;
+    public static $IllegalBuffer = -41003;
+    public static $DecodeBase64Error = -41004;
+}