diff options
author | Ingela Anderton Andin <[email protected]> | 2010-08-24 08:57:57 +0200 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2010-08-24 08:57:57 +0200 |
commit | 574a68e84c92a8a44ea2e5d18a1cd2025892d496 (patch) | |
tree | 7ab50c40c457d500cdc2432ca3cc974d8f0959b1 /lib/public_key/include/public_key.hrl | |
parent | 7ed6bbd4e8bb88958bd45f85e3ef8af39c9f894f (diff) | |
parent | 12dfe961aeaf1a826d851361a24519e54d8ef119 (diff) | |
download | otp-574a68e84c92a8a44ea2e5d18a1cd2025892d496.tar.gz otp-574a68e84c92a8a44ea2e5d18a1cd2025892d496.tar.bz2 otp-574a68e84c92a8a44ea2e5d18a1cd2025892d496.zip |
Merge branch 'ia/public_key_api/OTP-8722' into dev
* ia/public_key_api/OTP-8722:
Revise the public_key API
Resolved, version is now 0.8.
Conflicts:
lib/public_key/vsn.mk
Diffstat (limited to 'lib/public_key/include/public_key.hrl')
-rw-r--r-- | lib/public_key/include/public_key.hrl | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/lib/public_key/include/public_key.hrl b/lib/public_key/include/public_key.hrl index fbce10f0eb..6503321042 100644 --- a/lib/public_key/include/public_key.hrl +++ b/lib/public_key/include/public_key.hrl @@ -59,4 +59,13 @@ interim_reasons_mask }). + +-type der_encoded() :: binary(). +-type decrypt_der() :: binary(). +-type pki_asn1_type() :: 'Certificate' | 'RSAPrivateKey' + | 'DSAPrivateKey' | 'DHParameter'. +-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 + -endif. % -ifdef(public_key). |