diff options
| author | Ingela Anderton Andin <[email protected]> | 2019-05-28 19:39:47 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2019-06-10 12:31:19 +0200 |
| commit | 20d0c9200862d5e725100b5b1bc26efb28a37a7d (patch) | |
| tree | f5ff8b029aa4dae617b8b6418230050bb2b35085 /lib/public_key/test/pbe_SUITE.erl | |
| parent | 6618ce7b6a621e92db72ea4f01f7d38553c8818c (diff) | |
| download | otp-20d0c9200862d5e725100b5b1bc26efb28a37a7d.tar.gz otp-20d0c9200862d5e725100b5b1bc26efb28a37a7d.tar.bz2 otp-20d0c9200862d5e725100b5b1bc26efb28a37a7d.zip | |
public_key: Add AES to PBE2
Diffstat (limited to 'lib/public_key/test/pbe_SUITE.erl')
| -rw-r--r-- | lib/public_key/test/pbe_SUITE.erl | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/public_key/test/pbe_SUITE.erl b/lib/public_key/test/pbe_SUITE.erl index 1136267411..61db282dfa 100644 --- a/lib/public_key/test/pbe_SUITE.erl +++ b/lib/public_key/test/pbe_SUITE.erl @@ -206,7 +206,10 @@ pbes2() -> [{doc,"Tests encode/decode EncryptedPrivateKeyInfo encrypted with different ciphers using PBES2"}]. pbes2(Config) when is_list(Config) -> decode_encode_key_file("pbes2_des_cbc_enc_key.pem", "password", "DES-CBC", Config), - decode_encode_key_file("pbes2_des_ede3_cbc_enc_key.pem", "password", "DES-EDE3-CBC", Config), + decode_encode_key_file("pbes2_des_ede3_cbc_enc_key.pem", "password", "DES-EDE3-CBC", Config), + decode_encode_key_file("pbes2_aes_128_enc_key.pem", "password", "AES-128-CBC", Config), + decode_encode_key_file("pbes2_aes_192_enc_key.pem", "password", "AES-192-CBC", Config), + decode_encode_key_file("pbes2_aes_256_enc_key.pem", "password", "AES-256-CBC", Config), case lists:member(rc2_cbc, proplists:get_value(ciphers, crypto:supports())) of true -> decode_encode_key_file("pbes2_rc2_cbc_enc_key.pem", "password", "RC2-CBC", Config); @@ -239,7 +242,6 @@ decode_encode_key_file(File, Password, Cipher, Config) -> {ok, PemKey} = file:read_file(filename:join(Datadir, File)), PemEntry = public_key:pem_decode(PemKey), - ct:pal("Pem entry: ~p" , [PemEntry]), [{Asn1Type, _, {Cipher,_} = CipherInfo} = PubEntry] = PemEntry, #'RSAPrivateKey'{} = KeyInfo = public_key:pem_entry_decode(PubEntry, Password), PemKey1 = public_key:pem_encode([public_key:pem_entry_encode(Asn1Type, KeyInfo, {CipherInfo, Password})]), |