diff options
| author | Ingela Anderton Andin <[email protected]> | 2014-08-14 12:09:53 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2014-08-14 12:09:53 +0200 |
| commit | 3f44d30fea3b0c42c523d4dd60be58b09efe8c1f (patch) | |
| tree | 5ec74b3a78504a4ec0650a498f07678d1139222e /lib/public_key/doc/src/public_key.xml | |
| parent | 9de7cc7f881b5df18d0a26f7d37af164bc0c390e (diff) | |
| parent | bd496c144e47c10c900c58cd2d9f38a01e9303cf (diff) | |
| download | otp-3f44d30fea3b0c42c523d4dd60be58b09efe8c1f.tar.gz otp-3f44d30fea3b0c42c523d4dd60be58b09efe8c1f.tar.bz2 otp-3f44d30fea3b0c42c523d4dd60be58b09efe8c1f.zip | |
Merge branch 'ia/ssl/certificate_types/certificate_requests/OTP-12026' into maint
* ia/ssl/certificate_types/certificate_requests/OTP-12026:
public_key: Updated User Guide with ECC records
ssl: Make sure the correct ROOT-cert is used
ssl: Test ECDSA and improve test suite maintainability
public_key: Correct ASN1-type EcpkParameters in PEM handling
public_key: Correct ASN-1 spec
ssl: Correct handling of certificate_types in Certificate Requests
Diffstat (limited to 'lib/public_key/doc/src/public_key.xml')
| -rw-r--r-- | lib/public_key/doc/src/public_key.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/public_key/doc/src/public_key.xml b/lib/public_key/doc/src/public_key.xml index 8e93f562d4..f8011cd5c0 100644 --- a/lib/public_key/doc/src/public_key.xml +++ b/lib/public_key/doc/src/public_key.xml @@ -75,7 +75,7 @@ <p><em>Data Types </em></p> - <p><code>oid() - a tuple of integers as generated by the ASN1 compiler.</code></p> + <p><code>oid() - Object Identifier, a tuple of integers as generated by the ASN1 compiler.</code></p> <p><code>boolean() = true | false</code></p> |