diff options
| author | Ingela Anderton Andin <[email protected]> | 2011-11-15 10:44:52 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2011-11-15 10:44:52 +0100 |
| commit | 96890a04beaa831ac10a2c30e595acbaf0823dc4 (patch) | |
| tree | a992415691fd93eb327616f64a7116927360ce9c /lib/public_key/src/public_key.app.src | |
| parent | b50243cb644e13fb37c9880d5b4a8faf2987a34b (diff) | |
| parent | 0eeda739555deda1c7db37ae68b324230d3d9be9 (diff) | |
| download | otp-96890a04beaa831ac10a2c30e595acbaf0823dc4.tar.gz otp-96890a04beaa831ac10a2c30e595acbaf0823dc4.tar.bz2 otp-96890a04beaa831ac10a2c30e595acbaf0823dc4.zip | |
Merge branch 'ia/public_key/ssl/crypto/PKCS-8/OTP-9312'
* ia/public_key/ssl/crypto/PKCS-8/OTP-9312:
Add clause for expected input to pubkey:pseudo_random_function/2 when ASN-1 compiler is fixed.
Clean up of public_key code adding specs and documentation
Added PKCS-8 support in ssl
Additions to crypto and public_key needed for full PKCS-8 support
Add PKCS-8 support to public_key
Diffstat (limited to 'lib/public_key/src/public_key.app.src')
| -rw-r--r-- | lib/public_key/src/public_key.app.src | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/public_key/src/public_key.app.src b/lib/public_key/src/public_key.app.src index 1963bd05d4..4cc81ea573 100644 --- a/lib/public_key/src/public_key.app.src +++ b/lib/public_key/src/public_key.app.src @@ -3,10 +3,12 @@ {vsn, "%VSN%"}, {modules, [ public_key, pubkey_pem, + pubkey_pbe, pubkey_ssh, pubkey_cert, pubkey_cert_records, - 'OTP-PUB-KEY' + 'OTP-PUB-KEY', + 'PKCS-FRAME' ]}, {applications, [crypto, kernel, stdlib]}, {registered, []}, |