aboutsummaryrefslogtreecommitdiffstats
path: root/lib/public_key/include
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2014-02-10 09:35:03 +0100
committerIngela Anderton Andin <[email protected]>2014-02-10 09:35:03 +0100
commit1918d8fead3a8d4bfd177f68806db539911ad808 (patch)
tree12781f3f4d00ad00519c56f7aa032b9e776ba94d /lib/public_key/include
parent0cbf6ec7444df2c0441debc6bcd5aba0bbc7104d (diff)
parent8588180dce9aa7fffbba8c580d67e857796c6e5d (diff)
downloadotp-1918d8fead3a8d4bfd177f68806db539911ad808.tar.gz
otp-1918d8fead3a8d4bfd177f68806db539911ad808.tar.bz2
otp-1918d8fead3a8d4bfd177f68806db539911ad808.zip
Merge branch 'ia/public_key/specs'
* ia/public_key/specs: public_key: Export some dialyzer types
Diffstat (limited to 'lib/public_key/include')
-rw-r--r--lib/public_key/include/public_key.hrl22
1 files changed, 1 insertions, 21 deletions
diff --git a/lib/public_key/include/public_key.hrl b/lib/public_key/include/public_key.hrl
index 8afc841fa6..c6394115e3 100644
--- a/lib/public_key/include/public_key.hrl
+++ b/lib/public_key/include/public_key.hrl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2014. All Rights Reserved.
%%
%% The contents of this file are subject to the Erlang Public License,
%% Version 1.1, (the "License"); you may not use this file except in
@@ -76,7 +76,6 @@
point
}).
-
-define(unspecified, 0).
-define(keyCompromise, 1).
-define(cACompromise, 2).
@@ -88,23 +87,4 @@
-define(privilegeWithdrawn, 9).
-define(aACompromise, 10).
--type public_key() :: rsa_public_key() | dsa_public_key() | ec_public_key().
--type private_key() :: rsa_private_key() | dsa_private_key() | ec_private_key().
--type rsa_public_key() :: #'RSAPublicKey'{}.
--type rsa_private_key() :: #'RSAPrivateKey'{}.
--type dsa_private_key() :: #'DSAPrivateKey'{}.
--type dsa_public_key() :: {integer(), #'Dss-Parms'{}}.
--type ec_public_key() :: {#'ECPoint'{},{namedCurve, Oid::tuple()} | #'ECParameters'{}}.
--type ec_private_key() :: #'ECPrivateKey'{}.
--type der_encoded() :: binary().
--type decrypt_der() :: binary().
--type pki_asn1_type() :: 'Certificate' | 'RSAPrivateKey' | 'RSAPublicKey'
- | 'DSAPrivateKey' | 'DSAPublicKey' | 'DHParameter'
- | 'SubjectPublicKeyInfo' | 'CertificationRequest' | 'CertificateList'.
--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).