From d842c78c840b7a0bf7f79dfbca762fdf48e8c466 Mon Sep 17 00:00:00 2001 From: vrushti-mody Date: Thu, 4 Jun 2020 14:21:06 +0530 Subject: [PATCH 1/8] Fixed erreneous documentation in Split gpg --- user/security-in-qubes/split-gpg.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user/security-in-qubes/split-gpg.md b/user/security-in-qubes/split-gpg.md index 105c43ec..c1c28781 100644 --- a/user/security-in-qubes/split-gpg.md +++ b/user/security-in-qubes/split-gpg.md @@ -57,7 +57,7 @@ This way it would be easy to spot unexpected requests to decrypt documents. Doing so won't provide any extra security anyway, as explained [above][intro] and [below][using Split GPG with subkeys]. If you are generating a new key pair, or if you have a private key that already has a passphrase, you can use `gpg2 --edit-key ` then `passwd` to set an empty passphrase. Note that `pinentry` might show an error when you try to set an empty passphrase, but it will still make the change. - (See [this StackExchange answer][se-pinentry] for more information.) + (See [this StackExchange answer][se-pinentry] for more information.)Note: The error shows only if you **donot** have graphical pinentry installed. The Split GPG client let you use password-protected keys, the vault cube will show a passphrase if you are using R4. ## Configuring Split GPG ## From 62380052ee0307f5961fa7f061ebd62546bb14ab Mon Sep 17 00:00:00 2001 From: vrushti-mody Date: Fri, 5 Jun 2020 15:57:37 +0530 Subject: [PATCH 2/8] Fixes erreneous documentation in Split gpg --- user/security-in-qubes/split-gpg.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user/security-in-qubes/split-gpg.md b/user/security-in-qubes/split-gpg.md index c1c28781..503a91e1 100644 --- a/user/security-in-qubes/split-gpg.md +++ b/user/security-in-qubes/split-gpg.md @@ -57,7 +57,7 @@ This way it would be easy to spot unexpected requests to decrypt documents. Doing so won't provide any extra security anyway, as explained [above][intro] and [below][using Split GPG with subkeys]. If you are generating a new key pair, or if you have a private key that already has a passphrase, you can use `gpg2 --edit-key ` then `passwd` to set an empty passphrase. Note that `pinentry` might show an error when you try to set an empty passphrase, but it will still make the change. - (See [this StackExchange answer][se-pinentry] for more information.)Note: The error shows only if you **donot** have graphical pinentry installed. The Split GPG client let you use password-protected keys, the vault cube will show a passphrase if you are using R4. + (See [this StackExchange answer][se-pinentry] for more information.) Note: The error shows only if you **do not** have graphical pinentry installed. The Split GPG client lets you use password-protected keys, the vault qube will show a passphrase if you are using R4. ## Configuring Split GPG ## From d9c3321e555195b16f0a0c408453492057e52c43 Mon Sep 17 00:00:00 2001 From: vrushti-mody Date: Fri, 5 Jun 2020 16:15:32 +0530 Subject: [PATCH 3/8] Fixes #4901 --- user/security-in-qubes/split-gpg.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/user/security-in-qubes/split-gpg.md b/user/security-in-qubes/split-gpg.md index 503a91e1..0f462fb6 100644 --- a/user/security-in-qubes/split-gpg.md +++ b/user/security-in-qubes/split-gpg.md @@ -57,7 +57,8 @@ This way it would be easy to spot unexpected requests to decrypt documents. Doing so won't provide any extra security anyway, as explained [above][intro] and [below][using Split GPG with subkeys]. If you are generating a new key pair, or if you have a private key that already has a passphrase, you can use `gpg2 --edit-key ` then `passwd` to set an empty passphrase. Note that `pinentry` might show an error when you try to set an empty passphrase, but it will still make the change. - (See [this StackExchange answer][se-pinentry] for more information.) Note: The error shows only if you **do not** have graphical pinentry installed. The Split GPG client lets you use password-protected keys, the vault qube will show a passphrase if you are using R4. + (See [this StackExchange answer][se-pinentry] for more information.) + Note: The error shows only if you **do not** have graphical pinentry installed. The Split GPG client lets you use password-protected keys, the vault qube will show a passphrase if you are using R4. ## Configuring Split GPG ## From 226a065b34029ecd2be1dc6514e1c730753dd1ba Mon Sep 17 00:00:00 2001 From: vrushti-mody Date: Fri, 5 Jun 2020 16:17:52 +0530 Subject: [PATCH 4/8] Fixes #4901 'Outdated paragraph in Split GPG limitations section' --- user/security-in-qubes/split-gpg.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/user/security-in-qubes/split-gpg.md b/user/security-in-qubes/split-gpg.md index 0f462fb6..503a91e1 100644 --- a/user/security-in-qubes/split-gpg.md +++ b/user/security-in-qubes/split-gpg.md @@ -57,8 +57,7 @@ This way it would be easy to spot unexpected requests to decrypt documents. Doing so won't provide any extra security anyway, as explained [above][intro] and [below][using Split GPG with subkeys]. If you are generating a new key pair, or if you have a private key that already has a passphrase, you can use `gpg2 --edit-key ` then `passwd` to set an empty passphrase. Note that `pinentry` might show an error when you try to set an empty passphrase, but it will still make the change. - (See [this StackExchange answer][se-pinentry] for more information.) - Note: The error shows only if you **do not** have graphical pinentry installed. The Split GPG client lets you use password-protected keys, the vault qube will show a passphrase if you are using R4. + (See [this StackExchange answer][se-pinentry] for more information.) Note: The error shows only if you **do not** have graphical pinentry installed. The Split GPG client lets you use password-protected keys, the vault qube will show a passphrase if you are using R4. ## Configuring Split GPG ## From ea36995c11d0f9c13813e2d4a4693a1bd3bdfa74 Mon Sep 17 00:00:00 2001 From: vrushti-mody Date: Fri, 5 Jun 2020 16:46:50 +0530 Subject: [PATCH 5/8] Fixes #4901 'Outdated paragraph in Split GPG limitations section' --- user/security-in-qubes/split-gpg.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user/security-in-qubes/split-gpg.md b/user/security-in-qubes/split-gpg.md index 503a91e1..85bde31a 100644 --- a/user/security-in-qubes/split-gpg.md +++ b/user/security-in-qubes/split-gpg.md @@ -57,7 +57,7 @@ This way it would be easy to spot unexpected requests to decrypt documents. Doing so won't provide any extra security anyway, as explained [above][intro] and [below][using Split GPG with subkeys]. If you are generating a new key pair, or if you have a private key that already has a passphrase, you can use `gpg2 --edit-key ` then `passwd` to set an empty passphrase. Note that `pinentry` might show an error when you try to set an empty passphrase, but it will still make the change. - (See [this StackExchange answer][se-pinentry] for more information.) Note: The error shows only if you **do not** have graphical pinentry installed. The Split GPG client lets you use password-protected keys, the vault qube will show a passphrase if you are using R4. + (See [this StackExchange answer][se-pinentry] for more information.) Note: The error shows only if you **do not** have graphical pinentry installed. The Split GPG client lets you use password-protected keys and the vault qube will show the passphrase. ## Configuring Split GPG ## From 2daf586dc8ce2544b1b0474a7abe70381e768d1d Mon Sep 17 00:00:00 2001 From: vrushti-mody Date: Fri, 5 Jun 2020 18:28:50 +0530 Subject: [PATCH 6/8] Fixes #4901 'Outdated paragraph in Split GPG limitations section' --- user/security-in-qubes/split-gpg.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user/security-in-qubes/split-gpg.md b/user/security-in-qubes/split-gpg.md index 85bde31a..4560e062 100644 --- a/user/security-in-qubes/split-gpg.md +++ b/user/security-in-qubes/split-gpg.md @@ -57,7 +57,7 @@ This way it would be easy to spot unexpected requests to decrypt documents. Doing so won't provide any extra security anyway, as explained [above][intro] and [below][using Split GPG with subkeys]. If you are generating a new key pair, or if you have a private key that already has a passphrase, you can use `gpg2 --edit-key ` then `passwd` to set an empty passphrase. Note that `pinentry` might show an error when you try to set an empty passphrase, but it will still make the change. - (See [this StackExchange answer][se-pinentry] for more information.) Note: The error shows only if you **do not** have graphical pinentry installed. The Split GPG client lets you use password-protected keys and the vault qube will show the passphrase. + (See [this StackExchange answer][se-pinentry] for more information.) Note: The error shows only if you **do not** have graphical pinentry installed. ## Configuring Split GPG ## From c7309fe6150dee28787ffd8fc584fa3114d10179 Mon Sep 17 00:00:00 2001 From: Andrew David Wong Date: Fri, 5 Jun 2020 12:43:37 -0500 Subject: [PATCH 7/8] Add missing comma --- user/security-in-qubes/split-gpg.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user/security-in-qubes/split-gpg.md b/user/security-in-qubes/split-gpg.md index 85bde31a..e8b99d48 100644 --- a/user/security-in-qubes/split-gpg.md +++ b/user/security-in-qubes/split-gpg.md @@ -57,7 +57,7 @@ This way it would be easy to spot unexpected requests to decrypt documents. Doing so won't provide any extra security anyway, as explained [above][intro] and [below][using Split GPG with subkeys]. If you are generating a new key pair, or if you have a private key that already has a passphrase, you can use `gpg2 --edit-key ` then `passwd` to set an empty passphrase. Note that `pinentry` might show an error when you try to set an empty passphrase, but it will still make the change. - (See [this StackExchange answer][se-pinentry] for more information.) Note: The error shows only if you **do not** have graphical pinentry installed. The Split GPG client lets you use password-protected keys and the vault qube will show the passphrase. + (See [this StackExchange answer][se-pinentry] for more information.) Note: The error shows only if you **do not** have graphical pinentry installed. The Split GPG client lets you use password-protected keys, and the vault qube will show the passphrase. ## Configuring Split GPG ## From c3b338635a53b61365836b01bea963b626b34206 Mon Sep 17 00:00:00 2001 From: vrushti-mody Date: Mon, 8 Jun 2020 11:27:01 +0530 Subject: [PATCH 8/8] Fixes #4901 'Outdated paragraph in Split GPG limitations section' --- user/security-in-qubes/split-gpg.md | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/user/security-in-qubes/split-gpg.md b/user/security-in-qubes/split-gpg.md index b2a57180..a62a9d4d 100644 --- a/user/security-in-qubes/split-gpg.md +++ b/user/security-in-qubes/split-gpg.md @@ -57,11 +57,8 @@ This way it would be easy to spot unexpected requests to decrypt documents. Doing so won't provide any extra security anyway, as explained [above][intro] and [below][using Split GPG with subkeys]. If you are generating a new key pair, or if you have a private key that already has a passphrase, you can use `gpg2 --edit-key ` then `passwd` to set an empty passphrase. Note that `pinentry` might show an error when you try to set an empty passphrase, but it will still make the change. -<<<<<<< HEAD - (See [this StackExchange answer][se-pinentry] for more information.) Note: The error shows only if you **do not** have graphical pinentry installed. -======= - (See [this StackExchange answer][se-pinentry] for more information.) Note: The error shows only if you **do not** have graphical pinentry installed. The Split GPG client lets you use password-protected keys, and the vault qube will show the passphrase. ->>>>>>> c7309fe6150dee28787ffd8fc584fa3114d10179 + (See [this StackExchange answer][se-pinentry] for more information.) + Note: The error shows only if you **do not** have graphical pinentry installed. ## Configuring Split GPG ##