Changeset 1045

Timestamp:

03/30/08 15:51:03 (8 months ago)

Author:

mbr

Message:

- Added hex_dump() feature for fwknop client so that raw encrypted SPA
packet data can be displayed in --verbose mode.

Files:

• fwknop/trunk/ChangeLog (modified) (1 diff)
• fwknop/trunk/fwknop (modified) (3 diffs)

fwknop/trunk/ChangeLog

@@ -12 +12 @@
-      IP does not have to be manually defined.  However, the external IP can
-      be defined by the SNAT_TRANSLATE_IP variable.
+    - Added hex_dump() feature for fwknop client so that raw encrypted SPA
+      packet data can be displayed in --verbose mode.
-    - When ENABLE_IPT_FORWARDING is set, added a check for the value of the
-      /proc/sys/net/ipv4/ip_forward file to ensure that the local system

fwknop/trunk/fwknop

@@ -684 +684 @@
-    }
-
+    if ($verbose) {
+        print "[+] Encrypted msg hex dump (" .
+            length($ctext) . " bytes):\n";
+        &hex_dump($ctext);
+    }
+
-    my $encoded_msg = encode_base64($ctext, '');
-
@@ -696 +702 @@
-        {
-            'key'    => $enc_key,
-
+,
-        }
-    );
-
+
+
+
+
+
+
+
+
+
+
-
-    ### Crypt::CBC adds the string "Salted__" to the beginning of the
@@ -1512 +1527 @@
-        die "[*] --digest-alg can accept one of MD5, SHA1, or SHA256";
-    }
+    return;
+}
+
+sub hex_dump() {
+    my $data = shift;
+
+    my @chars = split //, $data;
+    my $ctr = 0;
+    my $ascii_str = '';
+    for my $char (@chars) {
+        if ($ctr % 16 == 0) {
+            print " $ascii_str\n" if $ascii_str;
+            printf "        0x%.4x:  ", $ctr;
+            $ascii_str = '';
+        }
+        printf "%.2x", ord($char);
+
+        if ((($ctr+1) % 2 == 0) and ($ctr % 16 != 0)) {
+            print ' ';
+        }
+
+        if ($char =~ /[^\x20-\x7e]/) {
+            $ascii_str .= '.';
+        } else {
+            $ascii_str .= $char;
+        }
+        $ctr++;
+    }
+    if ($ascii_str) {
+        my $remainder = 1;
+        if ($ctr % 16 != 0) {
+            $remainder = 16 - $ctr % 16;
+            if ($remainder % 2 == 0) {
+                $remainder = 2*$remainder + int($remainder/2) + 1;
+            } else {
+                $remainder = 2*$remainder + int($remainder/2) + 2;
+            }
+        }
+        print ' 'x$remainder, $ascii_str;
+    }
+    print "\n";
-    return;
-}