diff options
author | Siri Hansen <[email protected]> | 2017-09-19 16:29:33 +0200 |
---|---|---|
committer | Siri Hansen <[email protected]> | 2017-09-19 16:29:33 +0200 |
commit | 8b24be58d37a8912efdcec9cd1e354cfa41e4ef4 (patch) | |
tree | 4dd56d366268fbb37e12ea9d564e9f24b81566aa /lib/public_key/doc | |
parent | 6d11362936408091aa7108c252f2f7bf20cdc327 (diff) | |
parent | 3979e914660993a06f1a84dd6e4196181964609a (diff) | |
download | otp-8b24be58d37a8912efdcec9cd1e354cfa41e4ef4.tar.gz otp-8b24be58d37a8912efdcec9cd1e354cfa41e4ef4.tar.bz2 otp-8b24be58d37a8912efdcec9cd1e354cfa41e4ef4.zip |
Merge branch 'maint'
Conflicts:
lib/observer/src/crashdump_viewer.erl
lib/sasl/src/sasl.appup.src
lib/stdlib/src/stdlib.appup.src
Diffstat (limited to 'lib/public_key/doc')
-rw-r--r-- | lib/public_key/doc/src/public_key_records.xml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/public_key/doc/src/public_key_records.xml b/lib/public_key/doc/src/public_key_records.xml index d34f3ed9a3..739310c88b 100644 --- a/lib/public_key/doc/src/public_key_records.xml +++ b/lib/public_key/doc/src/public_key_records.xml @@ -171,9 +171,9 @@ #'ECPrivateKey'{ version, % integer() privateKey, % binary() - parameters, % der_encoded() - {'EcpkParameters', #'ECParameters'{}} | - {'EcpkParameters', {namedCurve, oid()}} | - {'EcpkParameters', 'NULL'} % Inherited by CA + parameters, % {ecParameters, #'ECParameters'{}} | + % {namedCurve, Oid::tuple()} | + % {implicitlyCA, 'NULL'} publicKey % bitstring() }. |