Rename set_self_private_key -> set_self_static_private_key

Matches doc, internal naming, and public key method name.

Change-Id: Ib29db4626817f632db97b16673ee4984d167edcc

cc/oak_session/oak_session_bindings.h

@@ -131,7 +131,7 @@ extern SessionConfigBuilder* session_config_builder_add_peer_verifier(
     SessionConfigBuilder*, ffi::bindings::BytesView, FfiAttestationVerifier);
 extern SessionConfigBuilder* session_config_builder_add_session_binder(
     SessionConfigBuilder*, ffi::bindings::BytesView, SigningKey*);
-extern SessionConfigBuilder* session_config_builder_set_self_private_key(
+extern SessionConfigBuilder* session_config_builder_set_self_static_private_key(
     SessionConfigBuilder*, IdentityKey*);
 extern SessionConfigBuilder* session_config_builder_set_peer_static_public_key(
     SessionConfigBuilder*, ffi::bindings::BytesView);

cc/oak_session/oak_session_bindings_test.cc

@@ -176,7 +176,7 @@ SessionConfig* TestConfigUnattestedNKServer(IdentityKey* identity_key) {
   }
   auto session_config_builder = result.result;
 
-  session_config_builder = session_config_builder_set_self_private_key(
+  session_config_builder = session_config_builder_set_self_static_private_key(
       session_config_builder, identity_key);
 
   return session_config_builder_build(session_config_builder);
@@ -192,7 +192,7 @@ SessionConfig* TestConfigUnattestedKK(BytesView peer_public_key,
   }
   auto session_config_builder = result.result;
 
-  session_config_builder = session_config_builder_set_self_private_key(
+  session_config_builder = session_config_builder_set_self_static_private_key(
       session_config_builder, self_identity_key);
 
   session_config_builder = session_config_builder_set_peer_static_public_key(

oak_session/ffi/config.rs

@@ -279,12 +279,12 @@ pub unsafe extern "C" fn session_config_builder_set_peer_static_public_key(
 /// * builder is a valid, properly aligned pointer to a SessionConfigBuilder.
 /// * identity is a valid, properly aligned, acquired from a suitable source.
 #[no_mangle]
-pub unsafe extern "C" fn session_config_builder_set_self_private_key(
+pub unsafe extern "C" fn session_config_builder_set_self_static_private_key(
     builder: *mut SessionConfigBuilder,
     identity_key_ptr: *mut IdentityKey,
 ) -> *mut SessionConfigBuilder {
     let identity_key = Box::from_raw(identity_key_ptr);
-    let next_builder = Box::from_raw(builder).set_self_private_key(identity_key);
+    let next_builder = Box::from_raw(builder).set_self_static_private_key(identity_key);
     Box::into_raw(Box::new(next_builder))
 }
 

oak_session/ffi/tests.rs

@@ -25,7 +25,8 @@ use oak_session_ffi_config::{
     self as config_ffi, identity_key_get_public_key, new_identity_key,
     session_config_builder_add_peer_verifier, session_config_builder_add_self_attester,
     session_config_builder_add_self_endorser, session_config_builder_add_session_binder,
-    session_config_builder_set_peer_static_public_key, session_config_builder_set_self_private_key,
+    session_config_builder_set_peer_static_public_key,
+    session_config_builder_set_self_static_private_key,
 };
 use oak_session_ffi_server_session as server_ffi;
 use oak_session_ffi_testing::{
@@ -327,7 +328,7 @@ fn create_unattested_nk_server_session_config(
     let mut session_config_builder = session_config_builder_result.result;
 
     session_config_builder = unsafe {
-        session_config_builder_set_self_private_key(session_config_builder, identity_key)
+        session_config_builder_set_self_static_private_key(session_config_builder, identity_key)
     };
 
     unsafe { config_ffi::session_config_builder_build(session_config_builder) }
@@ -345,7 +346,10 @@ fn create_unattested_kk_session_config(
     let mut session_config_builder = session_config_builder_result.result;
 
     session_config_builder = unsafe {
-        session_config_builder_set_self_private_key(session_config_builder, self_identity_key)
+        session_config_builder_set_self_static_private_key(
+            session_config_builder,
+            self_identity_key,
+        )
     };
 
     session_config_builder = unsafe {

oak_session/src/config.rs

@@ -216,7 +216,7 @@ impl SessionConfigBuilder {
         self
     }
 
-    pub fn set_self_private_key(mut self, private_key: Box<dyn IdentityKeyHandle>) -> Self {
+    pub fn set_self_static_private_key(mut self, private_key: Box<dyn IdentityKeyHandle>) -> Self {
         if self.config.handshaker_config.self_static_private_key.is_none() {
             self.config.handshaker_config.self_static_private_key = Some(private_key);
         } else {

oak_session/src/tests.rs

@@ -551,7 +551,7 @@ fn session_nk_succeeds() {
         .build();
     let mut client_session = ClientSession::create(client_config).unwrap();
     let server_config = SessionConfig::builder(AttestationType::Unattested, HandshakeType::NoiseNK)
-        .set_self_private_key(identity_key)
+        .set_self_static_private_key(identity_key)
         .build();
     let mut server_session = ServerSession::create(server_config).unwrap();
     do_session_handshake(&mut client_session, &mut server_session);
@@ -571,7 +571,7 @@ fn session_nk_key_mismatch() {
         .build();
     let mut client_session = ClientSession::create(client_config).unwrap();
     let server_config = SessionConfig::builder(AttestationType::Unattested, HandshakeType::NoiseNK)
-        .set_self_private_key(identity_key2)
+        .set_self_static_private_key(identity_key2)
         .build();
     let mut server_session = ServerSession::create(server_config).unwrap();
     do_session_handshake(&mut client_session, &mut server_session);
@@ -613,7 +613,7 @@ fn test_session_sendable() {
 
     let identity_key = Box::new(IdentityKey::generate());
     let server_config = SessionConfig::builder(AttestationType::Unattested, HandshakeType::NoiseNK)
-        .set_self_private_key(identity_key)
+        .set_self_static_private_key(identity_key)
         .build();
     let server_session = ServerSession::create(server_config).unwrap();
     test(server_session);