diff options
| author | Ingela Anderton Andin <[email protected]> | 2013-05-08 10:50:32 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2013-05-08 10:50:32 +0200 |
| commit | 5413bda055761104f70f091b7fe69c8a6a261c9c (patch) | |
| tree | 8afeaae8b9b96b034642dbed3f3306785f0272c7 /lib/ssl/src/ssl_certificate.erl | |
| parent | a38dde7003ea204979985e6784a4559e8123a66e (diff) | |
| parent | 705e3b1137ebb2cfa1e729c9a4cf44638270f7e5 (diff) | |
| download | otp-5413bda055761104f70f091b7fe69c8a6a261c9c.tar.gz otp-5413bda055761104f70f091b7fe69c8a6a261c9c.tar.bz2 otp-5413bda055761104f70f091b7fe69c8a6a261c9c.zip | |
Merge remote-tracking branch 'upstream/maint'
Conflicts:
lib/crypto/doc/src/crypto_app.xml
Diffstat (limited to 'lib/ssl/src/ssl_certificate.erl')
| -rw-r--r-- | lib/ssl/src/ssl_certificate.erl | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/lib/ssl/src/ssl_certificate.erl b/lib/ssl/src/ssl_certificate.erl index 01a7cd93b5..9e1c3a09bf 100644 --- a/lib/ssl/src/ssl_certificate.erl +++ b/lib/ssl/src/ssl_certificate.erl @@ -37,7 +37,8 @@ is_valid_extkey_usage/2, is_valid_key_usage/2, select_extension/2, - extensions_list/1 + extensions_list/1, + public_key_type/1 ]). %%==================================================================== @@ -166,6 +167,18 @@ extensions_list(Extensions) -> Extensions. %%-------------------------------------------------------------------- +-spec public_key_type(term()) -> rsa | dsa | ec. +%% +%% Description: +%%-------------------------------------------------------------------- +public_key_type(?'rsaEncryption') -> + rsa; +public_key_type(?'id-dsa') -> + dsa; +public_key_type(?'id-ecPublicKey') -> + ec. + +%%-------------------------------------------------------------------- %%% Internal functions %%-------------------------------------------------------------------- certificate_chain(OtpCert, _Cert, CertDbHandle, CertsDbRef, Chain) -> |