Merge changes from topic "revert-2446033-revert-2319094-bssl_jan2023-OYGIWALFXH-ATZFEIGQDA" am: edb8d644fb

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/openssl/+/2470949

Change-Id: I2022e07eebf0549e6ca67a455eed26aacaa81be4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/patches/bssl_to_vec_padded.diff b/patches/bssl_to_vec_padded.diff
new file mode 100644
index 0000000..2782d50
--- /dev/null
+++ b/patches/bssl_to_vec_padded.diff
@@ -0,0 +1,13 @@
+diff --git a/src/bn.rs b/src/bn.rs
+index 1cd00dd..dbd7ae9 100644
+--- a/src/bn.rs
++++ b/src/bn.rs
+@@ -814,7 +814,7 @@ impl BigNumRef {
+     /// assert_eq!(&bn_vec, &[0, 0, 0x45, 0x43]);
+     /// ```
+     #[corresponds(BN_bn2binpad)]
+-    #[cfg(ossl110)]
++    #[cfg(any(boringssl, ossl110))]
+     pub fn to_vec_padded(&self, pad_to: i32) -> Result<Vec<u8>, ErrorStack> {
+         let mut v = Vec::with_capacity(pad_to as usize);
+         unsafe {
diff --git a/src/bn.rs b/src/bn.rs
index 1cd00dd..dbd7ae9 100644
--- a/src/bn.rs
+++ b/src/bn.rs
@@ -814,7 +814,7 @@
     /// assert_eq!(&bn_vec, &[0, 0, 0x45, 0x43]);
     /// ```
     #[corresponds(BN_bn2binpad)]
-    #[cfg(ossl110)]
+    #[cfg(any(boringssl, ossl110))]
     pub fn to_vec_padded(&self, pad_to: i32) -> Result<Vec<u8>, ErrorStack> {
         let mut v = Vec::with_capacity(pad_to as usize);
         unsafe {