aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorJack Lloyd <[email protected]>2018-01-04 05:46:44 -0500
committerJack Lloyd <[email protected]>2018-01-04 05:46:44 -0500
commit4eee6f1c1f9f29a344a029e4d7cce7962e71af4f (patch)
tree532e0ae6ec81da0b8ec2bac7c913473d85dd2611 /doc
parent7e27a1295b26e4d7b34b66a8e399e408fa527b55 (diff)
Remove merge marker fixes GH #1384
Diffstat (limited to 'doc')
-rw-r--r--doc/manual/cli.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/manual/cli.rst b/doc/manual/cli.rst
index ecebe74e5..7427feb5d 100644
--- a/doc/manual/cli.rst
+++ b/doc/manual/cli.rst
@@ -95,13 +95,13 @@ Public Key Cryptography
X.509
----------------------------------------------
-<<<<<<< HEAD
+
``gen_pkcs10 key CN --country= --organization= --email= --key-pass= --hash=SHA-256 --emsa=``
Generate a PKCS #10 certificate signing request (CSR) using the passed PKCS #8
private key *key*. If the private key is encrypted, the decryption passphrase
*key-pass* has to be passed.*emsa* specifies the padding scheme to be used
when calculating the signature.
-
+
- For RSA keys EMSA4 (RSA-PSS) is the default scheme.
- For ECDSA, DSA, ECGDSA, ECKCDSA and GOST-34.10 keys *emsa* defaults to EMSA1.