Fix missing changes

The previous commit was merged before being synced up to HEAD, missing some needing changes. Change-Id: I8315b00d6a1b73aa9c4c30032fa881b7e95a8524
project-oak · Feb 21, 2025 · 5122264 · 5122264
1 parent b49a2f4
commit 5122264
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/cc/oak_session/client_server_session_test.cc b/cc/oak_session/client_server_session_test.cc
@@ -108,7 +108,7 @@ SessionConfig* TestConfigUnattestedNKServer(
     bindings::IdentityKey* identity_key) {
   return SessionConfigBuilder(AttestationType::kUnattested,
                               HandshakeType::kNoiseNK)
-      .SetSelfPrivateKey(identity_key)
+      .SetSelfStaticPrivateKey(identity_key)
       .Build();
 }
 
@@ -117,7 +117,7 @@ SessionConfig* TestConfigUnattestedKK(absl::string_view peer_public_key,
   return SessionConfigBuilder(AttestationType::kUnattested,
                               HandshakeType::kNoiseKK)
       .SetPeerStaticPublicKey(peer_public_key)
-      .SetSelfPrivateKey(self_private_key)
+      .SetSelfStaticPrivateKey(self_private_key)
       .Build();
 }
 

diff --git a/cc/oak_session/config.cc b/cc/oak_session/config.cc
@@ -68,9 +68,10 @@ SessionConfigBuilder SessionConfigBuilder::AddSessionBinder(
   return *this;
 }
 
-SessionConfigBuilder SessionConfigBuilder::SetSelfPrivateKey(
+SessionConfigBuilder SessionConfigBuilder::SetSelfStaticPrivateKey(
     bindings::IdentityKey* signing_key) {
-  builder_ = session_config_builder_set_self_private_key(builder_, signing_key);
+  builder_ =
+      session_config_builder_set_self_static_private_key(builder_, signing_key);
   return *this;
 }
 

diff --git a/cc/oak_session/config.h b/cc/oak_session/config.h
@@ -61,7 +61,8 @@ class SessionConfigBuilder {
       absl::string_view attester_id, bindings::FfiAttestationVerifier attester);
   SessionConfigBuilder AddSessionBinder(absl::string_view attester_id,
                                         bindings::SigningKey* binding_key);
-  SessionConfigBuilder SetSelfPrivateKey(bindings::IdentityKey* signing_key);
+  SessionConfigBuilder SetSelfStaticPrivateKey(
+      bindings::IdentityKey* signing_key);
   SessionConfigBuilder SetPeerStaticPublicKey(absl::string_view public_key);
 
  private: