mirror of https://github.com/wolfSSL/wolfssh.git
Cert Manager
1. Add allocators for cert manager wrapper. 2. Add test cases for the allocators.pull/415/head
parent
09e3446b96
commit
57cbcbd8ca
|
|
@ -39,8 +39,8 @@
|
|||
#include <wolfssl/ssl.h>
|
||||
#include <wolfssl/ocsp.h>
|
||||
|
||||
#include <wolfssh/certman.h>
|
||||
#include <wolfssh/internal.h>
|
||||
#include <wolfssh/certman.h>
|
||||
|
||||
|
||||
#ifdef WOLFSSH_CERTS
|
||||
|
|
@ -52,9 +52,102 @@
|
|||
#include "src/misc.c"
|
||||
#endif
|
||||
|
||||
int wolfSSH_CertInit(void)
|
||||
|
||||
#define WLOG_ENTER() do { \
|
||||
WLOG(WS_LOG_CERTMAN, "Entering %s()", __func__); \
|
||||
} while (0)
|
||||
|
||||
#define WLOG_LEAVE(x) do { \
|
||||
WLOG(WS_LOG_CERTMAN, "Leaving %s(), ret = %d", __func__, (x)); \
|
||||
} while (0)
|
||||
|
||||
#define WLOG_LEAVE_VOID() do { \
|
||||
WLOG(WS_LOG_CERTMAN, "Leaving %s()", __func__); \
|
||||
} while (0)
|
||||
|
||||
#define WLOG_LEAVE_PTR(x) do { \
|
||||
WLOG(WS_LOG_CERTMAN, "Leaving %s(), ret = %p", __func__, (x)); \
|
||||
} while (0)
|
||||
|
||||
#ifdef DEBUG_WOLFSSH
|
||||
#define DUMP(x,y) do { DumpOctetString((x),(y)); } while (0)
|
||||
#else
|
||||
#define DUMP(x,y)
|
||||
#endif
|
||||
|
||||
|
||||
static WOLFSSH_CERTMAN* _CertMan_init(WOLFSSH_CERTMAN* cm, void* heap)
|
||||
{
|
||||
return 0;
|
||||
(void)heap;
|
||||
WLOG_ENTER();
|
||||
|
||||
if (cm != NULL) {
|
||||
WMEMSET(cm, 0, sizeof *cm);
|
||||
}
|
||||
|
||||
WLOG_LEAVE_PTR(cm);
|
||||
return cm;
|
||||
}
|
||||
|
||||
|
||||
static void _CertMan_ResourceFree(WOLFSSH_CERTMAN* cm, void* heap)
|
||||
{
|
||||
(void)heap;
|
||||
WLOG_ENTER();
|
||||
|
||||
if (cm != NULL) {
|
||||
WMEMSET(cm, 0, sizeof *cm);
|
||||
}
|
||||
|
||||
WLOG_LEAVE_VOID();
|
||||
}
|
||||
|
||||
|
||||
WOLFSSH_CERTMAN* wolfSSH_CERTMAN_new(void* heap)
|
||||
{
|
||||
WOLFSSH_CERTMAN* cm = NULL;
|
||||
|
||||
WLOG_ENTER();
|
||||
|
||||
cm = (WOLFSSH_CERTMAN*)WMALLOC(sizeof *cm, heap, DYNTYPE_CERTMAN);
|
||||
if (cm != NULL) {
|
||||
if (_CertMan_init(cm, heap) == NULL) {
|
||||
WFREE(cm, heap, DYNTYPE_CERTMAN);
|
||||
cm = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
WLOG_LEAVE_PTR(cm);
|
||||
return cm;
|
||||
}
|
||||
|
||||
|
||||
void wolfSSH_CERTMAN_free(WOLFSSH_CERTMAN* cm)
|
||||
{
|
||||
WLOG_ENTER();
|
||||
|
||||
if (cm) {
|
||||
void* heap = cm->heap;
|
||||
|
||||
_CertMan_ResourceFree(cm, heap);
|
||||
WFREE(cm, heap, DYNTYPE_CERTMAN);
|
||||
}
|
||||
|
||||
WLOG_LEAVE_VOID();
|
||||
}
|
||||
|
||||
|
||||
WOLFSSH_CERTMAN* wolfSSH_CERTMAN_init(WOLFSSH_CERTMAN* cm, void* heap)
|
||||
{
|
||||
WLOG_ENTER();
|
||||
|
||||
if (cm != NULL) {
|
||||
cm = _CertMan_init(cm, heap);
|
||||
}
|
||||
|
||||
WLOG_LEAVE_PTR(cm);
|
||||
return cm;
|
||||
}
|
||||
|
||||
|
||||
#endif /* WOLFSSH_CERTS */
|
||||
|
|
|
|||
|
|
@ -129,6 +129,9 @@ static const char* GetLogStr(enum wolfSSH_LogLevel level)
|
|||
case WS_LOG_AGENT:
|
||||
return "AGENT";
|
||||
|
||||
case WS_LOG_CERTMAN:
|
||||
return "CERTMAN";
|
||||
|
||||
default:
|
||||
return "UNKNOWN";
|
||||
}
|
||||
|
|
|
|||
31
tests/api.c
31
tests/api.c
|
|
@ -659,6 +659,36 @@ static void test_wolfSSH_CTX_UsePrivateKey_buffer(void)
|
|||
}
|
||||
|
||||
|
||||
static void test_wolfSSH_CertMan(void)
|
||||
{
|
||||
#ifdef WOLFSSH_CERTMAN
|
||||
{
|
||||
WOLFSSH_CERTMAN* cm = NULL;
|
||||
|
||||
cm = wolfSSH_CERTMAN_new(NULL);
|
||||
AssertNotNull(cm);
|
||||
AssertNull(cm->heap);
|
||||
|
||||
wolfSSH_CERTMAN_free(cm);
|
||||
}
|
||||
{
|
||||
WOLFSSH_CERTMAN cm;
|
||||
WOLFSSH_CERTMAN* cmRef;
|
||||
byte fakeHeap[32];
|
||||
|
||||
cmRef = wolfSSH_CERTMAN_init(&cm, NULL);
|
||||
AssertNotNull(cmRef);
|
||||
AssertNull(cmRef->heap);
|
||||
|
||||
cmRef = wolfSSH_CERTMAN_init(&cm, fakeHeap);
|
||||
AssertNotNull(cmRef);
|
||||
AssertNotNull(cmRef->heap);
|
||||
AssertEQ(cmRef->heap, fakeHeap);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
#ifdef WOLFSSH_SCP
|
||||
static int my_ScpRecv(WOLFSSH* ssh, int state, const char* basePath,
|
||||
const char* fileName, int fileMode, word64 mTime, word64 aTime,
|
||||
|
|
@ -970,6 +1000,7 @@ int main(void)
|
|||
test_wolfSSH_ConvertConsole();
|
||||
test_wolfSSH_CTX_UsePrivateKey_buffer();
|
||||
test_wolfSSH_RealPath();
|
||||
test_wolfSSH_CertMan();
|
||||
|
||||
/* SCP tests */
|
||||
test_wolfSSH_SCP_CB();
|
||||
|
|
|
|||
|
|
@ -36,7 +36,21 @@ extern "C" {
|
|||
#endif
|
||||
|
||||
|
||||
WOLFSSH_API int wolfSSH_CertInit(void);
|
||||
struct WOLFSSH_CERTMAN {
|
||||
void* heap;
|
||||
unsigned char reserved[512];
|
||||
};
|
||||
typedef struct WOLFSSH_CERTMAN WOLFSSH_CERTMAN;
|
||||
|
||||
|
||||
WOLFSSH_API
|
||||
WOLFSSH_CERTMAN* wolfSSH_CERTMAN_new(void* heap);
|
||||
|
||||
WOLFSSH_API
|
||||
void wolfSSH_CERTMAN_free(WOLFSSH_CERTMAN* cm);
|
||||
|
||||
WOLFSSH_API
|
||||
WOLFSSH_CERTMAN* wolfSSH_CERTMAN_init(WOLFSSH_CERTMAN* cm, void* heap);
|
||||
|
||||
|
||||
#ifdef __cplusplus
|
||||
|
|
|
|||
|
|
@ -976,6 +976,7 @@ enum WS_DynamicTypes {
|
|||
DYNTYPE_AGENT_ID,
|
||||
DYNTYPE_AGENT_KEY,
|
||||
DYNTYPE_AGENT_BUFFER,
|
||||
DYNTYPE_CERTMAN,
|
||||
DYNTYPE_FILE,
|
||||
DYNTYPE_TEMP,
|
||||
DYNTYPE_PATH,
|
||||
|
|
|
|||
|
|
@ -43,6 +43,7 @@ extern "C" {
|
|||
|
||||
|
||||
enum wolfSSH_LogLevel {
|
||||
WS_LOG_CERTMAN = 9,
|
||||
WS_LOG_AGENT = 8,
|
||||
WS_LOG_SCP = 7,
|
||||
WS_LOG_SFTP = 6,
|
||||
|
|
|
|||
Loading…
Reference in New Issue