securemail: update library and readme

[friendica-addons.git] / securemail / php-gpg / libs / GPG / Public_Key.php

diff --git a/securemail/php-gpg/libs/GPG/Public_Key.php b/securemail/php-gpg/libs/GPG/Public_Key.php
index 7b813079c751a7d4ad42f1087cb57b29f2cb5401..b46118d5832ebae2bf775d2938f2adaa6de36081 100644 (file)
--- a/securemail/php-gpg/libs/GPG/Public_Key.php
+++ b/securemail/php-gpg/libs/GPG/Public_Key.php
@@ -89,7 +89,7 @@ class GPG_Public_Key {
                                $len = ord($sa[$i++]);\r
                                if ($len > 191 && $len < 224) $len = (($len - 192) << 8) + ord($sa[$i++]);\r
                                else if ($len == 255) $len = (ord($sa[$i++]) << 24) + (ord($sa[$i++]) << 16) + (ord($sa[$i++]) << 8) + ord($sa[$i++]);\r
-                                       else if ($len > 223 && len < 255) $len = (1 << ($len & 0x1f));\r
+                                       else if ($len > 223 && $len < 255) $len = (1 << ($len & 0x1f));\r
                        } else {\r
                                $len = $tag & 3;\r
                                $tag = ($tag >> 2) & 15;\r
@@ -137,10 +137,11 @@ class GPG_Public_Key {
                                                \r
                                                // echo "POSITION: $delimPos\n";\r
                                                \r
-                                               $pkt = chr(0x99) . chr($delimPos >> 8) . chr($delimPos & 255) . substr($s, $headerPos, $delimPos);\r
+                                               // this does not work, tried it with RSA 1024 and RSA 4096 keys generated by GnuPG v2 (2.0.29) on Windows running Apache and PHP 5.6.3\r
+                                               // $pkt = chr(0x99) . chr($delimPos >> 8) . chr($delimPos & 255) . substr($s, $headerPos, $delimPos);\r
                                                \r
                                                // this is the original signing string which seems to have only worked for key lengths of 1024 or less\r
-                                               //$pkt = chr(0x99) . chr($len >> 8) . chr($len & 255) . substr($s, $k, $len);\r
+                                               $pkt = chr(0x99) . chr($len >> 8) . chr($len & 255) . substr($s, $k, $len); // use this for now\r
                                                \r
                                                $fp = sha1($pkt);\r
                                                $this->fp = $fp;\r
@@ -214,4 +215,4 @@ class GPG_Public_Key {
        }\r
 }\r
 \r
-?>
\ No newline at end of file
+?>\r