diff options
| author | Zandra <[email protected]> | 2015-09-11 09:43:37 +0200 |
|---|---|---|
| committer | Zandra <[email protected]> | 2015-09-11 09:43:37 +0200 |
| commit | 851ebc0e815a1f6e19b784e2d062e6a2ff9f0aae (patch) | |
| tree | 6ee5acad56989be19f0ef75c52fcb38497824fac /lib | |
| parent | d96d6c5b4df80a37e03ec0d7b72b02fa087e5dee (diff) | |
| parent | 9c34627bcc594c8c3bfb5451cff54e284eec5f72 (diff) | |
| download | otp-851ebc0e815a1f6e19b784e2d062e6a2ff9f0aae.tar.gz otp-851ebc0e815a1f6e19b784e2d062e6a2ff9f0aae.tar.bz2 otp-851ebc0e815a1f6e19b784e2d062e6a2ff9f0aae.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/public_key/doc/src/public_key.xml | 4 |
1 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 209de2bdf7..b247618efc 100644 --- a/lib/public_key/doc/src/public_key.xml +++ b/lib/public_key/doc/src/public_key.xml @@ -498,13 +498,13 @@ <name>pkix_path_validation(TrustedCert, CertChain, Options) -> {ok, {PublicKeyInfo, PolicyTree}} | {error, {bad_cert, Reason}} </name> <fsummary>Performs a basic path validation according to RFC 5280.</fsummary> <type> - <v>TrustedCert = #'OTPCertificate'{} | der_encode() | atom()</v> + <v>TrustedCert = #'OTPCertificate'{} | der_encoded() | atom()</v> <d>Normally a trusted certificate, but it can also be a path-validation error that can be discovered while constructing the input to this function and that is to be run through the <c>verify_fun</c>. Examples are <c>unknown_ca</c> and <c>selfsigned_peer.</c> </d> - <v>CertChain = [der_encode()]</v> + <v>CertChain = [der_encoded()]</v> <d>A list of DER-encoded certificates in trust order ending with the peer certificate.</d> <v>Options = proplists:proplist()</v> <v>PublicKeyInfo = {?'rsaEncryption' | ?'id-dsa', |