DevKit7/libctru
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Implemented support for sslc cmd8..cmdc CertChain commands. Clear the serv handle in sslcExit.

Browse Source
This commit is contained in:
yellows8 2016-03-31 12:37:20 -04:00
parent 2964d87ed4
commit b9c0ca992d
2 changed files with 102 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
libctru/include/3ds/services/sslc.h
View File

@ -77,6 +77,41 @@ Result sslcRootCertChainAddDefaultCert(u32 RootCertChain_contexthandle, SSLC_Def
*/
Result sslcRootCertChainRemoveCert(u32 RootCertChain_contexthandle, u32 cert_contexthandle);
/**
* @brief Creates an unknown CertChain.
* @param CertChain_contexthandle Output contexthandle.
*/
Result sslcCreate8CertChain(u32 *CertChain_contexthandle);
/**
* @brief Destroys a CertChain from sslcCreate8CertChain().
* @param CertChain_contexthandle CertChain contexthandle.
*/
Result sslcDestroy8CertChain(u32 CertChain_contexthandle);
/**
* @brief Adds a cert to a CertChain from sslcCreate8CertChain().
* @param CertChain_contexthandle CertChain to use.
* @param cert Pointer to the cert.
* @param certsize Size of the cert.
*/
Result sslc8CertChainAddCert(u32 CertChain_contexthandle, u8 *cert, u32 certsize, u32 *cert_contexthandle);
/**
* @brief Adds a default cert to a CertChain from sslcCreate8CertChain(). Not actually usable since no certIDs are implemented in SSL-module for this.
* @param CertChain_contexthandle CertChain to use.
* @param certID ID of the cert to add.
* @param cert_contexthandle Optional, the cert contexthandle can be written here.
*/
Result sslc8CertChainAddDefaultCert(u32 CertChain_contexthandle, u8 certID, u32 *cert_contexthandle);
/**
* @brief Removes the specified cert from the CertChain from sslcCreate8CertChain().
* @param CertChain_contexthandle CertChain to use.
* @param cert_contexthandle Cert contexthandle to remove from the CertChain.
*/
Result sslc8CertChainRemoveCert(u32 CertChain_contexthandle, u32 cert_contexthandle);
/**
* @brief Opens a new ClientCert-context.
* @param cert Pointer to the DER cert.
@ -169,7 +204,7 @@ Result sslcContextSetRootCertChain(sslcContext *context, u32 handle);
Result sslcContextSetClientCert(sslcContext *context, u32 handle);
/*
* @brief Set the context which was created by command 0x00080000, for the specified sslc context. This needs updated once it's known what this context is for.
* @brief Set the context for a CertChain from sslcCreate8CertChain(), for the specified sslc context. This needs updated once it's known what this context is for.
* @param context sslc context.
* @param handle contexthandle.
*/

81
libctru/source/services/sslc.c
View File

@ -36,6 +36,7 @@ void sslcExit(void)
if (AtomicDecrement(&__sslc_refcount)) return;
svcCloseHandle(__sslc_servhandle);
__sslc_servhandle = 0;
}
static Result sslcipc_Initialize(void)
@ -72,27 +73,27 @@ static Result sslcipc_CreateContext(sslcContext *context, int sockfd, u32 input_
return ret;
}
Result sslcCreateRootCertChain(u32 *RootCertChain_contexthandle)
static Result sslcipc_CreateCertChain(u32 type, u32 *contexthandle)
{
u32* cmdbuf=getThreadCommandBuffer();
cmdbuf[0]=IPC_MakeHeader(0x3,0,0); // 0x30000
cmdbuf[0]=IPC_MakeHeader(0x3 + type*0x5,0,0); // 0x30000
Result ret=0;
if(R_FAILED(ret=svcSendSyncRequest(__sslc_servhandle)))return ret;
ret = cmdbuf[1];
if(R_SUCCEEDED(ret))*RootCertChain_contexthandle = cmdbuf[2];
if(R_SUCCEEDED(ret))*contexthandle = cmdbuf[2];
return ret;
}
Result sslcDestroyRootCertChain(u32 RootCertChain_contexthandle)
static Result sslcipc_DestroyCertChain(u32 type, u32 contexthandle)
{
u32* cmdbuf=getThreadCommandBuffer();
cmdbuf[0]=IPC_MakeHeader(0x4,1,0); // 0x40040
cmdbuf[1]=RootCertChain_contexthandle;
cmdbuf[0]=IPC_MakeHeader(0x4 + type*0x5,1,0); // 0x40040
cmdbuf[1]=contexthandle;
Result ret=0;
if(R_FAILED(ret=svcSendSyncRequest(__sslc_servhandle)))return ret;
@ -100,12 +101,12 @@ Result sslcDestroyRootCertChain(u32 RootCertChain_contexthandle)
return cmdbuf[1];
}
Result sslcAddTrustedRootCA(u32 RootCertChain_contexthandle, u8 *cert, u32 certsize, u32 *cert_contexthandle)
static Result sslcipc_CertChainAddCert(u32 type, u32 contexthandle, u8 *cert, u32 certsize, u32 *cert_contexthandle)
{
u32* cmdbuf=getThreadCommandBuffer();
cmdbuf[0]=IPC_MakeHeader(0x5,2,2); // 0x50082
cmdbuf[1]=RootCertChain_contexthandle;
cmdbuf[0]=IPC_MakeHeader(0x5 + type*0x5,2,2); // 0x50082
cmdbuf[1]=contexthandle;
cmdbuf[2]=certsize;
cmdbuf[3]=IPC_Desc_Buffer(certsize, IPC_BUFFER_R);
cmdbuf[4]=(u32)cert;
@ -119,12 +120,12 @@ Result sslcAddTrustedRootCA(u32 RootCertChain_contexthandle, u8 *cert, u32 certs
return ret;
}
Result sslcRootCertChainAddDefaultCert(u32 RootCertChain_contexthandle, SSLC_DefaultRootCert certID, u32 *cert_contexthandle)
static Result sslcipc_CertChainAddDefaultCert(u32 type, u32 contexthandle, u8 certID, u32 *cert_contexthandle)
{
u32* cmdbuf=getThreadCommandBuffer();
cmdbuf[0]=IPC_MakeHeader(0x6,2,0); // 0x60080
cmdbuf[1]=RootCertChain_contexthandle;
cmdbuf[0]=IPC_MakeHeader(0x6 + type*0x5,2,0); // 0x60080
cmdbuf[1]=contexthandle;
cmdbuf[2]=certID;
Result ret=0;
@ -136,12 +137,12 @@ Result sslcRootCertChainAddDefaultCert(u32 RootCertChain_contexthandle, SSLC_Def
return ret;
}
Result sslcRootCertChainRemoveCert(u32 RootCertChain_contexthandle, u32 cert_contexthandle)
static Result sslcipc_CertChainRemoveCert(u32 type, u32 contexthandle, u32 cert_contexthandle)
{
u32* cmdbuf=getThreadCommandBuffer();
cmdbuf[0]=IPC_MakeHeader(0x7,2,0); // 0x70080
cmdbuf[1]=RootCertChain_contexthandle;
cmdbuf[0]=IPC_MakeHeader(0x7 + type*0x5,2,0); // 0x70080
cmdbuf[1]=contexthandle;
cmdbuf[2]=cert_contexthandle;
Result ret=0;
@ -394,6 +395,56 @@ Result sslcAddCert(sslcContext *context, u8 *buf, u32 size)
return ret;
}
Result sslcCreateRootCertChain(u32 *RootCertChain_contexthandle)
{
return sslcipc_CreateCertChain(0, RootCertChain_contexthandle);
}
Result sslcDestroyRootCertChain(u32 RootCertChain_contexthandle)
{
return sslcipc_DestroyCertChain(0, RootCertChain_contexthandle);
}
Result sslcAddTrustedRootCA(u32 RootCertChain_contexthandle, u8 *cert, u32 certsize, u32 *cert_contexthandle)
{
return sslcipc_CertChainAddCert(0, RootCertChain_contexthandle, cert, certsize, cert_contexthandle);
}
Result sslcRootCertChainAddDefaultCert(u32 RootCertChain_contexthandle, SSLC_DefaultRootCert certID, u32 *cert_contexthandle)
{
return sslcipc_CertChainAddDefaultCert(0, RootCertChain_contexthandle, certID, cert_contexthandle);
}
Result sslcRootCertChainRemoveCert(u32 RootCertChain_contexthandle, u32 cert_contexthandle)
{
return sslcipc_CertChainRemoveCert(0, RootCertChain_contexthandle, cert_contexthandle);
}
Result sslcCreate8CertChain(u32 *PinnedCertChain_contexthandle)
{
return sslcipc_CreateCertChain(1, PinnedCertChain_contexthandle);
}
Result sslcDestroy8CertChain(u32 PinnedCertChain_contexthandle)
{
return sslcipc_DestroyCertChain(1, PinnedCertChain_contexthandle);
}
Result sslc8CertChainAddCert(u32 PinnedCertChain_contexthandle, u8 *cert, u32 certsize, u32 *cert_contexthandle)
{
return sslcipc_CertChainAddCert(1, PinnedCertChain_contexthandle, cert, certsize, cert_contexthandle);
}
Result sslc8CertChainAddDefaultCert(u32 PinnedCertChain_contexthandle, u8 certID, u32 *cert_contexthandle)
{
return sslcipc_CertChainAddDefaultCert(1, PinnedCertChain_contexthandle, certID, cert_contexthandle);
}
Result sslc8CertChainRemoveCert(u32 PinnedCertChain_contexthandle, u32 cert_contexthandle)
{
return sslcipc_CertChainRemoveCert(1, PinnedCertChain_contexthandle, cert_contexthandle);
}
Result sslcCreateContext(sslcContext *context, int sockfd, u32 input_opt, char *hostname)
{
Result ret=0;