aboutsummaryrefslogtreecommitdiffstats
path: root/lib/public_key
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2019-02-22 10:29:37 +0100
committerIngela Anderton Andin <[email protected]>2019-02-22 10:29:37 +0100
commitc3c20d78c2b47d0dd117f7a90b817ed13a609e64 (patch)
treed1e86dd4499cee4dc4fa4cd4df533f358aabf652 /lib/public_key
parent4327304462128ce983de8e962f683e702a80f64e (diff)
parent53dea65ae6665d5d14c0d313c1f639637a3f0405 (diff)
downloadotp-c3c20d78c2b47d0dd117f7a90b817ed13a609e64.tar.gz
otp-c3c20d78c2b47d0dd117f7a90b817ed13a609e64.tar.bz2
otp-c3c20d78c2b47d0dd117f7a90b817ed13a609e64.zip
Merge branch 'maint'
Conflicts: lib/ssl/doc/src/ssl.xml lib/ssl/src/ssl.erl
Diffstat (limited to 'lib/public_key')
-rw-r--r--lib/public_key/src/public_key.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/public_key/src/public_key.erl b/lib/public_key/src/public_key.erl
index fd85d3722d..47c5dbb95a 100644
--- a/lib/public_key/src/public_key.erl
+++ b/lib/public_key/src/public_key.erl
@@ -66,7 +66,7 @@
-export_type([public_key/0, private_key/0, pem_entry/0,
pki_asn1_type/0, asn1_type/0, ssh_file/0, der_encoded/0,
- key_params/0, digest_type/0, issuer_name/0]).
+ key_params/0, digest_type/0, issuer_name/0, oid/0]).
-type public_key() :: rsa_public_key() | dsa_public_key() | ec_public_key() | ed_public_key() .
-type private_key() :: rsa_private_key() | dsa_private_key() | ec_private_key() | ed_private_key() .