diff options
| author | Raimo Niskanen <[email protected]> | 2010-06-01 08:15:05 +0000 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2010-06-01 08:15:05 +0000 |
| commit | 736719a1aa5c48d34a717a971495e674a6aca336 (patch) | |
| tree | 934765fb4123c6ddd7253a32419b6683dd10a048 /lib/public_key/src/pubkey_pem.erl | |
| parent | 61ed122ce262cbaaf39738f4381b01de54fe86ca (diff) | |
| download | otp-736719a1aa5c48d34a717a971495e674a6aca336.tar.gz otp-736719a1aa5c48d34a717a971495e674a6aca336.tar.bz2 otp-736719a1aa5c48d34a717a971495e674a6aca336.zip | |
OTP-8649 dg/public_key-test-coverage
Diffstat (limited to 'lib/public_key/src/pubkey_pem.erl')
| -rw-r--r-- | lib/public_key/src/pubkey_pem.erl | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/lib/public_key/src/pubkey_pem.erl b/lib/public_key/src/pubkey_pem.erl index 9fc17b6f73..65879f1bbe 100644 --- a/lib/public_key/src/pubkey_pem.erl +++ b/lib/public_key/src/pubkey_pem.erl @@ -124,25 +124,31 @@ decode_file2([L|Rest], RLs, Ens, Tag, Info0) -> decode_file2([], _, Ens, _, _) -> {ok, lists:reverse(Ens)}. -%% TODO Support same as decode_file +%% Support same as decode_file encode_file(Ds) -> lists:map( - fun({cert, Bin}) -> + fun({cert, Bin, not_encrypted}) -> %% PKIX (X.509) ["-----BEGIN CERTIFICATE-----\n", b64encode_and_split(Bin), "-----END CERTIFICATE-----\n\n"]; - ({cert_req, Bin}) -> + ({cert_req, Bin, not_encrypted}) -> %% PKCS#10 ["-----BEGIN CERTIFICATE REQUEST-----\n", b64encode_and_split(Bin), "-----END CERTIFICATE REQUEST-----\n\n"]; - ({rsa_private_key, Bin}) -> + ({rsa_private_key, Bin, not_encrypted}) -> %% PKCS#? ["XXX Following key assumed not encrypted\n", "-----BEGIN RSA PRIVATE KEY-----\n", b64encode_and_split(Bin), - "-----END RSA PRIVATE KEY-----\n\n"] + "-----END RSA PRIVATE KEY-----\n\n"]; + ({dsa_private_key, Bin, not_encrypted}) -> + %% PKCS#? + ["XXX Following key assumed not encrypted\n", + "-----BEGIN DSA PRIVATE KEY-----\n", + b64encode_and_split(Bin), + "-----END DSA PRIVATE KEY-----\n\n"] end, Ds). dek_info(Line0, Info) -> |