Skip to content

Commit 979c72f

Browse files
committed
Reformat with ktfmt 0.27.0 after rebasing onto main
1 parent 599f3bc commit 979c72f

3 files changed

Lines changed: 167 additions & 168 deletions

File tree

app/src/main/java/org/matrix/TEESimulator/interception/keystore/Keystore2Interceptor.kt

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -84,12 +84,12 @@ object Keystore2Interceptor : AbstractKeystoreInterceptor() {
8484
SystemLogger.info("Found TEE SecurityLevel. Registering interceptor...")
8585
val interceptor =
8686
KeyMintSecurityLevelInterceptor(tee, SecurityLevel.TRUSTED_ENVIRONMENT)
87-
register(
88-
backdoor,
89-
tee.asBinder(),
90-
interceptor,
91-
KeyMintSecurityLevelInterceptor.INTERCEPTED_CODES,
92-
)
87+
register(
88+
backdoor,
89+
tee.asBinder(),
90+
interceptor,
91+
KeyMintSecurityLevelInterceptor.INTERCEPTED_CODES,
92+
)
9393
}
9494
}
9595
.onFailure { SystemLogger.error("Failed to intercept TEE SecurityLevel.", it) }
@@ -100,12 +100,12 @@ object Keystore2Interceptor : AbstractKeystoreInterceptor() {
100100
SystemLogger.info("Found StrongBox SecurityLevel. Registering interceptor...")
101101
val interceptor =
102102
KeyMintSecurityLevelInterceptor(strongbox, SecurityLevel.STRONGBOX)
103-
register(
104-
backdoor,
105-
strongbox.asBinder(),
106-
interceptor,
107-
KeyMintSecurityLevelInterceptor.INTERCEPTED_CODES,
108-
)
103+
register(
104+
backdoor,
105+
strongbox.asBinder(),
106+
interceptor,
107+
KeyMintSecurityLevelInterceptor.INTERCEPTED_CODES,
108+
)
109109
}
110110
}
111111
.onFailure { SystemLogger.error("Failed to intercept StrongBox SecurityLevel.", it) }
@@ -277,21 +277,21 @@ object Keystore2Interceptor : AbstractKeystoreInterceptor() {
277277
keyData.second.toTypedArray(),
278278
)
279279
.getOrThrow()
280-
response.metadata.authorizations =
281-
InterceptorUtils.patchAuthorizations(
282-
response.metadata.authorizations,
283-
callingUid,
284-
)
280+
response.metadata.authorizations =
281+
InterceptorUtils.patchAuthorizations(
282+
response.metadata.authorizations,
283+
callingUid,
284+
)
285285

286286
val key = response.metadata.key!!
287287
key.nspace = SecureRandom().nextLong()
288288
KeyMintSecurityLevelInterceptor.generatedKeys[keyId] =
289289
KeyMintSecurityLevelInterceptor.GeneratedKeyInfo(
290290
keyData.first,
291-
null,
291+
null,
292292
key.nspace,
293293
response,
294-
parsedParameters,
294+
parsedParameters,
295295
)
296296
KeyMintSecurityLevelInterceptor.attestationKeys.add(keyId)
297297
return InterceptorUtils.createTypedObjectReply(response)
@@ -335,11 +335,11 @@ object Keystore2Interceptor : AbstractKeystoreInterceptor() {
335335
finalChain,
336336
)
337337
.getOrThrow()
338-
response.metadata.authorizations =
339-
InterceptorUtils.patchAuthorizations(
340-
response.metadata.authorizations,
341-
callingUid,
342-
)
338+
response.metadata.authorizations =
339+
InterceptorUtils.patchAuthorizations(
340+
response.metadata.authorizations,
341+
callingUid,
342+
)
343343

344344
return InterceptorUtils.createTypedObjectReply(response)
345345
}

0 commit comments

Comments
 (0)