Skip to content
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

Secure sockets now can use stored device certificate #1864

Merged
merged 1 commit into from
Mar 19, 2021
Merged

Secure sockets now can use stored device certificate #1864

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 6 additions & 4 deletions src/DeviceInterfaces/System.Net/sys_net_native.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,8 +155,8 @@ static const CLR_RT_MethodHandler method_lookup[] =
NULL,
NULL,
Library_sys_net_native_System_Net_Security_CertificateManager::AddCaCertificateBundle___STATIC__BOOLEAN__SZARRAY_U1,
Library_sys_net_native_System_Net_Security_SslNative::SecureServerInit___STATIC__I4__I4__I4__SystemSecurityCryptographyX509CertificatesX509Certificate__SystemSecurityCryptographyX509CertificatesX509Certificate,
Library_sys_net_native_System_Net_Security_SslNative::SecureClientInit___STATIC__I4__I4__I4__SystemSecurityCryptographyX509CertificatesX509Certificate__SystemSecurityCryptographyX509CertificatesX509Certificate,
Library_sys_net_native_System_Net_Security_SslNative::SecureServerInit___STATIC__I4__I4__I4__SystemSecurityCryptographyX509CertificatesX509Certificate__SystemSecurityCryptographyX509CertificatesX509Certificate__BOOLEAN,
Library_sys_net_native_System_Net_Security_SslNative::SecureClientInit___STATIC__I4__I4__I4__SystemSecurityCryptographyX509CertificatesX509Certificate__SystemSecurityCryptographyX509CertificatesX509Certificate__BOOLEAN,
Library_sys_net_native_System_Net_Security_SslNative::SecureAccept___STATIC__VOID__I4__OBJECT,
Library_sys_net_native_System_Net_Security_SslNative::SecureConnect___STATIC__VOID__I4__STRING__OBJECT,
Library_sys_net_native_System_Net_Security_SslNative::SecureRead___STATIC__I4__OBJECT__SZARRAY_U1__I4__I4__I4,
Expand Down Expand Up @@ -243,6 +243,8 @@ static const CLR_RT_MethodHandler method_lookup[] =
NULL,
NULL,
NULL,
NULL,
NULL,
Library_sys_net_native_System_Net_Sockets_NativeSocket::socket___STATIC__I4__I4__I4__I4,
Library_sys_net_native_System_Net_Sockets_NativeSocket::bind___STATIC__VOID__OBJECT__SystemNetEndPoint,
Library_sys_net_native_System_Net_Sockets_NativeSocket::connect___STATIC__VOID__OBJECT__SystemNetEndPoint__BOOLEAN,
Expand Down Expand Up @@ -302,9 +304,9 @@ static const CLR_RT_MethodHandler method_lookup[] =
const CLR_RT_NativeAssemblyData g_CLR_AssemblyNative_System_Net =
{
"System.Net",
0xEECB2218,
0x76BCAD4E,
method_lookup,
{ 100, 1, 3, 3 }
{ 100, 1, 3, 4 }
};

// clang-format on
9 changes: 5 additions & 4 deletions src/DeviceInterfaces/System.Net/sys_net_native.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,9 +275,9 @@ struct Library_sys_net_native_System_Net_Security_CertificateManager
struct Library_sys_net_native_System_Net_Security_SslNative
{
NANOCLR_NATIVE_DECLARE(
SecureServerInit___STATIC__I4__I4__I4__SystemSecurityCryptographyX509CertificatesX509Certificate__SystemSecurityCryptographyX509CertificatesX509Certificate);
SecureServerInit___STATIC__I4__I4__I4__SystemSecurityCryptographyX509CertificatesX509Certificate__SystemSecurityCryptographyX509CertificatesX509Certificate__BOOLEAN);
NANOCLR_NATIVE_DECLARE(
SecureClientInit___STATIC__I4__I4__I4__SystemSecurityCryptographyX509CertificatesX509Certificate__SystemSecurityCryptographyX509CertificatesX509Certificate);
SecureClientInit___STATIC__I4__I4__I4__SystemSecurityCryptographyX509CertificatesX509Certificate__SystemSecurityCryptographyX509CertificatesX509Certificate__BOOLEAN);
NANOCLR_NATIVE_DECLARE(SecureAccept___STATIC__VOID__I4__OBJECT);
NANOCLR_NATIVE_DECLARE(SecureConnect___STATIC__VOID__I4__STRING__OBJECT);
NANOCLR_NATIVE_DECLARE(SecureRead___STATIC__I4__OBJECT__SZARRAY_U1__I4__I4__I4);
Expand Down Expand Up @@ -329,8 +329,9 @@ struct Library_sys_net_native_System_Security_Cryptography_X509Certificates_X509
struct Library_sys_net_native_System_Net_Security_SslStream
{
static const int FIELD___sslVerification = 6;
static const int FIELD___sslContext = 7;
static const int FIELD___isServer = 8;
static const int FIELD___useStoredDeviceCertificate = 7;
static const int FIELD___sslContext = 8;
static const int FIELD___isServer = 9;

//--//
};
Expand Down
11 changes: 7 additions & 4 deletions src/DeviceInterfaces/System.Net/sys_net_native_System_Net_Security_SslNative.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ void Time_GetDateTime(DATE_TIME_INFO *dt)

// Initalise SSL as a server
HRESULT Library_sys_net_native_System_Net_Security_SslNative::
SecureServerInit___STATIC__I4__I4__I4__SystemSecurityCryptographyX509CertificatesX509Certificate__SystemSecurityCryptographyX509CertificatesX509Certificate(
SecureServerInit___STATIC__I4__I4__I4__SystemSecurityCryptographyX509CertificatesX509Certificate__SystemSecurityCryptographyX509CertificatesX509Certificate__BOOLEAN(
CLR_RT_StackFrame &stack)
{
NATIVE_PROFILE_CLR_NETWORK();
Expand All @@ -41,7 +41,7 @@ HRESULT Library_sys_net_native_System_Net_Security_SslNative::

// Initalise SSL as a client
HRESULT Library_sys_net_native_System_Net_Security_SslNative::
SecureClientInit___STATIC__I4__I4__I4__SystemSecurityCryptographyX509CertificatesX509Certificate__SystemSecurityCryptographyX509CertificatesX509Certificate(
SecureClientInit___STATIC__I4__I4__I4__SystemSecurityCryptographyX509CertificatesX509Certificate__SystemSecurityCryptographyX509CertificatesX509Certificate__BOOLEAN(
CLR_RT_StackFrame &stack)
{
NATIVE_PROFILE_CLR_NETWORK();
Expand Down Expand Up @@ -414,6 +414,7 @@ HRESULT Library_sys_net_native_System_Net_Security_SslNative::InitHelper(CLR_RT_
CLR_INT32 sslVerify = stack.Arg1().NumericByRef().s4;
CLR_RT_HeapBlock *hbCert = stack.Arg2().Dereference();
CLR_RT_HeapBlock *caCert = stack.Arg3().Dereference();
bool useDeviceCertificate = (bool)stack.Arg4().NumericByRef().u1;
CLR_RT_HeapBlock_Array *arrCert = NULL;
CLR_RT_HeapBlock_Array *privateKey = NULL;
CLR_UINT8 *sslCert = NULL;
Expand Down Expand Up @@ -466,7 +467,8 @@ HRESULT Library_sys_net_native_System_Net_Security_SslNative::InitHelper(CLR_RT_
pk == NULL ? 0 : privateKey->m_numOfElements,
password,
hal_strlen_s(password),
sslContext)
sslContext,
useDeviceCertificate)
? 0
: -1);
}
Expand All @@ -482,7 +484,8 @@ HRESULT Library_sys_net_native_System_Net_Security_SslNative::InitHelper(CLR_RT_
pk == NULL ? 0 : privateKey->m_numOfElements,
password,
hal_strlen_s(password),
sslContext)
sslContext,
useDeviceCertificate)
? 0
: -1);
}
Expand Down
5 changes: 3 additions & 2 deletions src/PAL/COM/sockets/Sockets_debugger.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,8 @@ bool Sockets_LWIP_Driver::UpgradeToSsl(
0,
NULL,
0,
g_DebuggerPort_SslCtx_Handle))
g_DebuggerPort_SslCtx_Handle,
false))
{
int32_t ret;

Expand Down Expand Up @@ -684,4 +685,4 @@ void Sockets_LWIP_Driver::MulticastDiscoveryRespond(void *arg)
MulticastDiscoverySchedule();
}

bool Sockets_LWIP_Driver::s_initializedDbg = FALSE;
bool Sockets_LWIP_Driver::s_initializedDbg = FALSE;
19 changes: 19 additions & 0 deletions src/PAL/COM/sockets/ssl/mbedTLS/ssl_generic_init_internal.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ bool ssl_generic_init_internal(
const char *password,
int passwordLength,
int &contextHandle,
bool useDeviceCertificate,
bool isServer)
{
(void)sslMode;
Expand Down Expand Up @@ -185,6 +186,24 @@ bool ssl_generic_init_internal(
g_TargetConfiguration.CertificateStore->Certificates[configIndex]->CertificateSize);
}

// check if the device certificate is to be used
if (useDeviceCertificate)
{
// check if there is a device certificate stored
if (g_TargetConfiguration.DeviceCertificates->Count > 0)
{
// there is!
// fill in the parameters like if it was supplied by the caller
// OK to override, that's the intended behaviour
certificate = (const char *)g_TargetConfiguration.DeviceCertificates->Certificates[0]->Certificate;
certLength = g_TargetConfiguration.DeviceCertificates->Certificates[0]->CertificateSize;

// clear private keys, just in case
privateKey = NULL;
privateKeyLength = 0;
}
}

// parse "own" certificate if passed
if (certificate != NULL && certLength > 0)
{
Expand Down
10 changes: 8 additions & 2 deletions src/PAL/COM/sockets/ssl/ssl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ static bool SSL_GenericInit(
const char *password,
int passwordLength,
int &contextHandle,
bool useDeviceCertificate,
bool isServer)
{
if (!s_InitDone)
Expand All @@ -67,6 +68,7 @@ static bool SSL_GenericInit(
password,
passwordLength,
contextHandle,
useDeviceCertificate,
isServer);
}

Expand Down Expand Up @@ -103,7 +105,8 @@ bool SSL_ServerInit(
int privateKeyLength,
const char *password,
int passwordLength,
int &contextHandle)
int &contextHandle,
bool useDeviceCertificate)
{
NATIVE_PROFILE_PAL_COM();

Expand All @@ -117,6 +120,7 @@ bool SSL_ServerInit(
password,
passwordLength,
contextHandle,
useDeviceCertificate,
true);
}

Expand All @@ -129,7 +133,8 @@ bool SSL_ClientInit(
int privateKeyLength,
const char *password,
int passwordLength,
int &contextHandle)
int &contextHandle,
bool useDeviceCertificate)
{
NATIVE_PROFILE_PAL_COM();

Expand All @@ -143,6 +148,7 @@ bool SSL_ClientInit(
password,
passwordLength,
contextHandle,
useDeviceCertificate,
false);
}

Expand Down
1 change: 1 addition & 0 deletions src/PAL/COM/sockets/ssl/ssl_functions.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ bool ssl_generic_init_internal(
const char *password,
int passwordLength,
int &contextHandle,
bool useDeviceCertificate,
bool isServer);
bool ssl_initialize_internal();
bool ssl_uninitialize_internal();
Expand Down
8 changes: 6 additions & 2 deletions src/PAL/COM/sockets/ssl/ssl_stubs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ __nfweak bool SSL_ServerInit(
int privateKeyLength,
const char *password,
int passwordLength,
int &contextHandle)
int &contextHandle,
bool useDeviceCertificate)
{
(void)sslMode;
(void)sslVerify;
Expand All @@ -40,6 +41,7 @@ __nfweak bool SSL_ServerInit(
(void)password;
(void)passwordLength;
(void)contextHandle;
(void)useDeviceCertificate;

NATIVE_PROFILE_PAL_COM();

Expand All @@ -55,7 +57,8 @@ __nfweak bool SSL_ClientInit(
int privateKeyLength,
const char *password,
int passwordLength,
int &contextHandle)
int &contextHandle,
bool useDeviceCertificate)
{
(void)sslMode;
(void)sslVerify;
Expand All @@ -66,6 +69,7 @@ __nfweak bool SSL_ClientInit(
(void)password;
(void)passwordLength;
(void)contextHandle;
(void)useDeviceCertificate;

NATIVE_PROFILE_PAL_COM();

Expand Down
8 changes: 6 additions & 2 deletions src/PAL/Include/nanoPAL_Sockets.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -655,7 +655,9 @@ bool SSL_ServerInit(
int privateKeyLength,
const char *password,
int passwordLength,
int &sslContextHandle);
int &sslContextHandle,
bool useDeviceCertificate);

bool SSL_ClientInit(
int sslMode,
int sslVerify,
Expand All @@ -665,7 +667,9 @@ bool SSL_ClientInit(
int privateKeyLength,
const char *password,
int passwordLength,
int &sslContextHandle);
int &sslContextHandle,
bool useDeviceCertificate);

bool SSL_AddCertificateAuthority(
int sslContextHandle,
const char *certificate,
Expand Down
1 change: 1 addition & 0 deletions targets/TI-SimpleLink/common/ssl_simplelink.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ bool ssl_generic_init_internal(
const char *password,
int passwordLength,
int &contextHandle,
bool useDeviceCertificate,
bool isServer)
{
(void)password;
Expand Down