@@ -55,23 +55,28 @@ fn generate_pkcs12_truststore(cli_args: GeneratePkcs12) -> Result<(), snafu::Wha
5555 for certificate in certificates_list {
5656 let sha256 = certificate. sha256_digest ( ) ?;
5757
58+ // Trying to stick to https://opentelemetry.io/docs/specs/semconv/registry/attributes/tls/#tls-attributes
59+ // Converting `Asn1TimeRef` to a ISO 8601 timestamp really sucks, so we omitted that.
5860 if let Some ( existing) = certificates. get ( & * sha256) {
5961 warn ! (
6062 ?source,
61- sha25 = hex:: encode( sha256) ,
63+ hash . sha256 = hex:: encode( sha256) . to_uppercase ( ) ,
6264 existing. not_before = ?existing. not_before( ) ,
6365 existing. not_after = ?existing. not_after( ) ,
6466 existing. subject = ?existing. subject_name( ) ,
67+ existing. issuer = ?existing. issuer_name( ) ,
6568 existing. serial = ?existing. serial_as_hex( ) ?,
6669 new. not_before = ?certificate. not_before( ) ,
6770 new. not_after = ?certificate. not_after( ) ,
6871 new. subject = ?certificate. subject_name( ) ,
72+ new. issuer = ?certificate. issuer_name( ) ,
6973 new. serial = ?existing. serial_as_hex( ) ?,
7074 "Skipped certificate as a cert with the same SHA256 hash was already added" ,
7175 ) ;
7276 } else {
7377 info ! (
7478 subject = ?certificate. subject_name( ) ,
79+ issuer = ?certificate. issuer_name( ) ,
7580 not_before = ?certificate. not_before( ) ,
7681 not_after = ?certificate. not_after( ) ,
7782 serial = ?certificate. serial_as_hex( ) ?,
0 commit comments