commit e9a0ca79bc3044dc0778dabe905c2e2cac0a7a25
author Andrew Scull <ascull@google.com> Thu Jun 16 12:22:39 2022 +0000
committer Andrew Scull <ascull@google.com> Thu Jul 07 19:38:40 2022 +0000
tree 85f0b07a05f806631debf76a97b173d71c71243e
parent 3fc65ec94d6e3a552c75877d56ee16dfb2076eef

Enable x25519 PKeys for boringssl

Boringssl supports x25519 through the EVP interface so enable the
corresponding items such that it can be used by clients of the crate.

Test: build, treehugger, local code with use of functions
Change-Id: I28e38bd850f3b88e52975f61e1d20001e31f06f8

openssl/src/pkey.rs

diff --git a/openssl/src/pkey.rs b/openssl/src/pkey.rs
index ce29210..5b5a4e0 100644
--- a/openssl/src/pkey.rs
+++ b/openssl/src/pkey.rs
@@ -93,7 +93,7 @@
     pub const ED25519: Id = Id(ffi::EVP_PKEY_ED25519);
     #[cfg(ossl111)]
     pub const ED448: Id = Id(ffi::EVP_PKEY_ED448);
-    #[cfg(ossl111)]
+    #[cfg(any(boringssl, ossl111))]
     pub const X25519: Id = Id(ffi::EVP_PKEY_X25519);
     #[cfg(ossl111)]
     pub const X448: Id = Id(ffi::EVP_PKEY_X448);
@@ -243,7 +243,7 @@
     /// This function only works for algorithms that support raw public keys.
     /// Currently this is: X25519, ED25519, X448 or ED448
     #[corresponds(EVP_PKEY_get_raw_public_key)]
-    #[cfg(ossl111)]
+    #[cfg(any(boringssl, ossl111))]
     pub fn raw_public_key(&self) -> Result<Vec<u8>, ErrorStack> {
         unsafe {
             let mut len = 0;
@@ -294,7 +294,7 @@
     /// This function only works for algorithms that support raw private keys.
     /// Currently this is: HMAC, X25519, ED25519, X448 or ED448
     #[corresponds(EVP_PKEY_get_raw_private_key)]
-    #[cfg(ossl111)]
+    #[cfg(any(boringssl, ossl111))]
     pub fn raw_private_key(&self) -> Result<Vec<u8>, ErrorStack> {
         unsafe {
             let mut len = 0;
@@ -483,7 +483,7 @@
     }
 
     /// Generates a new private Ed25519 key
-    #[cfg(ossl111)]
+    #[cfg(any(boringssl, ossl111))]
     pub fn generate_x25519() -> Result<PKey<Private>, ErrorStack> {
         PKey::generate_eddsa(Id::X25519)
     }