diff options
| author | Ingela Anderton Andin <[email protected]> | 2019-02-05 14:54:11 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2019-02-05 14:54:11 +0100 |
| commit | c2126443b79aa53c9fc04e7dad4e6c717ca6986b (patch) | |
| tree | c9b6fe193570f7a0af59b186f02d9b9c7993f87d /lib/public_key | |
| parent | a1dacff6a68d905b7620debfbdd401e50fad869e (diff) | |
| parent | e042afe54727ae490d47eae47c6d9a210f04dd47 (diff) | |
| download | otp-c2126443b79aa53c9fc04e7dad4e6c717ca6986b.tar.gz otp-c2126443b79aa53c9fc04e7dad4e6c717ca6986b.tar.bz2 otp-c2126443b79aa53c9fc04e7dad4e6c717ca6986b.zip | |
Merge branch 'ingela/ssl/alert-return/OTP-15423' into maint
* ingela/ssl/alert-return/OTP-15423:
ssl: Use specs to generate type documentation
ssl: Enhance error handling
Diffstat (limited to 'lib/public_key')
| -rw-r--r-- | lib/public_key/doc/src/public_key.xml | 2 | ||||
| -rw-r--r-- | lib/public_key/src/public_key.erl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/public_key/doc/src/public_key.xml b/lib/public_key/doc/src/public_key.xml index 76dbe008ef..b7589f6653 100644 --- a/lib/public_key/doc/src/public_key.xml +++ b/lib/public_key/doc/src/public_key.xml @@ -644,7 +644,7 @@ fun(#'DistributionPoint'{}, #'CertificateList'{}, <v>conf_opt() = {cert, der_encoded()} | {key, PrivateKey} |{cacerts, [der_encoded()]}</v> <d> This is a subset of the type - <seealso marker="ssl:ssl#type-ssloption"> ssl:ssl_option()</seealso>. + <seealso marker="ssl:ssl#type-tls_option"> ssl:tls_option()</seealso>. <c>PrivateKey</c> is what <seealso marker="#generate_key-1">generate_key/1</seealso> returns. diff --git a/lib/public_key/src/public_key.erl b/lib/public_key/src/public_key.erl index 75d40d2e8a..fd85d3722d 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]). + key_params/0, digest_type/0, issuer_name/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() . |