Skip to content

Commit 48c9cdd

Browse files
Adding additional tests for RawAesKeyring and RawRsaKeyring
1 parent b65226b commit 48c9cdd

File tree

3 files changed

+192
-130
lines changed

3 files changed

+192
-130
lines changed

src/test/java/com/amazonaws/encryptionsdk/keyrings/RawAesKeyringTest.java

+79-38
Original file line numberDiff line numberDiff line change
@@ -13,72 +13,113 @@
1313

1414
package com.amazonaws.encryptionsdk.keyrings;
1515

16+
import com.amazonaws.encryptionsdk.model.DecryptionMaterials;
17+
import com.amazonaws.encryptionsdk.model.EncryptionMaterials;
1618
import com.amazonaws.encryptionsdk.model.KeyBlob;
1719
import org.apache.commons.lang3.ArrayUtils;
1820
import org.junit.Test;
19-
import org.junit.runner.RunWith;
20-
import org.mockito.Mock;
21-
import org.mockito.junit.MockitoJUnitRunner;
2221

23-
import javax.crypto.SecretKey;
22+
import javax.crypto.spec.SecretKeySpec;
2423
import java.nio.charset.StandardCharsets;
2524

25+
import static com.amazonaws.encryptionsdk.internal.RandomBytesGenerator.generate;
26+
import static com.amazonaws.encryptionsdk.keyrings.RawKeyringTest.ALGORITHM;
27+
import static com.amazonaws.encryptionsdk.keyrings.RawKeyringTest.DATA_KEY;
28+
import static com.amazonaws.encryptionsdk.keyrings.RawKeyringTest.ENCRYPTION_CONTEXT;
2629
import static com.amazonaws.encryptionsdk.keyrings.RawKeyringTest.KEYNAME;
2730
import static com.amazonaws.encryptionsdk.keyrings.RawKeyringTest.KEYNAMESPACE;
2831
import static org.junit.Assert.assertEquals;
2932
import static org.junit.Assert.assertFalse;
33+
import static org.junit.Assert.assertNotNull;
3034
import static org.junit.Assert.assertTrue;
3135

32-
@RunWith(MockitoJUnitRunner.class)
3336
public class RawAesKeyringTest {
3437

35-
@Mock
36-
private SecretKey wrappingKey;
38+
private final RawAesKeyring keyring = new RawAesKeyring(KEYNAMESPACE, KEYNAME, new SecretKeySpec(generate(32), "AES"));
3739

3840
@Test
3941
public void testValidToDecrypt() {
40-
RawAesKeyring rawAesKeyring = new RawAesKeyring(KEYNAMESPACE, KEYNAME, wrappingKey);
41-
42-
assertTrue(rawAesKeyring.validToDecrypt(new KeyBlob(
42+
assertTrue(keyring.validToDecrypt(new KeyBlob(
4343
KEYNAMESPACE, KEYNAME.getBytes(StandardCharsets.UTF_8), new byte[]{})));
44-
assertTrue(rawAesKeyring.validToDecrypt(new KeyBlob(
45-
KEYNAMESPACE, ArrayUtils.add(KEYNAME.getBytes(StandardCharsets.UTF_8), (byte)5), new byte[]{})));
44+
assertTrue(keyring.validToDecrypt(new KeyBlob(
45+
KEYNAMESPACE, ArrayUtils.add(KEYNAME.getBytes(StandardCharsets.UTF_8), (byte) 5), new byte[]{})));
4646
//Bad namespace
47-
assertFalse(rawAesKeyring.validToDecrypt(new KeyBlob(
47+
assertFalse(keyring.validToDecrypt(new KeyBlob(
4848
"WrongNamespace", KEYNAME.getBytes(StandardCharsets.UTF_8), new byte[]{})));
4949
//Bad provider info
50-
assertFalse(rawAesKeyring.validToDecrypt(new KeyBlob(
50+
assertFalse(keyring.validToDecrypt(new KeyBlob(
5151
KEYNAMESPACE, new byte[]{1,2,3}, new byte[]{})));
5252
}
5353

5454
@Test
55-
public void testTraceOnEncrypt() {
56-
RawAesKeyring rawAesKeyring = new RawAesKeyring(KEYNAMESPACE, KEYNAME, wrappingKey);
57-
58-
KeyringTrace trace = new KeyringTrace();
59-
60-
rawAesKeyring.traceOnEncrypt(trace);
61-
assertEquals(1, trace.getEntries().size());
62-
assertEquals(KEYNAME, trace.getEntries().get(0).getKeyName());
63-
assertEquals(KEYNAMESPACE, trace.getEntries().get(0).getKeyNamespace());
64-
assertEquals(2, trace.getEntries().get(0).getFlags().size());
65-
assertTrue(trace.getEntries().get(0).getFlags().contains(KeyringTraceFlag.ENCRYPTED_DATA_KEY));
66-
assertTrue(trace.getEntries().get(0).getFlags().contains(KeyringTraceFlag.SIGNED_ENCRYPTION_CONTEXT));
55+
public void testEncryptDecryptExistingDataKey() {
56+
EncryptionMaterials encryptionMaterials = EncryptionMaterials.newBuilder()
57+
.setAlgorithm(ALGORITHM)
58+
.setCleartextDataKey(DATA_KEY)
59+
.setKeyringTrace(new KeyringTrace())
60+
.setEncryptionContext(ENCRYPTION_CONTEXT)
61+
.build();
62+
63+
keyring.onEncrypt(encryptionMaterials);
64+
65+
assertEquals(1, encryptionMaterials.getEncryptedDataKeys().size());
66+
assertEquals(1, encryptionMaterials.getKeyringTrace().getEntries().size());
67+
assertEquals(KEYNAME, encryptionMaterials.getKeyringTrace().getEntries().get(0).getKeyName());
68+
assertEquals(KEYNAMESPACE, encryptionMaterials.getKeyringTrace().getEntries().get(0).getKeyNamespace());
69+
assertEquals(2, encryptionMaterials.getKeyringTrace().getEntries().get(0).getFlags().size());
70+
assertTrue(encryptionMaterials.getKeyringTrace().getEntries().get(0).getFlags().contains(KeyringTraceFlag.ENCRYPTED_DATA_KEY));
71+
assertTrue(encryptionMaterials.getKeyringTrace().getEntries().get(0).getFlags().contains(KeyringTraceFlag.SIGNED_ENCRYPTION_CONTEXT));
72+
73+
DecryptionMaterials decryptionMaterials = DecryptionMaterials.newBuilder()
74+
.setAlgorithm(ALGORITHM)
75+
.setEncryptionContext(ENCRYPTION_CONTEXT)
76+
.setKeyringTrace(new KeyringTrace())
77+
.build();
78+
79+
keyring.onDecrypt(decryptionMaterials, encryptionMaterials.getEncryptedDataKeys());
80+
81+
assertEquals(DATA_KEY, decryptionMaterials.getCleartextDataKey());
82+
assertEquals(KEYNAME, decryptionMaterials.getKeyringTrace().getEntries().get(0).getKeyName());
83+
assertEquals(KEYNAMESPACE, decryptionMaterials.getKeyringTrace().getEntries().get(0).getKeyNamespace());
84+
assertEquals(2, decryptionMaterials.getKeyringTrace().getEntries().get(0).getFlags().size());
85+
assertTrue(decryptionMaterials.getKeyringTrace().getEntries().get(0).getFlags().contains(KeyringTraceFlag.DECRYPTED_DATA_KEY));
86+
assertTrue(decryptionMaterials.getKeyringTrace().getEntries().get(0).getFlags().contains(KeyringTraceFlag.VERIFIED_ENCRYPTION_CONTEXT));
6787
}
6888

6989
@Test
70-
public void testTraceOnDecrypt() {
71-
RawAesKeyring rawAesKeyring = new RawAesKeyring(KEYNAMESPACE, KEYNAME, wrappingKey);
72-
73-
KeyringTrace trace = new KeyringTrace();
74-
75-
rawAesKeyring.traceOnDecrypt(trace);
76-
assertEquals(1, trace.getEntries().size());
77-
assertEquals(KEYNAME, trace.getEntries().get(0).getKeyName());
78-
assertEquals(KEYNAMESPACE, trace.getEntries().get(0).getKeyNamespace());
79-
assertEquals(2, trace.getEntries().get(0).getFlags().size());
80-
assertTrue(trace.getEntries().get(0).getFlags().contains(KeyringTraceFlag.DECRYPTED_DATA_KEY));
81-
assertTrue(trace.getEntries().get(0).getFlags().contains(KeyringTraceFlag.VERIFIED_ENCRYPTION_CONTEXT));
90+
public void testEncryptDecryptGenerateDataKey() {
91+
EncryptionMaterials encryptionMaterials = EncryptionMaterials.newBuilder()
92+
.setAlgorithm(ALGORITHM)
93+
.setKeyringTrace(new KeyringTrace())
94+
.setEncryptionContext(ENCRYPTION_CONTEXT)
95+
.build();
96+
97+
keyring.onEncrypt(encryptionMaterials);
98+
99+
assertNotNull(encryptionMaterials.getCleartextDataKey());
100+
assertEquals(encryptionMaterials.getCleartextDataKey().getAlgorithm(), ALGORITHM.getDataKeyAlgo());
101+
assertEquals(1, encryptionMaterials.getEncryptedDataKeys().size());
102+
assertEquals(2, encryptionMaterials.getKeyringTrace().getEntries().size());
103+
assertEquals(1, encryptionMaterials.getKeyringTrace().getEntries().get(0).getFlags().size());
104+
assertTrue(encryptionMaterials.getKeyringTrace().getEntries().get(0).getFlags().contains(KeyringTraceFlag.GENERATED_DATA_KEY));
105+
assertEquals(2, encryptionMaterials.getKeyringTrace().getEntries().get(1).getFlags().size());
106+
assertTrue(encryptionMaterials.getKeyringTrace().getEntries().get(1).getFlags().contains(KeyringTraceFlag.ENCRYPTED_DATA_KEY));
107+
assertTrue(encryptionMaterials.getKeyringTrace().getEntries().get(1).getFlags().contains(KeyringTraceFlag.SIGNED_ENCRYPTION_CONTEXT));
108+
109+
DecryptionMaterials decryptionMaterials = DecryptionMaterials.newBuilder()
110+
.setAlgorithm(ALGORITHM)
111+
.setEncryptionContext(ENCRYPTION_CONTEXT)
112+
.setKeyringTrace(new KeyringTrace())
113+
.build();
114+
115+
keyring.onDecrypt(decryptionMaterials, encryptionMaterials.getEncryptedDataKeys());
116+
117+
assertEquals(encryptionMaterials.getCleartextDataKey(), decryptionMaterials.getCleartextDataKey());
118+
assertEquals(KEYNAME, decryptionMaterials.getKeyringTrace().getEntries().get(0).getKeyName());
119+
assertEquals(KEYNAMESPACE, decryptionMaterials.getKeyringTrace().getEntries().get(0).getKeyNamespace());
120+
assertEquals(2, decryptionMaterials.getKeyringTrace().getEntries().get(0).getFlags().size());
121+
assertTrue(decryptionMaterials.getKeyringTrace().getEntries().get(0).getFlags().contains(KeyringTraceFlag.DECRYPTED_DATA_KEY));
122+
assertTrue(decryptionMaterials.getKeyringTrace().getEntries().get(0).getFlags().contains(KeyringTraceFlag.VERIFIED_ENCRYPTION_CONTEXT));
82123
}
83124

84125
}

src/test/java/com/amazonaws/encryptionsdk/keyrings/RawKeyringTest.java

+35-59
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
import com.amazonaws.encryptionsdk.model.DecryptionMaterials;
2020
import com.amazonaws.encryptionsdk.model.EncryptionMaterials;
2121
import com.amazonaws.encryptionsdk.model.KeyBlob;
22+
import org.junit.Before;
2223
import org.junit.Test;
2324
import org.junit.runner.RunWith;
2425
import org.mockito.ArgumentCaptor;
25-
import org.mockito.Captor;
2626
import org.mockito.Mock;
2727
import org.mockito.junit.MockitoJUnitRunner;
2828

@@ -33,7 +33,6 @@
3333
import java.util.Collections;
3434
import java.util.List;
3535
import java.util.Map;
36-
import java.util.function.Function;
3736

3837
import static org.junit.Assert.assertArrayEquals;
3938
import static org.junit.Assert.assertEquals;
@@ -47,30 +46,50 @@ public class RawKeyringTest {
4746

4847
static final String KEYNAME = "testKeyname";
4948
static final String KEYNAMESPACE = "testKeynamespace";
50-
private static final CryptoAlgorithm ALGORITHM = CryptoAlgorithm.ALG_AES_192_GCM_IV12_TAG16_HKDF_SHA384_ECDSA_P384;
49+
static final CryptoAlgorithm ALGORITHM = CryptoAlgorithm.ALG_AES_192_GCM_IV12_TAG16_HKDF_SHA384_ECDSA_P384;
5150
static final SecretKey DATA_KEY = new SecretKeySpec(new byte[]{10, 11, 12}, ALGORITHM.getDataKeyAlgo());
51+
static final Map<String, String> ENCRYPTION_CONTEXT = Collections.singletonMap("myKey", "myValue");
5252
private static final EncryptedDataKey ENCRYPTED_DATA_KEY = new KeyBlob("keyProviderId", new byte[]{1, 2, 3}, new byte[]{4, 5, 6});
53-
private static final Map<String, String> ENCRYPTION_CONTEXT = Collections.singletonMap("myKey", "myValue");
53+
private static final EncryptedDataKey INVALID_DATA_KEY = new KeyBlob("invalidProviderId", new byte[]{1, 2, 3}, new byte[]{4, 5, 6});
5454
private static final KeyringTraceEntry ENCRYPTED_DATA_KEY_TRACE = new KeyringTraceEntry(KEYNAMESPACE, KEYNAME, Collections.singleton(KeyringTraceFlag.ENCRYPTED_DATA_KEY));
5555
private static final KeyringTraceEntry DECRYPTED_DATA_KEY_TRACE = new KeyringTraceEntry(KEYNAMESPACE, KEYNAME, Collections.singleton(KeyringTraceFlag.DECRYPTED_DATA_KEY));
5656
private static final KeyringTraceEntry GENERATED_DATA_KEY_TRACE = new KeyringTraceEntry(KEYNAMESPACE, KEYNAME, Collections.singleton(KeyringTraceFlag.GENERATED_DATA_KEY));
5757
@Mock
5858
private JceKeyCipher jceKeyCipher;
59-
@Captor
60-
private ArgumentCaptor<byte[]> dataKeyCaptor;
59+
private Keyring keyring;
6160

62-
@Test
63-
public void testEncryptDecryptExistingDataKey() throws GeneralSecurityException {
64-
Keyring keyring = newRawKeyring(jceKeyCipher, (edk) -> true, ENCRYPTED_DATA_KEY_TRACE, DECRYPTED_DATA_KEY_TRACE);
61+
@Before
62+
public void setup() throws Exception {
63+
when(jceKeyCipher.encryptKey(DATA_KEY.getEncoded(), KEYNAME, KEYNAMESPACE, ENCRYPTION_CONTEXT)).thenReturn(ENCRYPTED_DATA_KEY);
64+
when(jceKeyCipher.decryptKey(ENCRYPTED_DATA_KEY, KEYNAME, ENCRYPTION_CONTEXT)).thenReturn(DATA_KEY.getEncoded());
65+
66+
keyring = new RawKeyring(KEYNAMESPACE, KEYNAME, jceKeyCipher) {
67+
@Override
68+
boolean validToDecrypt(EncryptedDataKey encryptedDataKey) {
69+
return !encryptedDataKey.getProviderId().equals(INVALID_DATA_KEY.getProviderId());
70+
}
71+
72+
@Override
73+
void traceOnEncrypt(KeyringTrace keyringTrace) {
74+
keyringTrace.add(KEYNAMESPACE, KEYNAME, ENCRYPTED_DATA_KEY_TRACE.getFlags().toArray(new KeyringTraceFlag[]{}));
75+
}
6576

77+
@Override
78+
void traceOnDecrypt(KeyringTrace keyringTrace) {
79+
keyringTrace.add(KEYNAMESPACE, KEYNAME, DECRYPTED_DATA_KEY_TRACE.getFlags().toArray(new KeyringTraceFlag[]{}));
80+
}
81+
};
82+
}
83+
84+
@Test
85+
public void testEncryptDecryptExistingDataKey() {
6686
EncryptionMaterials encryptionMaterials = EncryptionMaterials.newBuilder()
6787
.setAlgorithm(ALGORITHM)
6888
.setCleartextDataKey(DATA_KEY)
6989
.setKeyringTrace(new KeyringTrace())
7090
.setEncryptionContext(ENCRYPTION_CONTEXT)
7191
.build();
7292

73-
when(jceKeyCipher.encryptKey(DATA_KEY.getEncoded(), KEYNAME, KEYNAMESPACE, ENCRYPTION_CONTEXT)).thenReturn(ENCRYPTED_DATA_KEY);
7493
keyring.onEncrypt(encryptionMaterials);
7594

7695
assertEquals(1, encryptionMaterials.getEncryptedDataKeys().size());
@@ -84,23 +103,21 @@ public void testEncryptDecryptExistingDataKey() throws GeneralSecurityException
84103
.setKeyringTrace(new KeyringTrace())
85104
.build();
86105

87-
when(jceKeyCipher.decryptKey(encryptionMaterials.getEncryptedDataKeys().get(0), KEYNAME, ENCRYPTION_CONTEXT)).thenReturn(DATA_KEY.getEncoded());
88-
keyring.onDecrypt(decryptionMaterials, encryptionMaterials.getEncryptedDataKeys());
106+
keyring.onDecrypt(decryptionMaterials, Collections.singletonList(ENCRYPTED_DATA_KEY));
89107

90108
assertEquals(DATA_KEY, decryptionMaterials.getCleartextDataKey());
91109
assertEquals(DECRYPTED_DATA_KEY_TRACE, decryptionMaterials.getKeyringTrace().getEntries().get(0));
92110
}
93111

94112
@Test
95113
public void testEncryptNullDataKey() {
96-
Keyring keyring = newRawKeyring(jceKeyCipher, (edk) -> true, ENCRYPTED_DATA_KEY_TRACE, null);
97-
98114
EncryptionMaterials encryptionMaterials = EncryptionMaterials.newBuilder()
99115
.setAlgorithm(ALGORITHM)
100116
.setKeyringTrace(new KeyringTrace())
101117
.setEncryptionContext(ENCRYPTION_CONTEXT)
102118
.build();
103119

120+
ArgumentCaptor<byte[]> dataKeyCaptor = ArgumentCaptor.forClass(byte[].class);
104121
when(jceKeyCipher.encryptKey(dataKeyCaptor.capture(), eq(KEYNAME), eq(KEYNAMESPACE), eq(ENCRYPTION_CONTEXT))).thenReturn(ENCRYPTED_DATA_KEY);
105122
keyring.onEncrypt(encryptionMaterials);
106123

@@ -116,8 +133,6 @@ public void testEncryptNullDataKey() {
116133

117134
@Test(expected = IllegalArgumentException.class)
118135
public void testEncryptBadDataKeyAlgorithm() {
119-
Keyring keyring = newRawKeyring(jceKeyCipher, (edk) -> true, null, null);
120-
121136
EncryptionMaterials encryptionMaterials = EncryptionMaterials.newBuilder()
122137
.setAlgorithm(ALGORITHM)
123138
.setCleartextDataKey(new SecretKeySpec(DATA_KEY.getEncoded(), "OtherAlgorithm"))
@@ -130,8 +145,6 @@ public void testEncryptBadDataKeyAlgorithm() {
130145

131146
@Test
132147
public void testDecryptAlreadyDecryptedDataKey() {
133-
Keyring keyring = newRawKeyring(jceKeyCipher, (edk) -> true, null, null);
134-
135148
DecryptionMaterials decryptionMaterials = DecryptionMaterials.newBuilder()
136149
.setAlgorithm(ALGORITHM)
137150
.setCleartextDataKey(DATA_KEY)
@@ -147,36 +160,28 @@ public void testDecryptAlreadyDecryptedDataKey() {
147160

148161
@Test
149162
public void testDecryptNoValidDataKey() {
150-
Keyring keyring = newRawKeyring(jceKeyCipher, (edk) -> false, null, null);
151-
152163
DecryptionMaterials decryptionMaterials = DecryptionMaterials.newBuilder()
153164
.setAlgorithm(ALGORITHM)
154165
.setEncryptionContext(ENCRYPTION_CONTEXT)
155166
.setKeyringTrace(new KeyringTrace())
156167
.build();
157168

158-
keyring.onDecrypt(decryptionMaterials, Collections.singletonList(ENCRYPTED_DATA_KEY));
169+
keyring.onDecrypt(decryptionMaterials, Collections.singletonList(INVALID_DATA_KEY));
159170

160171
assertNull(decryptionMaterials.getCleartextDataKey());
161172
assertEquals(0, decryptionMaterials.getKeyringTrace().getEntries().size());
162173
}
163174

164175
@Test
165-
public void testDecryptMultipleKeysOneInvalid() throws GeneralSecurityException {
166-
final EncryptedDataKey BAD_DATA_KEY = new KeyBlob("badProviderId", new byte[]{1, 2, 3}, new byte[]{4, 5, 6});
167-
168-
Keyring keyring = newRawKeyring(jceKeyCipher, (edk) -> !edk.getProviderId().equals(BAD_DATA_KEY.getProviderId()), null, DECRYPTED_DATA_KEY_TRACE);
169-
176+
public void testDecryptMultipleKeysOneInvalid() {
170177
DecryptionMaterials decryptionMaterials = DecryptionMaterials.newBuilder()
171178
.setAlgorithm(ALGORITHM)
172179
.setEncryptionContext(ENCRYPTION_CONTEXT)
173180
.setKeyringTrace(new KeyringTrace())
174181
.build();
175182

176-
when(jceKeyCipher.decryptKey(ENCRYPTED_DATA_KEY, KEYNAME, ENCRYPTION_CONTEXT)).thenReturn(DATA_KEY.getEncoded());
177-
178183
final List<EncryptedDataKey> edks = new ArrayList<>();
179-
edks.add(BAD_DATA_KEY);
184+
edks.add(INVALID_DATA_KEY);
180185
edks.add(ENCRYPTED_DATA_KEY);
181186

182187
keyring.onDecrypt(decryptionMaterials, edks);
@@ -187,9 +192,7 @@ public void testDecryptMultipleKeysOneInvalid() throws GeneralSecurityException
187192

188193
@Test
189194
public void testDecryptMultipleKeysOneException() throws GeneralSecurityException {
190-
final EncryptedDataKey BAD_DATA_KEY = new KeyBlob("badProviderId", new byte[]{1, 2, 3}, new byte[]{4, 5, 6});
191-
192-
Keyring keyring = newRawKeyring(jceKeyCipher, (edk) -> true, null, DECRYPTED_DATA_KEY_TRACE);
195+
final EncryptedDataKey BAD_DATA_KEY = new KeyBlob("exceptionProvider", new byte[]{1, 2, 3}, new byte[]{4, 5, 6});
193196

194197
DecryptionMaterials decryptionMaterials = DecryptionMaterials.newBuilder()
195198
.setAlgorithm(ALGORITHM)
@@ -199,7 +202,6 @@ public void testDecryptMultipleKeysOneException() throws GeneralSecurityExceptio
199202

200203
when(jceKeyCipher.decryptKey(BAD_DATA_KEY, KEYNAME, ENCRYPTION_CONTEXT))
201204
.thenThrow(new GeneralSecurityException("could not decrypt key"));
202-
when(jceKeyCipher.decryptKey(ENCRYPTED_DATA_KEY, KEYNAME, ENCRYPTION_CONTEXT)).thenReturn(DATA_KEY.getEncoded());
203205

204206
final List<EncryptedDataKey> edks = new ArrayList<>();
205207
edks.add(BAD_DATA_KEY);
@@ -211,32 +213,6 @@ public void testDecryptMultipleKeysOneException() throws GeneralSecurityExceptio
211213
assertEquals(DECRYPTED_DATA_KEY_TRACE, decryptionMaterials.getKeyringTrace().getEntries().get(0));
212214
}
213215

214-
private Keyring newRawKeyring(JceKeyCipher jceKeyCipher, Function<EncryptedDataKey, Boolean> validToDecrypt,
215-
KeyringTraceEntry encryptTraceEntry, KeyringTraceEntry decryptTraceEntry) {
216-
return new RawKeyring(KEYNAMESPACE, KEYNAME, jceKeyCipher) {
217-
@Override
218-
boolean validToDecrypt(EncryptedDataKey encryptedDataKey) {
219-
return validToDecrypt.apply(encryptedDataKey);
220-
}
221-
222-
@Override
223-
void traceOnEncrypt(KeyringTrace keyringTrace) {
224-
if (encryptTraceEntry != null) {
225-
keyringTrace.add(encryptTraceEntry.getKeyNamespace(), encryptTraceEntry.getKeyName(),
226-
encryptTraceEntry.getFlags().toArray(new KeyringTraceFlag[]{}));
227-
}
228-
}
229-
230-
@Override
231-
void traceOnDecrypt(KeyringTrace keyringTrace) {
232-
if (decryptTraceEntry != null) {
233-
keyringTrace.add(decryptTraceEntry.getKeyNamespace(), decryptTraceEntry.getKeyName(),
234-
decryptTraceEntry.getFlags().toArray(new KeyringTraceFlag[]{}));
235-
}
236-
}
237-
};
238-
}
239-
240216
private void assertEncryptedDataKeyEquals(EncryptedDataKey expected, EncryptedDataKey actual) {
241217
assertEquals(expected.getProviderId(), actual.getProviderId());
242218
assertArrayEquals(expected.getProviderInformation(), actual.getProviderInformation());

0 commit comments

Comments
 (0)