From 90d6d3dbcfb02fc441edafe6fafe6e6800009e35 Mon Sep 17 00:00:00 2001
From: Legrandin <helderijs@gmail.com>
Date: Sat, 15 Jun 2013 23:25:49 +0200
Subject: Added support for PKCS#8-encrypted private keys.

The patch contains the following changes:

- Private RSA keys can be imported/exported in encrypted form,
  protected according to PKCS#8 and:

  * PBKDF2WithHMAC-SHA1AndDES-EDE3-CBC.
  * PBKDF2WithHMAC-SHA1AndAES128-CBC
  * PBKDF2WithHMAC-SHA1AndAES192-CBC
  * PBKDF2WithHMAC-SHA1AndAES256-CBC

  In addition to that, it is possible to import keys i the
  following weak formats:

  * pbeWithMD5AndDES-CBC
  * pbeWithSHA1AndRC2-CBC
  * pbeWithMD5AndRC2-CBC
  * pbeWithSHA1AndDES-CBC

- The following new module (and 1 new package) are added:

  * Crypto.Util.Padding for simple padding/unpadding logic
  * Crypto.IO._PBES for PBE-related PKCS#5 logic
  * Crypto.IO.PEM for PEM wrapping/unwrapping
  * Crypto.IO.PKCS8 for PKCS#8 wrapping/unwrapping

- All Object ID (OIDs) are now in dotted form to increase
  readability.

- Add AES support to PEM format (decode only).
  The PEM module can decrypt messages protected with AES-CBC.

- Update RSA import test cases.

- Updated to PKCS8 test cases
---
 setup.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'setup.py')

diff --git a/setup.py b/setup.py
index 5af83ac..903a81f 100644
--- a/setup.py
+++ b/setup.py
@@ -402,9 +402,11 @@ kw = {'name':"pycrypto",
                   "Crypto.SelfTest.Random.OSRNG",
                   "Crypto.SelfTest.Util",
                   "Crypto.SelfTest.Signature",
+                  "Crypto.SelfTest.IO",
                   "Crypto.Protocol",
                   "Crypto.PublicKey",
-                  "Crypto.Signature"],
+                  "Crypto.Signature",
+                  "Crypto.IO"],
       'package_dir' : { "Crypto": "lib/Crypto" },
       'ext_modules': plat_ext + [
             # _fastmath (uses GNU mp library)
-- 
cgit v1.2.1