Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update usage of beto-rust UKEY2 APIs" into udc-dev

Browse Source
This commit is contained in:
Maurice Lam
2023-04-14 21:57:20 +00:00
committed by Android (Google) Code Review
parent 022e333a9a 99afd9fadf
commit cf2fc89dcd
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/companion/java/com/android/server/companion/securechannel/SecureChannel.java
View File

@@ -28,7 +28,6 @@ import com.google.security.cryptauth.lib.securegcm.CryptoException;
import com.google.security.cryptauth.lib.securegcm.D2DConnectionContextV1;
import com.google.security.cryptauth.lib.securegcm.D2DHandshakeContext;
import com.google.security.cryptauth.lib.securegcm.D2DHandshakeContext.Role;
import com.google.security.cryptauth.lib.securegcm.DefaultUkey2Logger;
import com.google.security.cryptauth.lib.securegcm.HandshakeException;
import libcore.io.IoUtils;
@@ -329,7 +328,7 @@ public class SecureChannel {
}
mRole = Role.Initiator;
mHandshakeContext = D2DHandshakeContext.forInitiator(DefaultUkey2Logger.INSTANCE);
mHandshakeContext = D2DHandshakeContext.forInitiator();
// Send Client Init
if (DEBUG) {
@@ -350,7 +349,7 @@ public class SecureChannel {
if (mHandshakeContext == null) { // Server-side logic
mRole = Role.Responder;
mHandshakeContext = D2DHandshakeContext.forResponder(DefaultUkey2Logger.INSTANCE);
mHandshakeContext = D2DHandshakeContext.forResponder();
// Receive Client Init
if (DEBUG) {