diff options
| author | Ingela Anderton Andin <[email protected]> | 2014-08-26 13:56:22 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2014-08-27 16:16:01 +0200 |
| commit | 20aaacb5bc3ad0865c581ced9bd84e0a08a81514 (patch) | |
| tree | a2c09970946cb1cf4d1a1692bf16c4945d97e106 /lib/public_key/doc | |
| parent | 885011a731cf86fb1e1369d2dc00b890e026dc49 (diff) | |
| download | otp-20aaacb5bc3ad0865c581ced9bd84e0a08a81514.tar.gz otp-20aaacb5bc3ad0865c581ced9bd84e0a08a81514.tar.bz2 otp-20aaacb5bc3ad0865c581ced9bd84e0a08a81514.zip | |
public_key: Fix spec and documentation for PBES
Diffstat (limited to 'lib/public_key/doc')
| -rw-r--r-- | lib/public_key/doc/src/public_key.xml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/public_key/doc/src/public_key.xml b/lib/public_key/doc/src/public_key.xml index f8011cd5c0..acb933dd39 100644 --- a/lib/public_key/doc/src/public_key.xml +++ b/lib/public_key/doc/src/public_key.xml @@ -92,7 +92,7 @@ not_encrypted | cipher_info()}</code></p> <p><code>cipher_info() = {"RC2-CBC | "DES-CBC" | "DES-EDE3-CBC", - crypto:rand_bytes(8)} | 'PBES2-params'}</code></p> + crypto:rand_bytes(8) | {#'PBEParameter{}, digest_type()} |#'PBES2-params'{}}</code></p> <p><code>public_key() = rsa_public_key() | dsa_public_key() | ec_public_key()</code></p> <p><code>private_key() = rsa_private_key() | dsa_private_key() | ec_private_key()</code></p> @@ -113,6 +113,8 @@ <p><code>rsa_padding() = 'rsa_pkcs1_padding' | 'rsa_pkcs1_oaep_padding' | 'rsa_no_padding'</code></p> + + <p><code>digest_type() - Union of below digest types</code></p> <p><code>rsa_digest_type() = 'md5' | 'sha' | 'sha224' | 'sha256' | 'sha384' | 'sha512'</code></p> |