diff options
| author | Ingela Anderton Andin <[email protected]> | 2011-10-18 18:01:40 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2011-11-01 16:54:26 +0100 |
| commit | b211df3a0cca478822d57836dac3dd6452aab32a (patch) | |
| tree | f825012c084fd9bc88b4ed6fb0c04d079a3ca747 /lib/public_key/src/public_key.erl | |
| parent | ca4d1197fdf66fda5241edd645c12d2451b67ec8 (diff) | |
| download | otp-b211df3a0cca478822d57836dac3dd6452aab32a.tar.gz otp-b211df3a0cca478822d57836dac3dd6452aab32a.tar.bz2 otp-b211df3a0cca478822d57836dac3dd6452aab32a.zip | |
Additions to crypto and public_key needed for full PKCS-8 support
Diffstat (limited to 'lib/public_key/src/public_key.erl')
| -rw-r--r-- | lib/public_key/src/public_key.erl | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/public_key/src/public_key.erl b/lib/public_key/src/public_key.erl index 68c7b7ad93..19465e7828 100644 --- a/lib/public_key/src/public_key.erl +++ b/lib/public_key/src/public_key.erl @@ -154,7 +154,6 @@ der_decode(Asn1Type, Der) when (Asn1Type == 'PrivateKeyInfo') or (Asn1Type == ' andalso is_binary(Der) -> try {ok, Decoded} = 'PKCS-FRAME':decode(Asn1Type, Der), - Decoded catch error:{badmatch, {error, _}} = Error -> |