Skip to content

Support non-RSA keys in OpenSSL-CAPI interop layer #2000

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Oct 20, 2021
Merged

Support non-RSA keys in OpenSSL-CAPI interop layer #2000

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
952884d
Support non-RSA keys in OpenSSL-CAPI interop layer
anrossi Sep 16, 2021
eca1158
More cleanup and error logging
anrossi Sep 17, 2021
cbd9008
Merge branch 'main' into anrossi/openssl-windows-ecc-support
anrossi Oct 19, 2021
9fb77a0
Export certificate from CAPI as PFX.
anrossi Oct 20, 2021
d1aa1cc
Fix password handling, and export chain with EE cert.
anrossi Oct 20, 2021
3725a2d
Update CLOG files
anrossi Oct 20, 2021
f565c40
Remove unused variable and prefast suppresion.
anrossi Oct 20, 2021
6b9f91b
Address review comments.
anrossi Oct 20, 2021
634bbd2
Update CLOG.
anrossi Oct 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
217 changes: 138 additions & 79 deletions src/generated/linux/cert_capi_openssl.c.clog.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,38 @@
#include "cert_capi_openssl.c.clog.h.lttng.h"
#endif
#include <lttng/tracepoint-event.h>
#ifndef _clog_MACRO_QuicTraceLogVerbose
#define _clog_MACRO_QuicTraceLogVerbose 1
#define QuicTraceLogVerbose(a, ...) _clog_CAT(_clog_ARGN_SELECTOR(__VA_ARGS__), _clog_CAT(_,a(#a, __VA_ARGS__)))
#endif
#ifndef _clog_MACRO_QuicTraceEvent
#define _clog_MACRO_QuicTraceEvent 1
#define QuicTraceEvent(a, ...) _clog_CAT(_clog_ARGN_SELECTOR(__VA_ARGS__), _clog_CAT(_,a(#a, __VA_ARGS__)))
#endif
#ifdef __cplusplus
extern "C" {
#endif
#ifndef _clog_3_ARGS_TRACE_TlsExportCapiCertChainVerifyResult



/*----------------------------------------------------------
// Decoder Ring for TlsExportCapiCertChainVerifyResult
// Exported chain verification result: %u
// QuicTraceLogVerbose(
TlsExportCapiCertChainVerifyResult,
"Exported chain verification result: %u",
PolicyStatus.dwError);
// arg2 = arg2 = PolicyStatus.dwError
----------------------------------------------------------*/
#define _clog_3_ARGS_TRACE_TlsExportCapiCertChainVerifyResult(uniqueId, encoded_arg_string, arg2)\
tracepoint(CLOG_CERT_CAPI_OPENSSL_C, TlsExportCapiCertChainVerifyResult , arg2);\

#endif




#ifndef _clog_3_ARGS_TRACE_LibraryError


Expand Down Expand Up @@ -73,10 +98,10 @@ tracepoint(CLOG_CERT_CAPI_OPENSSL_C, LibraryErrorStatus , arg2, arg3);\
// QuicTraceEvent(
LibraryErrorStatus,
"[ lib] ERROR, %u, %s.",
Status,
"CxPlatCertCreate");
// arg2 = arg2 = Status
// arg3 = arg3 = "CxPlatCertCreate"
LastError,
"CertCreateCertificateChainEngine");
// arg2 = arg2 = LastError
// arg3 = arg3 = "CertCreateCertificateChainEngine"
----------------------------------------------------------*/
#define _clog_4_ARGS_TRACE_LibraryErrorStatus(uniqueId, encoded_arg_string, arg2, arg3)\

Expand All @@ -85,20 +110,22 @@ tracepoint(CLOG_CERT_CAPI_OPENSSL_C, LibraryErrorStatus , arg2, arg3);\



#ifndef _clog_3_ARGS_TRACE_LibraryError
#ifndef _clog_4_ARGS_TRACE_LibraryErrorStatus



/*----------------------------------------------------------
// Decoder Ring for LibraryError
// [ lib] ERROR, %s.
// Decoder Ring for LibraryErrorStatus
// [ lib] ERROR, %u, %s.
// QuicTraceEvent(
LibraryError,
"[ lib] ERROR, %s.",
"d2i_X509 failed");
// arg2 = arg2 = "d2i_X509 failed"
LibraryErrorStatus,
"[ lib] ERROR, %u, %s.",
LastError,
"CertGetCertificateChain");
// arg2 = arg2 = LastError
// arg3 = arg3 = "CertGetCertificateChain"
----------------------------------------------------------*/
#define _clog_3_ARGS_TRACE_LibraryError(uniqueId, encoded_arg_string, arg2)\
#define _clog_4_ARGS_TRACE_LibraryErrorStatus(uniqueId, encoded_arg_string, arg2, arg3)\

#endif

Expand All @@ -116,9 +143,9 @@ tracepoint(CLOG_CERT_CAPI_OPENSSL_C, LibraryErrorStatus , arg2, arg3);\
LibraryErrorStatus,
"[ lib] ERROR, %u, %s.",
Status,
"NCryptGetProperty failed");
"CertGetCertificateChain didn't build a chain");
// arg2 = arg2 = Status
// arg3 = arg3 = "NCryptGetProperty failed"
// arg3 = arg3 = "CertGetCertificateChain didn't build a chain"
----------------------------------------------------------*/
#define _clog_4_ARGS_TRACE_LibraryErrorStatus(uniqueId, encoded_arg_string, arg2, arg3)\

Expand All @@ -127,20 +154,22 @@ tracepoint(CLOG_CERT_CAPI_OPENSSL_C, LibraryErrorStatus , arg2, arg3);\



#ifndef _clog_3_ARGS_TRACE_LibraryError
#ifndef _clog_4_ARGS_TRACE_LibraryErrorStatus



/*----------------------------------------------------------
// Decoder Ring for LibraryError
// [ lib] ERROR, %s.
// Decoder Ring for LibraryErrorStatus
// [ lib] ERROR, %u, %s.
// QuicTraceEvent(
LibraryError,
"[ lib] ERROR, %s.",
"Requested certificate does not support exporting. An exportable certificate is required");
// arg2 = arg2 = "Requested certificate does not support exporting. An exportable certificate is required"
LibraryErrorStatus,
"[ lib] ERROR, %u, %s.",
GetLastError(),
"CertVerifyCertificateChainPolicy");
// arg2 = arg2 = GetLastError()
// arg3 = arg3 = "CertVerifyCertificateChainPolicy"
----------------------------------------------------------*/
#define _clog_3_ARGS_TRACE_LibraryError(uniqueId, encoded_arg_string, arg2)\
#define _clog_4_ARGS_TRACE_LibraryErrorStatus(uniqueId, encoded_arg_string, arg2, arg3)\

#endif

Expand All @@ -158,9 +187,9 @@ tracepoint(CLOG_CERT_CAPI_OPENSSL_C, LibraryErrorStatus , arg2, arg3);\
LibraryErrorStatus,
"[ lib] ERROR, %u, %s.",
Status,
"NCryptExportKey failed.");
"CxPlatCertCreate");
// arg2 = arg2 = Status
// arg3 = arg3 = "NCryptExportKey failed."
// arg3 = arg3 = "CxPlatCertCreate"
----------------------------------------------------------*/
#define _clog_4_ARGS_TRACE_LibraryErrorStatus(uniqueId, encoded_arg_string, arg2, arg3)\

Expand All @@ -169,23 +198,42 @@ tracepoint(CLOG_CERT_CAPI_OPENSSL_C, LibraryErrorStatus , arg2, arg3);\



#ifndef _clog_4_ARGS_TRACE_AllocFailure
#ifndef _clog_4_ARGS_TRACE_LibraryErrorStatus



/*----------------------------------------------------------
// Decoder Ring for AllocFailure
// Allocation of '%s' failed. (%llu bytes)
// Decoder Ring for LibraryErrorStatus
// [ lib] ERROR, %u, %s.
// QuicTraceEvent(
AllocFailure,
"Allocation of '%s' failed. (%llu bytes)",
"RSA Key",
KeyLength);
// arg2 = arg2 = "RSA Key"
// arg3 = arg3 = KeyLength
LibraryErrorStatus,
"[ lib] ERROR, %u, %s.",
Status,
"NCryptGetProperty failed");
// arg2 = arg2 = Status
// arg3 = arg3 = "NCryptGetProperty failed"
----------------------------------------------------------*/
#define _clog_4_ARGS_TRACE_AllocFailure(uniqueId, encoded_arg_string, arg2, arg3)\
tracepoint(CLOG_CERT_CAPI_OPENSSL_C, AllocFailure , arg2, arg3);\
#define _clog_4_ARGS_TRACE_LibraryErrorStatus(uniqueId, encoded_arg_string, arg2, arg3)\

#endif




#ifndef _clog_3_ARGS_TRACE_LibraryError



/*----------------------------------------------------------
// Decoder Ring for LibraryError
// [ lib] ERROR, %s.
// QuicTraceEvent(
LibraryError,
"[ lib] ERROR, %s.",
"Requested certificate does not support exporting. An exportable certificate is required");
// arg2 = arg2 = "Requested certificate does not support exporting. An exportable certificate is required"
----------------------------------------------------------*/
#define _clog_3_ARGS_TRACE_LibraryError(uniqueId, encoded_arg_string, arg2)\

#endif

Expand All @@ -202,10 +250,10 @@ tracepoint(CLOG_CERT_CAPI_OPENSSL_C, AllocFailure , arg2, arg3);\
// QuicTraceEvent(
LibraryErrorStatus,
"[ lib] ERROR, %u, %s.",
Status,
"NCryptExportKey failed.");
// arg2 = arg2 = Status
// arg3 = arg3 = "NCryptExportKey failed."
LastError,
"CertOpenStore failed");
// arg2 = arg2 = LastError
// arg3 = arg3 = "CertOpenStore failed"
----------------------------------------------------------*/
#define _clog_4_ARGS_TRACE_LibraryErrorStatus(uniqueId, encoded_arg_string, arg2, arg3)\

Expand All @@ -214,100 +262,111 @@ tracepoint(CLOG_CERT_CAPI_OPENSSL_C, AllocFailure , arg2, arg3);\



#ifndef _clog_3_ARGS_TRACE_LibraryError
#ifndef _clog_4_ARGS_TRACE_LibraryErrorStatus



/*----------------------------------------------------------
// Decoder Ring for LibraryError
// [ lib] ERROR, %s.
// Decoder Ring for LibraryErrorStatus
// [ lib] ERROR, %u, %s.
// QuicTraceEvent(
LibraryError,
"[ lib] ERROR, %s.",
"NCryptExportKey resulted in incorrect magic number");
// arg2 = arg2 = "NCryptExportKey resulted in incorrect magic number"
LibraryErrorStatus,
"[ lib] ERROR, %u, %s.",
LastError,
"CertAddCertificateContextToStore failed");
// arg2 = arg2 = LastError
// arg3 = arg3 = "CertAddCertificateContextToStore failed"
----------------------------------------------------------*/
#define _clog_3_ARGS_TRACE_LibraryError(uniqueId, encoded_arg_string, arg2)\
#define _clog_4_ARGS_TRACE_LibraryErrorStatus(uniqueId, encoded_arg_string, arg2, arg3)\

#endif




#ifndef _clog_3_ARGS_TRACE_LibraryError
#ifndef _clog_4_ARGS_TRACE_LibraryErrorStatus



/*----------------------------------------------------------
// Decoder Ring for LibraryError
// [ lib] ERROR, %s.
// Decoder Ring for LibraryErrorStatus
// [ lib] ERROR, %u, %s.
// QuicTraceEvent(
LibraryError,
"[ lib] ERROR, %s.",
"RSA_new failed");
// arg2 = arg2 = "RSA_new failed"
LibraryErrorStatus,
"[ lib] ERROR, %u, %s.",
Status,
"Convert temporary password to unicode");
// arg2 = arg2 = Status
// arg3 = arg3 = "Convert temporary password to unicode"
----------------------------------------------------------*/
#define _clog_3_ARGS_TRACE_LibraryError(uniqueId, encoded_arg_string, arg2)\
#define _clog_4_ARGS_TRACE_LibraryErrorStatus(uniqueId, encoded_arg_string, arg2, arg3)\

#endif




#ifndef _clog_3_ARGS_TRACE_LibraryError
#ifndef _clog_4_ARGS_TRACE_LibraryErrorStatus



/*----------------------------------------------------------
// Decoder Ring for LibraryError
// [ lib] ERROR, %s.
// Decoder Ring for LibraryErrorStatus
// [ lib] ERROR, %u, %s.
// QuicTraceEvent(
LibraryError,
"[ lib] ERROR, %s.",
"RSA_set0_key failed");
// arg2 = arg2 = "RSA_set0_key failed"
LibraryErrorStatus,
"[ lib] ERROR, %u, %s.",
LastError,
"PFXExportCertStoreEx get size failed");
// arg2 = arg2 = LastError
// arg3 = arg3 = "PFXExportCertStoreEx get size failed"
----------------------------------------------------------*/
#define _clog_3_ARGS_TRACE_LibraryError(uniqueId, encoded_arg_string, arg2)\
#define _clog_4_ARGS_TRACE_LibraryErrorStatus(uniqueId, encoded_arg_string, arg2, arg3)\

#endif




#ifndef _clog_3_ARGS_TRACE_LibraryError
#ifndef _clog_4_ARGS_TRACE_AllocFailure



/*----------------------------------------------------------
// Decoder Ring for LibraryError
// [ lib] ERROR, %s.
// Decoder Ring for AllocFailure
// Allocation of '%s' failed. (%llu bytes)
// QuicTraceEvent(
LibraryError,
"[ lib] ERROR, %s.",
"RSA_set0_factors failed");
// arg2 = arg2 = "RSA_set0_factors failed"
AllocFailure,
"Allocation of '%s' failed. (%llu bytes)",
"PFX data",
PfxDataBlob.cbData);
// arg2 = arg2 = "PFX data"
// arg3 = arg3 = PfxDataBlob.cbData
----------------------------------------------------------*/
#define _clog_3_ARGS_TRACE_LibraryError(uniqueId, encoded_arg_string, arg2)\
#define _clog_4_ARGS_TRACE_AllocFailure(uniqueId, encoded_arg_string, arg2, arg3)\
tracepoint(CLOG_CERT_CAPI_OPENSSL_C, AllocFailure , arg2, arg3);\

#endif




#ifndef _clog_3_ARGS_TRACE_LibraryError
#ifndef _clog_4_ARGS_TRACE_LibraryErrorStatus



/*----------------------------------------------------------
// Decoder Ring for LibraryError
// [ lib] ERROR, %s.
// Decoder Ring for LibraryErrorStatus
// [ lib] ERROR, %u, %s.
// QuicTraceEvent(
LibraryError,
"[ lib] ERROR, %s.",
"RSA_set0_crt_params failed");
// arg2 = arg2 = "RSA_set0_crt_params failed"
LibraryErrorStatus,
"[ lib] ERROR, %u, %s.",
LastError,
"PFXExportCertStoreEx get size failed");
// arg2 = arg2 = LastError
// arg3 = arg3 = "PFXExportCertStoreEx get size failed"
----------------------------------------------------------*/
#define _clog_3_ARGS_TRACE_LibraryError(uniqueId, encoded_arg_string, arg2)\
#define _clog_4_ARGS_TRACE_LibraryErrorStatus(uniqueId, encoded_arg_string, arg2, arg3)\

#endif

Expand Down
Loading