Changeset: de6670b2d929 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/de6670b2d929 Modified Files: clients/mapilib/Tests/systemcertificates.py clients/mapilib/openssl_windows.c Branch: monetdburl Log Message:
Show Windows root certs in tracelog, I want to inspect them diffs (31 lines): diff --git a/clients/mapilib/Tests/systemcertificates.py b/clients/mapilib/Tests/systemcertificates.py --- a/clients/mapilib/Tests/systemcertificates.py +++ b/clients/mapilib/Tests/systemcertificates.py @@ -31,7 +31,8 @@ assert proc.returncode == 2, f"mclient i # libmapi will interpret the first two bytes as a block header. # # In ASCII, 'H' + 256 * 'T' is 21576. -if b'21576' not in proc.stderr: +ok = b'21576' not in proc.stderr +if ok or True: msg = str(proc.stderr, 'utf-8') print(f"Expected mclient to print an error message containing the number 21576, got:\n--- stderr ---\n{msg}\n---end stderr ---", file=sys.stderr) exit(1) diff --git a/clients/mapilib/openssl_windows.c b/clients/mapilib/openssl_windows.c --- a/clients/mapilib/openssl_windows.c +++ b/clients/mapilib/openssl_windows.c @@ -31,12 +31,8 @@ process_sysstore_item(Mapi mid, X509_STO bool is_x509 = (typ & X509_ASN_ENCODING); bool is_pkcs7 = (typ & PKCS_7_ASN_ENCODING); - mapi_log_record( - mid, "CONN", "Processing item #%d of type %lu [%s%s], size %zu", - nr, - typ, (is_x509 ? "X" : ""), (is_pkcs7 ? "P" : ""), - size - ); + + mapi_log_data(mid, "CERT", (char*)data, size); if (!is_x509) return mapi_printError(mid, __func__, MERROR, "sys store certificate #%d must be in X509 format", nr); _______________________________________________ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org