diff options
| author | Ingela Anderton Andin <[email protected]> | 2012-11-16 10:26:54 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2012-11-16 10:26:54 +0100 |
| commit | 94e3d2d216b843a2f3e7187e3f972ebbe3134eba (patch) | |
| tree | fe7d2e7b42fcb08d286260228f9c0af221fbf311 /lib/public_key/include | |
| parent | 180ceb2f7b138f34443d76fe1c99514e4adc6a84 (diff) | |
| parent | 9aa4de3c97b98974f32c2b8e07c971343faf3f13 (diff) | |
| download | otp-94e3d2d216b843a2f3e7187e3f972ebbe3134eba.tar.gz otp-94e3d2d216b843a2f3e7187e3f972ebbe3134eba.tar.bz2 otp-94e3d2d216b843a2f3e7187e3f972ebbe3134eba.zip | |
Merge remote branch 'upstream/maint'
Diffstat (limited to 'lib/public_key/include')
| -rw-r--r-- | lib/public_key/include/public_key.hrl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/public_key/include/public_key.hrl b/lib/public_key/include/public_key.hrl index 2475295974..2dfdbbb8f3 100644 --- a/lib/public_key/include/public_key.hrl +++ b/lib/public_key/include/public_key.hrl @@ -78,7 +78,7 @@ -type dsa_public_key() :: {integer(), #'Dss-Parms'{}}. -type pki_asn1_type() :: 'Certificate' | 'RSAPrivateKey' | 'RSAPublicKey' | 'DSAPrivateKey' | 'DSAPublicKey' | 'DHParameter' - | 'SubjectPublicKeyInfo'. + | 'SubjectPublicKeyInfo' | 'CertificationRequest'. -type pem_entry() :: {pki_asn1_type(), binary(), %% DER or Encrypted DER not_encrypted | {Cipher :: string(), Salt :: binary()}}. -type asn1_type() :: atom(). %% see "OTP-PUB-KEY.hrl |