diff options
| author | Jack Lloyd <[email protected]> | 2017-08-29 15:27:12 -0400 |
|---|---|---|
| committer | Jack Lloyd <[email protected]> | 2017-08-29 15:27:12 -0400 |
| commit | 81ced621e79e900aed7b6f5daf8d5a3bfc894275 (patch) | |
| tree | b1700e4095153e39465f9caa37f8a0edc1a80d5c /doc | |
| parent | d024157179b0e313dc0fd1bf228236e68b673132 (diff) | |
Correct manual re key agreement schemes
See #1166
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/manual/pubkey.rst | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/doc/manual/pubkey.rst b/doc/manual/pubkey.rst index afc130a0a..1e13cd1bc 100644 --- a/doc/manual/pubkey.rst +++ b/doc/manual/pubkey.rst @@ -462,7 +462,9 @@ Botan implements the following encryption algorithms and padding schemes: 1. RSA - "PKCS1v15" || "EME-PKCS1-v1_5" - "OAEP" || "EME-OAEP" || "EME1" || "EME1(SHA-1)" || "EME1(SHA-256)" - +#. DLIES +#. ECIES +#. SM2 Code Example ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -613,6 +615,8 @@ Botan implements the following signature algorithms: #. ECGDSA #. ECKDSA #. GOST 34.10-2001 +#. Ed25519 +#. SM2 Code Example ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -695,11 +699,11 @@ to use. Botan implements the following key agreement methods: -1. ECDH -#. DH -#. DLIES -#. ECIES - +1. ECDH over GF(p) Weierstrass curves +#. ECDH over x25519 +#. DH over prime fields +#. McEliece +#. NewHope Code Example ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ |