[commits] Horde branch master updated. 6e30cda864a9971d1231cf38026dc5bd93713288

[Michael M Slusarz]

The branch "master" has been updated.
The following is a summary of the commits.

from: 780fbabc12f69635f87e6fbd9f59c3928e39a9aa

957e11b Limit encryption options based on presence of personal keys
907d5d7 Fix Horde_Session usage
6e30cda Bug #9426: Fix S/Mime signing

-----------------------------------------------------------------------

commit 957e11bc7dc56d0ab5ea9bb73fb43a4f71406950
Author: Michael M Slusarz <slusarz at curecanti.org>
Date:   Tue Dec 21 14:12:13 2010 -0700

    Limit encryption options based on presence of personal keys

 imp/compose.php                        |    4 +-
 imp/lib/Compose.php                    |   42 ++++++++++++++++----------------
 imp/lib/Crypt/Pgp.php                  |   32 ++++++++++++++++++++++++
 imp/lib/Crypt/Smime.php                |   27 ++++++++++++++++++++
 imp/lib/IMP.php                        |   25 +++----------------
 imp/templates/dimp/javascript_defs.php |   11 ++++----
 6 files changed, 92 insertions(+), 49 deletions(-)

http://git.horde.org/horde-git/-/commit/957e11bc7dc56d0ab5ea9bb73fb43a4f71406950

-----------------------------------------------------------------------

commit 907d5d7475943efa9397d835b23cd7c9e524030c
Author: Michael M Slusarz <slusarz at curecanti.org>
Date:   Tue Dec 21 14:21:26 2010 -0700

    Fix Horde_Session usage

 imp/lib/Crypt/Pgp.php   |    5 +++--
 imp/lib/Crypt/Smime.php |    5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

http://git.horde.org/horde-git/-/commit/907d5d7475943efa9397d835b23cd7c9e524030c

-----------------------------------------------------------------------

commit 6e30cda864a9971d1231cf38026dc5bd93713288
Author: Michael M Slusarz <slusarz at curecanti.org>
Date:   Tue Dec 21 14:50:50 2010 -0700

    Bug #9426: Fix S/Mime signing
    
    Workaround broken openssl_pkcs7_sign() - it outputs both \r\n and \n in
    the same string.

 framework/Crypt/lib/Horde/Crypt/Smime.php |    9 ++++++++-
 framework/Crypt/package.xml               |    4 ++++
 2 files changed, 12 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/6e30cda864a9971d1231cf38026dc5bd93713288