PGPainless/pgpainless
PGPainless/pgpainless
1
0
Fork 0
mirror of https://github.com/pgpainless/pgpainless.git synced 2025-09-12 03:39:39 +02:00
Code Issues Releases Wiki Activity

better method names

Browse source
This commit is contained in:
Ivan Pizhenko 2021-04-27 09:22:06 +03:00
parent 3c32bf607b
commit 71e0886916
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
pgpainless-core/src/main/java/org/pgpainless/key/info/KeyInfo.java
View file

@ -69,8 +69,8 @@ public class KeyInfo {
* @return true if secret key has S2K of a type GNU_DUMMY_S2K, false if there is public key only,
* or S2K on the secret key is absent or not of a type GNU_DUMMY_S2K.
*/
public boolean hasGnuDummyS2K() {
return secretKey != null && hasGnuDummyS2K(secretKey);
public boolean hasDummyS2K() {
return secretKey != null && hasDummyS2K(secretKey);
}
public static String getCurveName(PGPPublicKey publicKey) {
@ -125,7 +125,7 @@ public class KeyInfo {
* @param secretKey A secret key to examine.
* @return true if secret key has S2K of a type GNU_DUMMY_S2K, false otherwise.
*/
public static boolean hasGnuDummyS2K(PGPSecretKey secretKey) {
public static boolean hasDummyS2K(PGPSecretKey secretKey) {
final S2K s2k = secretKey.getS2K();
return s2k != null && s2k.getType() == S2K.GNU_DUMMY_S2K;
}

4
pgpainless-core/src/main/java/org/pgpainless/key/info/KeyRingInfo.java
View file

@ -308,7 +308,7 @@ public class KeyRingInfo {
public boolean isFullyDecrypted() {
if (isSecretKey()) {
for (PGPSecretKey secretKey : getSecretKeys()) {
if (!KeyInfo.hasGnuDummyS2K(secretKey) && KeyInfo.isEncrypted(secretKey)) {
if (!KeyInfo.hasDummyS2K(secretKey) && KeyInfo.isEncrypted(secretKey)) {
return false;
}
}
@ -327,7 +327,7 @@ public class KeyRingInfo {
public boolean isFullyEncrypted() {
if (isSecretKey()) {
for (PGPSecretKey secretKey : getSecretKeys()) {
if (!KeyInfo.hasGnuDummyS2K(secretKey) && KeyInfo.isDecrypted(secretKey)) {
if (!KeyInfo.hasDummyS2K(secretKey) && KeyInfo.isDecrypted(secretKey)) {
return false;
}
}