修改执行错误时的处理方式，从退出程序改为抛出异常

Author: idleGG

Bytes.php

@@ -153,7 +153,7 @@ public static function hexStringToBytes($hex) {
         }
         return $result;
     }
-    
+
 
     private static $hexStr = array('0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F');
     public static function bytesToHexstring($bytesArray){

README.md

@@ -27,34 +27,43 @@ and open the template in the editor.
         $socket = socket_create(AF_INET, SOCK_STREAM, SOL_TCP);
         var_dump($socket);
         $result=socket_connect($socket,$srvIp,$srvPort);
+
         if($result){
-            echo "连接成功<br />";
+            echo "连接成功\n";
+			$key = "RAD2F4FC1E7898465AD2F4FC1E7898465";
+			//$key = 1;
 
             //明文数据
             $dataArray = array("Message1 to be Encrypted", "第二个待加密数据", "\x00\x01\x02\x03");
 
             $tmp1 = "一个测试程序。";
-            echo "字符串长：".strlen($tmp1)."<br />";
+            echo "字符串长：".strlen($tmp1)."\n";
             $tmp2 = Bytes::getBytes($tmp1);
-            echo "数组长：".count($tmp2)."<br />";
+            echo "数组长：".count($tmp2)."\n";
 
-            try{
 
+            try{
                 // 此方法为多块数据加密
-                $rsp3 = cmds::SW_blocksEncrypt($socket, 0, 0x00A, 1, null, 0, null, 0, null, $dataArray);
-                for($i = 0; $i<count($dataArray); $i++){
-                    echo "<br />Cipher:".$i.$rsp3[$i]."<br />";
+				$rsp3 = cmds::SW_blocksEncrypt($socket, 0, 0x00A, $key, null, 0, null, 0, null, $dataArray);
+				echo "rsp3 ArrayLength=".count($rsp3)."\n";
+                for($i = 0; $i<count($rsp3); $i++){
+                    echo "\nCipher:".$i.$rsp3[$i]."\n";
                     var_dump(Bytes::getBytes($rsp3[$i]));    //加密后数据密文转为字节数组查看
                 }
+            }catch(Exception $e){   //失败时抛出异常，如密码机报错则异常信息中包含错误码
+                echo 'Encrypt Failed, Message: ' .$e->getMessage();
+            }
 
+            try{
                 // 此方法为多块数据解密
-                $rsp4 = cmds::SW_blocksDecrypt($socket, 0, 0x00A, 1, null, 0, null, 0, null, $rsp3);
-                for($i = 0; $i<count($dataArray); $i++){
-                    echo "<br />Plain:".$i.$rsp4[$i]."<br />";  //以字符串形式打印解密后的明文信息
+				$rsp4 = cmds::SW_blocksDecrypt($socket, 0, 0x00A, $key, null, 0, null, 0, null, $rsp3);
+				echo "rsp4 ArrayLength=".count($rsp4)."\n";
+                for($i = 0; $i<count($rsp4); $i++){
+                    echo "\nPlain:".$i.$rsp4[$i]."\n";  //以字符串形式打印解密后的明文信息
                     var_dump(Bytes::getBytes($rsp4[$i]));   //解密后数据密文转为字节数组查看
                 }
             }catch(Exception $e){   //失败时抛出异常，如密码机报错则异常信息中包含错误码
-                echo 'Message: ' .$e->getMessage();
+                echo 'Decrypt Failed, Message: ' .$e->getMessage();
             }
         }
         socket_close($socket);
@@ -69,7 +78,7 @@ and open the template in the editor.
 public static function SW_blocksEncrypt(
     $socket,
     $encFlag,
-    $keyType,
+    $keyTpe,
     $key,
     $deriveFactor,
     $sessionKeyFlag,

cmds.php

@@ -34,12 +34,14 @@ public static function SW_blocksEncrypt( $socket,
             $dataArray){
         $str = "SW0";
         if(is_int($encFlag) && $encFlag >= 0){ $str = $str.sprintf("%02X", $encFlag); }
-        else{ die("Invalid argument \$encFlag=$encFlag"); }
+		else{
+			throw new Exception("Invalid argument \$encFlag=$encFlag");
+		}
         if(is_int($keyType) & $keyType >= 0){ $str = $str.sprintf("%03X", $keyType); }
-        else{ die("Invalid argument \$keyType=$keyType"); }
+        else{ throw new Exception("Invalid argument \$keyType=$keyType"); }
         if(is_int($key) && $key > 0 && $key <= 9999){ $str = $str.sprintf("K%04d", $key); }
         else if(!is_null($key) && is_string($key) && (strlen($key) == 16 || (strlen($key)-1)%32 == 0)){ $str = $str.$key; }
-        else{ die("Invalid argument \$key=$key"); }
+        else{ throw new Exception("Invalid argument \$key=$key"); }
         if(!is_null($deriveFactor) && is_string($deriveFactor)){
             $str = $str.sprintf("%02X", strlen($deriveFactor)/32);
             $str = $str.$deriveFactor;
@@ -48,7 +50,7 @@ public static function SW_blocksEncrypt( $socket,
             $str = $str."00";
         }
         else{
-            die("Invalid argument \$deriveFactor=$deriveFactor");
+            throw new Exception("Invalid argument \$deriveFactor=$deriveFactor");
         }
         if(is_int($sessionKeyFlag) && $sessionKeyFlag >= 0){
             $str = $str.sprintf("%02X", $sessionKeyFlag);
@@ -60,7 +62,7 @@ public static function SW_blocksEncrypt( $socket,
             $str = $str.sprintf("%02X", $paddingFlag);
         }
         else {
-            die("Invalid argument \$paddingFlag=$paddingFlag");
+            throw new Exception("Invalid argument \$paddingFlag=$paddingFlag");
         }
 
         if(!is_null($dataArray) && is_array($dataArray)){
@@ -79,13 +81,19 @@ public static function SW_blocksEncrypt( $socket,
         socket_write($socket, $str, strlen($str));
         $rsp=socket_read($socket,2);
         if($rsp == FALSE){
-            die(socket_strerror(socket_last_error()));
+            throw new Exception(socket_strerror(socket_last_error()));
         }
         $len = Bytes::bytesToShortBigEnd(Bytes::getBytes($rsp), 0);
         $rsp = socket_read($socket, $len);
         if($rsp == FALSE){
-            die(socket_strerror(socket_last_error()));
+            throw new Exception(socket_strerror(socket_last_error()));
         }
+
+		$rv = intval(substr($rsp, 2, 2));
+		if($rv !== 0){
+			throw new Exception("Failed with returnCode [".$rv."].\n");
+		}
+
 
         $ret = array();
         $offset = 4;
@@ -190,6 +198,12 @@ public static function SW_blocksDecrypt( $socket,
         if($rsp == FALSE){
             throw new Exception(socket_strerror());
         }
+
+		$rv = intval(substr($rsp, 2, 2));
+		if($rv !== 0){
+			throw new Exception("Failed with returnCode [".$rv."].\n");
+		}
+
         $ret = array();
         $offset = 4;
         while($offset < $len){