[commits] Horde branch master updated. c99fa0f654f973845e8cee0a5fba87e5641fde79
Michael M Slusarz
slusarz at horde.org
Mon Apr 13 20:27:17 UTC 2015
The branch "master" has been updated.
The following is a summary of the commits.
from: de6bcf02b3ce48de2eaf4b38669b8caebb38ed53
b3efd15 Added support for symmetric encryption/decryption
6733ef5 [mms] Add support for outputting comment information when writing an address.
c7e576f Fixed issue with upstream code.
14d1fa3 Implement generateKey()
baabfcb Another upstream change: chunk armored output
cdaeecc Add version information to output private key
d7c8819 Add support for decrypting private keys
a4e7d83 Implement support for generating encrypted private keys
b36acac Remove support for PECL driver
fb12315 Add RSA key tests
bb2bca6 Initial implementation of encrypt()
4f465c4 Only use LF when wrapping armor text
358d04c Return the object, not the classname
bde27a3 Initial decrypt() implementation
16827ea Initial support for PGP signing
e799931 Add subkey to generated key.
bb48a21 Add Horde_Pgp_Element_Key#getKeyList()
9e802e9 Use the proper encryption subkey when encrypting
e12d599 Signed message does not include CRLF before armor header
c99fa0f Initial implementation of verify methods
Summary: http://github.com/horde/horde/compare/de6bcf02b3ce48de2eaf4b38669b8caebb38ed53...c99fa0f654f973845e8cee0a5fba87e5641fde79
-----------------------------------------------------------------------
commit b3efd152b2b1a449e1075b9eba918a52e59f8b9e
Author: Michael M Slusarz <slusarz at horde.org>
Date: Thu Apr 9 23:22:58 2015 -0600
Added support for symmetric encryption/decryption
Of course our unit tests happened to use the one cipher (CAST) that is
not natively supported by phpseclib, which necessitated hours of extra
work to deal with. sigh.
framework/Pgp/bundle/CHANGED | 5 +
.../vendor/singpolyma/openpgp-php/lib/openpgp_crypt_symmetric.php | 5 +
framework/Pgp/lib/Horde/Pgp.php | 8 +-
framework/Pgp/lib/Horde/Pgp/Backend.php | 10 +-
framework/Pgp/lib/Horde/Pgp/Backend/Openpgp.php | 30 ++
framework/Pgp/lib/Horde/Pgp/Crypt/Cast128.php | 95 +++++
framework/Pgp/lib/Horde/Pgp/Element/Armored.php | 10 +-
framework/Pgp/lib/Horde/Pgp/Element/PrivateKey.php | 4 +-
framework/Pgp/package.xml | 9 +
framework/Pgp/test/Horde/Pgp/Backend/TestBase.php | 48 +++
10 files changed, 214 insertions(+), 10 deletions(-)
create mode 100644 framework/Pgp/bundle/CHANGED
create mode 100644 framework/Pgp/lib/Horde/Pgp/Crypt/Cast128.php
http://github.com/horde/horde/commit/b3efd152b2b1a449e1075b9eba918a52e59f8b9e
-----------------------------------------------------------------------
commit 6733ef5bd05464f72986e1321fc95493748e54e5
Author: Michael M Slusarz <slusarz at horde.org>
Date: Fri Apr 10 19:00:53 2015 -0600
[mms] Add support for outputting comment information when writing an address.
framework/Mail/doc/Horde/Mail/UPGRADING | 14 +++++
framework/Mail/lib/Horde/Mail/Rfc822.php | 18 ++++--
framework/Mail/lib/Horde/Mail/Rfc822/Address.php | 7 ++-
framework/Mail/lib/Horde/Mail/Rfc822/Group.php | 9 +++-
framework/Mail/lib/Horde/Mail/Rfc822/Object.php | 3 +
framework/Mail/package.xml | 12 ++--
framework/Mail/test/Horde/Mail/ObjectTest.php | 69 ++++++++++++++++++++++
7 files changed, 118 insertions(+), 14 deletions(-)
http://github.com/horde/horde/commit/6733ef5bd05464f72986e1321fc95493748e54e5
-----------------------------------------------------------------------
commit c7e576f1b420657f4e8da1f94ff3e0bb54b026b3
Author: Michael M Slusarz <slusarz at horde.org>
Date: Fri Apr 10 19:18:14 2015 -0600
Fixed issue with upstream code.
RSA.php was loaded via require, not require_once.
framework/Pgp/bundle/CHANGED | 4 ++++
.../vendor/singpolyma/openpgp-php/lib/openpgp_crypt_rsa.php | 5 ++++-
2 files changed, 8 insertions(+), 1 deletions(-)
http://github.com/horde/horde/commit/c7e576f1b420657f4e8da1f94ff3e0bb54b026b3
-----------------------------------------------------------------------
commit 14d1fa37a302100dabaab40a57e398985a60fa65
Author: Michael M Slusarz <slusarz at horde.org>
Date: Fri Apr 10 19:35:01 2015 -0600
Implement generateKey()
Doesn't support passphrase encryption of the key yet
framework/Pgp/lib/Horde/Pgp.php | 21 +++-----
framework/Pgp/lib/Horde/Pgp/Backend.php | 5 +--
framework/Pgp/lib/Horde/Pgp/Backend/Openpgp.php | 53 +++++++++++++++++++++
framework/Pgp/test/Horde/Pgp/Backend/PeclTest.php | 7 +++
framework/Pgp/test/Horde/Pgp/Backend/TestBase.php | 20 ++++++++
5 files changed, 89 insertions(+), 17 deletions(-)
http://github.com/horde/horde/commit/14d1fa37a302100dabaab40a57e398985a60fa65
-----------------------------------------------------------------------
commit baabfcb8be9d9faa55e82b90d7723f1a47ba92c8
Author: Michael M Slusarz <slusarz at horde.org>
Date: Fri Apr 10 22:31:34 2015 -0600
Another upstream change: chunk armored output
framework/Pgp/bundle/CHANGED | 4 ++++
.../Pgp/bundle/vendor/singpolyma/openpgp-php/lib/openpgp.php | 5 ++++-
2 files changed, 8 insertions(+), 1 deletions(-)
http://github.com/horde/horde/commit/baabfcb8be9d9faa55e82b90d7723f1a47ba92c8
-----------------------------------------------------------------------
commit cdaeecc575ee8d1749738cddbf0c2747e62ba974
Author: Michael M Slusarz <slusarz at horde.org>
Date: Fri Apr 10 22:32:53 2015 -0600
Add version information to output private key
framework/Pgp/lib/Horde/Pgp/Element/Armored.php | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
http://github.com/horde/horde/commit/cdaeecc575ee8d1749738cddbf0c2747e62ba974
-----------------------------------------------------------------------
commit d7c88196f84adf48a5a72c265c4fdadfb5f206e4
Author: Michael M Slusarz <slusarz at horde.org>
Date: Fri Apr 10 23:05:33 2015 -0600
Add support for decrypting private keys
framework/Pgp/lib/Horde/Pgp.php | 25 --------
framework/Pgp/lib/Horde/Pgp/Element/PrivateKey.php | 64 ++++++++++++++++++++
framework/Pgp/test/Horde/Pgp/KeyTest.php | 43 +++++++++++++
3 files changed, 107 insertions(+), 25 deletions(-)
http://github.com/horde/horde/commit/d7c88196f84adf48a5a72c265c4fdadfb5f206e4
-----------------------------------------------------------------------
commit a4e7d83e204a1f9ec836ec265f1c48f7756206cf
Author: Michael M Slusarz <slusarz at horde.org>
Date: Sat Apr 11 00:47:28 2015 -0600
Implement support for generating encrypted private keys
framework/Pgp/lib/Horde/Pgp.php | 55 +++++++++++++--------
framework/Pgp/lib/Horde/Pgp/Backend.php | 13 ++---
framework/Pgp/lib/Horde/Pgp/Backend/Openpgp.php | 23 +++++++++
framework/Pgp/test/Horde/Pgp/Backend/PeclTest.php | 5 ++-
framework/Pgp/test/Horde/Pgp/Backend/TestBase.php | 26 +++++++++-
5 files changed, 91 insertions(+), 31 deletions(-)
http://github.com/horde/horde/commit/a4e7d83e204a1f9ec836ec265f1c48f7756206cf
-----------------------------------------------------------------------
commit b36acacc667b4b1713fdf969e2e1cc6efeffc94b
Author: Michael M Slusarz <slusarz at horde.org>
Date: Sat Apr 11 09:47:58 2015 -0600
Remove support for PECL driver
Pretty much useless, since when running as a normal user (e.g. me
running unit tests) it uses your home director gpg keyring to store
information. There is no way to change this.
framework/Pgp/lib/Horde/Pgp.php | 3 -
framework/Pgp/lib/Horde/Pgp/Backend/Pecl.php | 38 -------------
framework/Pgp/package.xml | 12 ----
framework/Pgp/test/Horde/Pgp/Backend/PeclTest.php | 62 ---------------------
4 files changed, 0 insertions(+), 115 deletions(-)
delete mode 100644 framework/Pgp/lib/Horde/Pgp/Backend/Pecl.php
delete mode 100644 framework/Pgp/test/Horde/Pgp/Backend/PeclTest.php
http://github.com/horde/horde/commit/b36acacc667b4b1713fdf969e2e1cc6efeffc94b
-----------------------------------------------------------------------
commit fb12315b345ea5553cf73083532cdc03c9e73962
Author: Michael M Slusarz <slusarz at horde.org>
Date: Sat Apr 11 21:24:58 2015 -0600
Add RSA key tests
framework/Pgp/test/Horde/Pgp/KeyTest.php | 148 ++++++++++---
framework/Pgp/test/Horde/Pgp/fixtures/pgp_private_rsa.txt | 35 +++
framework/Pgp/test/Horde/Pgp/fixtures/pgp_public_rsa.txt | 19 ++
3 files changed, 172 insertions(+), 30 deletions(-)
create mode 100644 framework/Pgp/test/Horde/Pgp/fixtures/pgp_private_rsa.txt
create mode 100644 framework/Pgp/test/Horde/Pgp/fixtures/pgp_public_rsa.txt
http://github.com/horde/horde/commit/fb12315b345ea5553cf73083532cdc03c9e73962
-----------------------------------------------------------------------
commit bb2bca60c6252f72e8930b3aa55bfb95246f6eb1
Author: Michael M Slusarz <slusarz at horde.org>
Date: Sat Apr 11 21:44:38 2015 -0600
Initial implementation of encrypt()
framework/Pgp/lib/Horde/Pgp.php | 5 +++-
framework/Pgp/lib/Horde/Pgp/Backend.php | 3 +-
framework/Pgp/lib/Horde/Pgp/Backend/Openpgp.php | 25 ++++++++++++++++++
framework/Pgp/test/Horde/Pgp/Backend/TestBase.php | 29 +++++++++++++--------
4 files changed, 49 insertions(+), 13 deletions(-)
http://github.com/horde/horde/commit/bb2bca60c6252f72e8930b3aa55bfb95246f6eb1
-----------------------------------------------------------------------
commit 4f465c40cdb625c0530ccf442e936af7d565d785
Author: Michael M Slusarz <slusarz at horde.org>
Date: Sat Apr 11 22:00:17 2015 -0600
Only use LF when wrapping armor text
.../Pgp/bundle/vendor/singpolyma/openpgp-php/lib/openpgp.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
http://github.com/horde/horde/commit/4f465c40cdb625c0530ccf442e936af7d565d785
-----------------------------------------------------------------------
commit 358d04cacdfc44a3a46e9b13757260e139e70fa2
Author: Michael M Slusarz <slusarz at horde.org>
Date: Sat Apr 11 22:05:57 2015 -0600
Return the object, not the classname
framework/Pgp/lib/Horde/Pgp/Element.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
http://github.com/horde/horde/commit/358d04cacdfc44a3a46e9b13757260e139e70fa2
-----------------------------------------------------------------------
commit bde27a32d1882b9bb5fe3fc073b1312027195a25
Author: Michael M Slusarz <slusarz at horde.org>
Date: Sat Apr 11 22:11:24 2015 -0600
Initial decrypt() implementation
framework/Pgp/lib/Horde/Pgp.php | 4 +-
framework/Pgp/lib/Horde/Pgp/Backend.php | 20 +++++++++----
framework/Pgp/lib/Horde/Pgp/Backend/Openpgp.php | 9 ++++++
framework/Pgp/test/Horde/Pgp/Backend/TestBase.php | 30 ++++++++++++++++++++-
4 files changed, 54 insertions(+), 9 deletions(-)
http://github.com/horde/horde/commit/bde27a32d1882b9bb5fe3fc073b1312027195a25
-----------------------------------------------------------------------
commit 16827ea1b17a70a03a2c77533fd70672cb352779
Author: Michael M Slusarz <slusarz at horde.org>
Date: Sun Apr 12 22:49:40 2015 -0600
Initial support for PGP signing
Requires rewrite of PGP Element code in order to correctly handle signed
cleartext messages.
framework/Pgp/lib/Horde/Pgp.php | 2 +-
framework/Pgp/lib/Horde/Pgp/Armor.php | 63 +++--
framework/Pgp/lib/Horde/Pgp/Backend.php | 4 +-
framework/Pgp/lib/Horde/Pgp/Backend/Openpgp.php | 81 ++++-
framework/Pgp/lib/Horde/Pgp/Element.php | 93 +++----
framework/Pgp/lib/Horde/Pgp/Element/Armored.php | 167 -----------
framework/Pgp/lib/Horde/Pgp/Element/Key.php | 8 +-
framework/Pgp/lib/Horde/Pgp/Element/Message.php | 6 +-
framework/Pgp/lib/Horde/Pgp/Element/PrivateKey.php | 56 ++--
framework/Pgp/lib/Horde/Pgp/Element/PublicKey.php | 2 +-
framework/Pgp/lib/Horde/Pgp/Element/Signature.php | 30 +--
framework/Pgp/lib/Horde/Pgp/Element/SignedMessage.php | 65 +++-
framework/Pgp/lib/Horde/Pgp/Element/Text.php | 7 -
framework/Pgp/package.xml | 12 +-
framework/Pgp/test/Horde/Pgp/ArmorTest.php | 14 +-
framework/Pgp/test/Horde/Pgp/Backend/TestBase.php | 75 ++++-
framework/Pgp/test/Horde/Pgp/Element/SignatureTest.php | 51 ----
framework/Pgp/test/Horde/Pgp/Element/SignedMessageTest.php | 66 ++++
framework/Pgp/test/Horde/Pgp/KeyTest.php | 2 +-
framework/Pgp/test/Horde/Pgp/fixtures/pgp_encrypted_rsa.txt | 24 ++
20 files changed, 407 insertions(+), 421 deletions(-)
delete mode 100644 framework/Pgp/lib/Horde/Pgp/Element/Armored.php
delete mode 100644 framework/Pgp/test/Horde/Pgp/Element/SignatureTest.php
create mode 100644 framework/Pgp/test/Horde/Pgp/Element/SignedMessageTest.php
create mode 100644 framework/Pgp/test/Horde/Pgp/fixtures/pgp_encrypted_rsa.txt
http://github.com/horde/horde/commit/16827ea1b17a70a03a2c77533fd70672cb352779
-----------------------------------------------------------------------
commit e799931b21cedafaccffae087cf624237ee934e1
Author: Michael M Slusarz <slusarz at horde.org>
Date: Mon Apr 13 12:14:36 2015 -0600
Add subkey to generated key.
Primary key is used for signing, subkeys are used for encryption.
framework/Pgp/lib/Horde/Pgp/Backend/Openpgp.php | 126 ++++++++++++++++++-----
1 files changed, 99 insertions(+), 27 deletions(-)
http://github.com/horde/horde/commit/e799931b21cedafaccffae087cf624237ee934e1
-----------------------------------------------------------------------
commit bb48a216f6eebdc148b7cf364c3ed49a38cc70bd
Author: Michael M Slusarz <slusarz at horde.org>
Date: Mon Apr 13 12:50:14 2015 -0600
Add Horde_Pgp_Element_Key#getKeyList()
framework/Pgp/lib/Horde/Pgp/Element/Key.php | 37 +++++++++++++++++++++
framework/Pgp/test/Horde/Pgp/KeyTest.php | 46 +++++++++++++++++++++++++++
2 files changed, 83 insertions(+), 0 deletions(-)
http://github.com/horde/horde/commit/bb48a216f6eebdc148b7cf364c3ed49a38cc70bd
-----------------------------------------------------------------------
commit 9e802e92c80d4aa8e631bb2e6a2c6c09694f07bc
Author: Michael M Slusarz <slusarz at horde.org>
Date: Mon Apr 13 13:10:02 2015 -0600
Use the proper encryption subkey when encrypting
framework/Pgp/lib/Horde/Pgp/Backend/Openpgp.php | 36 +++++++++++++++++++---
1 files changed, 31 insertions(+), 5 deletions(-)
http://github.com/horde/horde/commit/9e802e92c80d4aa8e631bb2e6a2c6c09694f07bc
-----------------------------------------------------------------------
commit e12d599a3ca5fc78cfafb1f94ce534621b79442c
Author: Michael M Slusarz <slusarz at horde.org>
Date: Mon Apr 13 14:10:14 2015 -0600
Signed message does not include CRLF before armor header
framework/Pgp/lib/Horde/Pgp/Element/SignedMessage.php | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
http://github.com/horde/horde/commit/e12d599a3ca5fc78cfafb1f94ce534621b79442c
-----------------------------------------------------------------------
commit c99fa0f654f973845e8cee0a5fba87e5641fde79
Author: Michael M Slusarz <slusarz at horde.org>
Date: Mon Apr 13 14:12:06 2015 -0600
Initial implementation of verify methods
framework/Pgp/lib/Horde/Pgp.php | 27 +++++-
framework/Pgp/lib/Horde/Pgp/Backend.php | 9 ++-
framework/Pgp/lib/Horde/Pgp/Backend/Openpgp.php | 8 ++
framework/Pgp/package.xml | 4 +-
framework/Pgp/test/Horde/Pgp/Backend/TestBase.php | 76 +++++++++++++-
framework/Pgp/test/Horde/Pgp/fixtures/pgp_signature2.txt | 9 ++
framework/Pgp/test/Horde/Pgp/fixtures/pgp_signed2.txt | 33 +++++--
7 files changed, 151 insertions(+), 15 deletions(-)
create mode 100644 framework/Pgp/test/Horde/Pgp/fixtures/pgp_signature2.txt
http://github.com/horde/horde/commit/c99fa0f654f973845e8cee0a5fba87e5641fde79
More information about the commits
mailing list