diff options
| author | Ingela Anderton Andin <[email protected]> | 2011-03-24 10:58:21 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2011-03-24 10:58:21 +0100 |
| commit | c4ba2c49508a02f2eef9624b06a9b91583e70e2c (patch) | |
| tree | 679f594f5559314a888c15f3b82118c97ddb42fd /lib/public_key/include | |
| parent | e243040fabd2701995cc4565250674d972403db2 (diff) | |
| parent | fbaa5e3ddf028ba0e2b58a19609817ee17b10c6f (diff) | |
| download | otp-c4ba2c49508a02f2eef9624b06a9b91583e70e2c.tar.gz otp-c4ba2c49508a02f2eef9624b06a9b91583e70e2c.tar.bz2 otp-c4ba2c49508a02f2eef9624b06a9b91583e70e2c.zip | |
Merge branch 'ia/public_key/encode-decode-ssh/OTP-9144' into dev
* ia/public_key/encode-decode-ssh/OTP-9144:
Implemented encode/decode support for ssh public key files
Diffstat (limited to 'lib/public_key/include')
| -rw-r--r-- | lib/public_key/include/public_key.hrl | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/lib/public_key/include/public_key.hrl b/lib/public_key/include/public_key.hrl index 3498a2a433..5f97d80f7e 100644 --- a/lib/public_key/include/public_key.hrl +++ b/lib/public_key/include/public_key.hrl @@ -70,14 +70,18 @@ interim_reasons_mask }). - --type der_encoded() :: binary(). --type decrypt_der() :: binary(). +-type public_key() :: rsa_public_key() | dsa_public_key(). +-type rsa_public_key() :: #'RSAPublicKey'{}. +-type rsa_private_key() :: #'RSAPrivateKey'{}. +-type dsa_private_key() :: #'DSAPrivateKey'{}. +-type dsa_public_key() :: {integer(), #'Dss-Parms'{}}. -type pki_asn1_type() :: 'Certificate' | 'RSAPrivateKey' | 'RSAPublicKey' | 'DSAPrivateKey' | 'DSAPublicKey' | 'DHParameter' | 'SubjectPublicKeyInfo'. --type pem_entry() :: {pki_asn1_type(), der_encoded() | decrypt_der(), +-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 +-type ssh_file() :: openssh_public_key | rfc4716_public_key | known_hosts | + auth_keys. -endif. % -ifdef(public_key). |