mirror of
https://github.com/pgpainless/pgpainless.git
synced 2024-12-23 11:27:57 +01:00
Small code style fixes and optimizations
This commit is contained in:
parent
845779d40b
commit
9b9064beae
8 changed files with 13 additions and 21 deletions
|
@ -179,12 +179,12 @@ public class SignatureVerifyingInputStream extends FilterInputStream {
|
|||
}
|
||||
|
||||
@Override
|
||||
public int read(byte[] b) throws IOException {
|
||||
public int read(@Nonnull byte[] b) throws IOException {
|
||||
return read(b, 0, b.length);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int read(byte[] b, int off, int len) throws IOException {
|
||||
public int read(@Nonnull byte[] b, int off, int len) throws IOException {
|
||||
int read = super.read(b, off, len);
|
||||
|
||||
final boolean endOfStream = read == -1;
|
||||
|
|
|
@ -342,10 +342,7 @@ public class SecretKeyRingEditor implements SecretKeyRingEditorInterface {
|
|||
}
|
||||
|
||||
boolean found = false;
|
||||
Iterator<PGPSecretKey> iterator = secretKeyRing.iterator();
|
||||
while (iterator.hasNext()) {
|
||||
PGPSecretKey secretKey = iterator.next();
|
||||
|
||||
for (PGPSecretKey secretKey : secretKeyRing) {
|
||||
// Skip over unaffected subkeys
|
||||
if (secretKey.getKeyID() != fingerprint.getKeyId()) {
|
||||
secretKeyList.add(secretKey);
|
||||
|
|
|
@ -16,6 +16,8 @@
|
|||
|
||||
package org.pgpainless.key.util;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
|
||||
public final class UserId implements CharSequence {
|
||||
public static final class Builder {
|
||||
private String name;
|
||||
|
@ -127,7 +129,7 @@ public final class UserId implements CharSequence {
|
|||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
public @Nonnull String toString() {
|
||||
return asString(false);
|
||||
}
|
||||
|
||||
|
|
|
@ -24,8 +24,8 @@ public class CollectionUtils {
|
|||
public static <I> List<I> iteratorToList(Iterator<I> iterator) {
|
||||
List<I> items = new ArrayList<>();
|
||||
while (iterator.hasNext()) {
|
||||
Object o = iterator.next();
|
||||
items.add((I) o);
|
||||
I item = iterator.next();
|
||||
items.add(item);
|
||||
}
|
||||
return items;
|
||||
}
|
||||
|
|
|
@ -40,10 +40,6 @@ public class PGPPublicKeyRingTest {
|
|||
* It does not.
|
||||
*
|
||||
* see also https://security.stackexchange.com/questions/92635/is-it-possible-to-assign-different-uids-to-subkeys-for-the-purpose-of-having-mul
|
||||
*
|
||||
* @throws InvalidAlgorithmParameterException
|
||||
* @throws NoSuchAlgorithmException
|
||||
* @throws PGPException
|
||||
*/
|
||||
@Test
|
||||
public void subkeysDoNotHaveUserIDsTest() throws InvalidAlgorithmParameterException, NoSuchAlgorithmException, PGPException {
|
||||
|
@ -54,10 +50,8 @@ public class PGPPublicKeyRingTest {
|
|||
Iterator<String> userIds = subkey.getUserIDs();
|
||||
if (primaryKey == subkey) {
|
||||
assertEquals("primary@user.id", userIds.next());
|
||||
assertFalse(userIds.hasNext());
|
||||
} else {
|
||||
assertFalse(userIds.hasNext());
|
||||
}
|
||||
assertFalse(userIds.hasNext());
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -126,9 +126,9 @@ public class ModificationDetectionTests {
|
|||
|
||||
/**
|
||||
* Messages containing a missing MDC shall fail to decrypt.
|
||||
* @param implementationFactory
|
||||
* @throws IOException
|
||||
* @throws PGPException
|
||||
* @param implementationFactory implementation factory
|
||||
* @throws IOException in case of an io-error
|
||||
* @throws PGPException in case of a pgp error
|
||||
*/
|
||||
@ParameterizedTest
|
||||
@MethodSource("org.pgpainless.util.TestUtil#provideImplementationFactories")
|
||||
|
|
|
@ -39,8 +39,6 @@ public class RecursionDepthTest {
|
|||
* Test that decryption is aborted when maximum recursion depth of nested packets is exceeded.
|
||||
*
|
||||
* @see <a href="https://tests.sequoia-pgp.org/#Maximum_recursion_depth">Sequoia-PGP Test Suite</a>
|
||||
* @throws IOException
|
||||
* @throws PGPException
|
||||
*/
|
||||
@ParameterizedTest
|
||||
@MethodSource("org.pgpainless.util.TestUtil#provideImplementationFactories")
|
||||
|
|
|
@ -38,6 +38,7 @@ public class ProviderFactoryTest {
|
|||
|
||||
private ProviderFactory customProviderFactory = new ProviderFactory() {
|
||||
|
||||
@SuppressWarnings("deprecation")
|
||||
Provider provider = new Provider("PL", 1L, "PGPainlessTestProvider") {
|
||||
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue