diff options
| author | Hans Nilsson <[email protected]> | 2014-01-28 15:09:35 +0100 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2014-01-28 15:09:35 +0100 |
| commit | dc7eeae35b5a9e23a08584605e71c4007dfd74ee (patch) | |
| tree | b5db58006d3c7f676105310074d7961e8952b127 /lib/public_key/include/public_key.hrl | |
| parent | 6de916efa8df952ca1e24cccda673134982c0da0 (diff) | |
| parent | 9ec3ad0d292a5b89a332cb24ed2246a3bfdf9443 (diff) | |
| download | otp-dc7eeae35b5a9e23a08584605e71c4007dfd74ee.tar.gz otp-dc7eeae35b5a9e23a08584605e71c4007dfd74ee.tar.bz2 otp-dc7eeae35b5a9e23a08584605e71c4007dfd74ee.zip | |
Merge branch 'master' of super:otp
Diffstat (limited to 'lib/public_key/include/public_key.hrl')
| -rw-r--r-- | lib/public_key/include/public_key.hrl | 3 |
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'{}. |