diff options
| author | Ingela Anderton Andin <[email protected]> | 2011-02-17 09:45:15 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2011-02-17 09:46:17 +0100 |
| commit | 1ec3f9518d94989a0596e5e8aa62d3ce48d89101 (patch) | |
| tree | 01ffc3461faef1b29aa65624397931e398ee41c1 /lib/public_key/include | |
| parent | cd7fc2cb900dcd296f2ba215dea1c691440107d0 (diff) | |
| parent | c730d2fb0342523fa9014373b234b426bd9ca6f2 (diff) | |
| download | otp-1ec3f9518d94989a0596e5e8aa62d3ce48d89101.tar.gz otp-1ec3f9518d94989a0596e5e8aa62d3ce48d89101.tar.bz2 otp-1ec3f9518d94989a0596e5e8aa62d3ce48d89101.zip | |
Merge branch 'sf/rsa_pub_key' into dev
* sf/rsa_pub_key:
Improved support for RSA and DSA public keys
OTP-9061
Diffstat (limited to 'lib/public_key/include')
| -rw-r--r-- | lib/public_key/include/public_key.hrl | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/public_key/include/public_key.hrl b/lib/public_key/include/public_key.hrl index 4950597fb5..f29ab859ed 100644 --- a/lib/public_key/include/public_key.hrl +++ b/lib/public_key/include/public_key.hrl @@ -73,8 +73,9 @@ -type der_encoded() :: binary(). -type decrypt_der() :: binary(). --type pki_asn1_type() :: 'Certificate' | 'RSAPrivateKey' - | 'DSAPrivateKey' | 'DHParameter'. +-type pki_asn1_type() :: 'Certificate' | 'RSAPrivateKey' | 'RSAPublicKey' + | 'DSAPrivateKey' | 'DSAPublicKey' | 'DHParameter' + | 'SubjectPublicKeyInfo'. -type pem_entry() :: {pki_asn1_type(), der_encoded() | decrypt_der(), not_encrypted | {Cipher :: string(), Salt :: binary()}}. -type asn1_type() :: atom(). %% see "OTP-PUB-KEY.hrl |