Skip to content

Commit 57f10a7

Browse files
committed
Add some doc comments
1 parent 51c0f82 commit 57f10a7

2 files changed

Lines changed: 2 additions & 0 deletions

File tree

rust/truststore-merger/src/parsers.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ pub fn parse_pem_contents(pem_bytes: &[u8]) -> anyhow::Result<Vec<X509>> {
4242
///
4343
/// So I ditched that effort and we are now shelling out to the CLI. Sorry!
4444
/// The proper solution would be that secret-operator writes PKCS12 truststores using modern algorithms.
45+
/// For that we probably(?) drop the p12 crate?
4546
#[allow(unused)]
4647
pub fn parse_pkcs12_file(file_contents: &[u8], password: &str) -> anyhow::Result<Vec<X509>> {
4748
let parsed = Pkcs12::from_der(file_contents)

rust/utils/src/pkcs12.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ pub fn pkcs12_truststore<'a>(
3232
// OpenSSL's current master branch contains the `PKCS12_create_ex2` function
3333
// (https://www.openssl.org/docs/manmaster/man3/PKCS12_create_ex.html), but it is not currently in
3434
// OpenSSL 3.1 (as of 3.1.1), and it is not wrapped by rust-openssl.
35+
// See https://github.com/sfackler/rust-openssl/blob/d21f42333698edeebd7327a4e25412b191757e31/openssl/src/pkcs12.rs#L225
3536

3637
// Required for Java to trust the certificate, from
3738
// https://github.com/openjdk/jdk/blob/990e3a700dce3441bd9506ca571c1790e57849a9/src/java.base/share/classes/sun/security/util/KnownOIDs.java#L414-L415

0 commit comments

Comments
 (0)