aboutsummaryrefslogtreecommitdiffstats
path: root/lib/public_key/include/public_key.hrl
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2014-01-28 14:57:35 +0100
committerIngela Anderton Andin <[email protected]>2014-01-28 14:57:35 +0100
commit9ec3ad0d292a5b89a332cb24ed2246a3bfdf9443 (patch)
tree0e6aa74c6bc9906a442a1c4569657861bf570859 /lib/public_key/include/public_key.hrl
parent4e07b3f6989fd28b65a1ac04c2ae1c6a8dae6ff2 (diff)
parentf98905ad6f76fda775c0c75c410adbd9dd642916 (diff)
downloadotp-9ec3ad0d292a5b89a332cb24ed2246a3bfdf9443.tar.gz
otp-9ec3ad0d292a5b89a332cb24ed2246a3bfdf9443.tar.bz2
otp-9ec3ad0d292a5b89a332cb24ed2246a3bfdf9443.zip
Merge branch 'ia/tuncer/dialyzer-fixes/OTP-11627'
* ia/tuncer/dialyzer-fixes/OTP-11627: Fix incorrect type reference (inet:ipaddress() -> inet:ip_address()) Consistently format public_key(3) Fix incorrect use of public_key:private_key/0 type Fix incorrect proplists type reference
Diffstat (limited to 'lib/public_key/include/public_key.hrl')
-rw-r--r--lib/public_key/include/public_key.hrl3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/public_key/include/public_key.hrl b/lib/public_key/include/public_key.hrl
index 1e882e76ee..8afc841fa6 100644
--- a/lib/public_key/include/public_key.hrl
+++ b/lib/public_key/include/public_key.hrl
@@ -88,7 +88,8 @@
-define(privilegeWithdrawn, 9).
-define(aACompromise, 10).
--type public_key() :: rsa_public_key() | dsa_public_key().
+-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'{}.