From f4b1908b1784fb0837f8597ed74afb7b27876407 Mon Sep 17 00:00:00 2001 From: John Safranek Date: Fri, 15 Aug 2014 11:37:00 -0700 Subject: [PATCH] Refactor the constants. --- examples/server/server.c | 2 +- src/internal.c | 8 ++++---- src/ssh.c | 20 ++++++++++---------- wolfssh/internal.h | 23 ++++++++++++++++++++++- wolfssh/ssh.h | 15 ++++++--------- 5 files changed, 43 insertions(+), 25 deletions(-) diff --git a/examples/server/server.c b/examples/server/server.c index 94c868b7..462c8fc8 100644 --- a/examples/server/server.c +++ b/examples/server/server.c @@ -270,7 +270,7 @@ int main(void) exit(EXIT_FAILURE); } - ctx = wolfSSH_CTX_new(WOLFSSH_SERVER, NULL); + ctx = wolfSSH_CTX_new(WOLFSSH_ENDPOINT_SERVER, NULL); if (ctx == NULL) { fprintf(stderr, "Couldn't allocate SSH CTX data.\n"); exit(EXIT_FAILURE); diff --git a/src/internal.c b/src/internal.c index ba063cd9..7082a179 100644 --- a/src/internal.c +++ b/src/internal.c @@ -160,7 +160,7 @@ int BufferInit(Buffer* buffer, uint32_t size, void* heap) buffer->heap = heap; buffer->bufferSz = size; if (size > STATIC_BUFFER_LEN) { - buffer->buffer = (uint8_t*)WMALLOC(size, heap, WOLFSSH_TYPE_BUFFER); + buffer->buffer = (uint8_t*)WMALLOC(size, heap, DYNTYPE_BUFFER); if (buffer->buffer == NULL) return WS_MEMORY_E; buffer->dynamicFlag = 1; @@ -185,7 +185,7 @@ int GrowBuffer(Buffer* buf, uint32_t sz, uint32_t usedSz) if (newSz > buf->bufferSz) { uint8_t* newBuffer = (uint8_t*)WMALLOC(newSz, - buf->heap, WOLFSSH_TYPE_BUFFER); + buf->heap, DYNTYPE_BUFFER); WLOG(WS_LOG_DEBUG, "Growing buffer"); @@ -199,7 +199,7 @@ int GrowBuffer(Buffer* buf, uint32_t sz, uint32_t usedSz) if (!buf->dynamicFlag) buf->dynamicFlag = 1; else - WFREE(buf->buffer, buf->heap, WOLFSSH_TYPE_BUFFER); + WFREE(buf->buffer, buf->heap, DYNTYPE_BUFFER); buf->buffer = newBuffer; buf->bufferSz = newSz; @@ -226,7 +226,7 @@ void ShrinkBuffer(Buffer* buf, int forcedFree) WMEMCPY(buf->staticBuffer, buf->buffer + buf->idx, usedSz); if (buf->dynamicFlag) - WFREE(buf->buffer, buf->heap, WOLFSSH_TYPE_BUFFER); + WFREE(buf->buffer, buf->heap, DYNTYPE_BUFFER); buf->dynamicFlag = 0; buf->buffer = buf->staticBuffer; buf->bufferSz = STATIC_BUFFER_LEN; diff --git a/src/ssh.c b/src/ssh.c index 88b7ab4c..d2be3554 100644 --- a/src/ssh.c +++ b/src/ssh.c @@ -78,12 +78,12 @@ WOLFSSH_CTX* wolfSSH_CTX_new(uint8_t side, void* heap) WLOG(WS_LOG_DEBUG, "Enter wolfSSH_CTX_new()"); - if (side != WOLFSSH_SERVER && side != WOLFSSH_CLIENT) { + if (side != WOLFSSH_ENDPOINT_SERVER && side != WOLFSSH_ENDPOINT_CLIENT) { WLOG(WS_LOG_DEBUG, "Invalid endpoint type"); return NULL; } - ctx = (WOLFSSH_CTX*)WMALLOC(sizeof(WOLFSSH_CTX), heap, WOLFSSH_CTX_TYPE); + ctx = (WOLFSSH_CTX*)WMALLOC(sizeof(WOLFSSH_CTX), heap, DYNTYPE_CTX); ctx = CtxInit(ctx, heap); WLOG(WS_LOG_DEBUG, "Leaving wolfSSH_CTX_new(), ctx = %p", ctx); @@ -107,7 +107,7 @@ void wolfSSH_CTX_free(WOLFSSH_CTX* ctx) if (ctx) { CtxResourceFree(ctx); - WFREE(ctx, ctx->heap, WOLFSSH_CTX_TYPE); + WFREE(ctx, ctx->heap, DYNTYPE_CTX); } } @@ -121,7 +121,7 @@ static WOLFSSH* SshInit(WOLFSSH* ssh, WOLFSSH_CTX* ctx) if (ssh == NULL) return ssh; - handshake = (HandshakeInfo*)WMALLOC(sizeof(HandshakeInfo), ctx->heap, WOLFSSH_HANDSHAKE_TYPE); + handshake = (HandshakeInfo*)WMALLOC(sizeof(HandshakeInfo), ctx->heap, DYNTYPE_HS); if (handshake == NULL) { wolfSSH_free(ssh); return NULL; @@ -172,7 +172,7 @@ WOLFSSH* wolfSSH_new(WOLFSSH_CTX* ctx) WLOG(WS_LOG_DEBUG, "Enter wolfSSH_new()"); - ssh = (WOLFSSH*)WMALLOC(sizeof(WOLFSSH), heap, WOLFSSH_TYPE); + ssh = (WOLFSSH*)WMALLOC(sizeof(WOLFSSH), heap, DYNTYPE_SSH); ssh = SshInit(ssh, ctx); WLOG(WS_LOG_DEBUG, "Leaving wolfSSH_new(), ssh = %p", ssh); @@ -191,7 +191,7 @@ static void SshResourceFree(WOLFSSH* ssh, void* heap) ShrinkBuffer(&ssh->outputBuffer, 1); if (ssh->handshake) { XMEMSET(ssh->handshake, 0, sizeof(HandshakeInfo)); - XFREE(ssh->handshake, heap, WOLFSSH_HANDSHAKE_TYPE); + XFREE(ssh->handshake, heap, DYNTYPE_HS); } } @@ -203,7 +203,7 @@ void wolfSSH_free(WOLFSSH* ssh) if (ssh) { SshResourceFree(ssh, heap); - WFREE(ssh, heap, WOLFSSH_TYPE); + WFREE(ssh, heap, DYNTYPE_SSH); } } @@ -305,7 +305,7 @@ int wolfSSH_CTX_use_private_key_buffer(WOLFSSH_CTX* ctx, const uint8_t* in, uint32_t inSz, int format) { WLOG(WS_LOG_DEBUG, "Enter wolfSSH_CTX_use_private_key_buffer()"); - return ProcessBuffer(ctx, in, inSz, format, 0); /* 0 should key PRIVATE_KEY_TYPE */ + return ProcessBuffer(ctx, in, inSz, format, BUFTYPE_PRIVKEY); } @@ -313,7 +313,7 @@ int wolfSSH_CTX_use_cert_buffer(WOLFSSH_CTX* ctx, const uint8_t* in, uint32_t inSz, int format) { WLOG(WS_LOG_DEBUG, "Enter wolfSSH_CTX_use_certificate_buffer()"); - return ProcessBuffer(ctx, in, inSz, format, 0); /* 0 should key CERT_TYPE */ + return ProcessBuffer(ctx, in, inSz, format, BUFTYPE_CERT); } @@ -321,7 +321,7 @@ int wolfSSH_CTX_use_ca_cert_buffer(WOLFSSH_CTX* ctx, const uint8_t* in, uint32_t inSz, int format) { WLOG(WS_LOG_DEBUG, "Enter wolfSSH_CTX_use_ca_certificate_buffer()"); - return ProcessBuffer(ctx, in, inSz, format, 0); /* 0 should key CA_TYPE */ + return ProcessBuffer(ctx, in, inSz, format, BUFTYPE_CA); } diff --git a/wolfssh/internal.h b/wolfssh/internal.h index 23a0c39d..3f8f6d7a 100644 --- a/wolfssh/internal.h +++ b/wolfssh/internal.h @@ -56,7 +56,7 @@ WOLFSSH_LOCAL const char* GetErrorString(int); enum { /* Any of the items can be none. */ - ID_NONE = 0, + ID_NONE, /* Encryption IDs */ ID_AES128_CBC, @@ -215,6 +215,27 @@ enum SshMessageIds { WOLFSSH_LOCAL int ProcessClientVersion(WOLFSSH*); WOLFSSH_LOCAL int SendServerVersion(WOLFSSH*); + +/* dynamic memory types */ +enum WS_DynamicTypes { + DYNTYPE_CTX, + DYNTYPE_SSH, + DYNTYPE_BUFFER, + DYNTYPE_ID, + DYNTYPE_HS, + DYNTYPE_CA, + DYNTYPE_CERT, + DYNTYPE_KEY +}; + + +enum WS_BufferTypes { + BUFTYPE_CA, + BUFTYPE_CERT, + BUFTYPE_PRIVKEY +}; + + #ifdef __cplusplus } #endif diff --git a/wolfssh/ssh.h b/wolfssh/ssh.h index 66e741f1..04a7ded4 100644 --- a/wolfssh/ssh.h +++ b/wolfssh/ssh.h @@ -87,18 +87,15 @@ WOLFSSH_API int wolfSSH_accept(WOLFSSH* ssh); enum WS_EndpointTypes { - WOLFSSH_SERVER = 0, - WOLFSSH_CLIENT = 1 + WOLFSSH_ENDPOINT_SERVER, + WOLFSSH_ENDPOINT_CLIENT }; -/* dynamic memory types */ -enum WS_DynamicTypes { - WOLFSSH_CTX_TYPE = 1, - WOLFSSH_TYPE = 2, - WOLFSSH_TYPE_BUFFER = 3, - WOLFSSH_ID_TYPE = 4, - WOLFSSH_HANDSHAKE_TYPE = 5 +enum WS_FormatTypes { + WOLFSSH_FORMAT_ASN1, + WOLFSSH_FORMAT_PEM, + WOLFSSH_FORMAT_RAW };