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

Remove error-ssl.h #308

Merged
merged 1 commit into from
Nov 2, 2023
Merged

Remove error-ssl.h #308

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
2 changes: 1 addition & 1 deletion examples/tpm_test_keys.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -458,7 +458,7 @@ int loadFile(const char* fname, byte** buf, size_t* bufLen)
#endif
}
else if (*buf != NULL && fileSz > (ssize_t)*bufLen) {
ret = INPUT_SIZE_E;
ret = BUFFER_E;
}
*bufLen = (size_t)fileSz;
if (ret == 0) {
Expand Down
11 changes: 5 additions & 6 deletions src/tpm2_swtpm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ static TPM_RC SwTpmTransmit(TPM2_CTX* ctx, const void* buffer, ssize_t bufSz)

wrc = write(ctx->tcpCtx.fd, buffer, bufSz);
if (bufSz != wrc) {
rc = SOCKET_ERROR_E;
rc = TPM_RC_FAILURE;
}

#ifdef WOLFTPM_DEBUG_VERBOSE
Expand Down Expand Up @@ -100,7 +100,7 @@ static TPM_RC SwTpmReceive(TPM2_CTX* ctx, void* buffer, size_t rxSz)
" = %s\n", ctx->tcpCtx.fd, errno, strerror(errno));
}
#endif
rc = SOCKET_ERROR_E;
rc = TPM_RC_FAILURE;
break;
}

Expand All @@ -118,7 +118,7 @@ static TPM_RC SwTpmReceive(TPM2_CTX* ctx, void* buffer, size_t rxSz)

static TPM_RC SwTpmConnect(TPM2_CTX* ctx, const char* host, const char* port)
{
TPM_RC rc = SOCKET_ERROR_E;
TPM_RC rc = TPM_RC_FAILURE;
struct addrinfo hints;
struct addrinfo *result, *rp;
int s;
Expand Down Expand Up @@ -183,7 +183,7 @@ static TPM_RC SwTpmDisconnect(TPM2_CTX* ctx)
#endif

if (0 != close(ctx->tcpCtx.fd)) {
rc = SOCKET_ERROR_E;
rc = TPM_RC_FAILURE;

#ifdef WOLFTPM_DEBUG_VERBOSE
printf("Failed to close fd %d, got errno %d ="
Expand All @@ -198,7 +198,6 @@ static TPM_RC SwTpmDisconnect(TPM2_CTX* ctx)

/* Talk to a TPM through socket
* return TPM_RC_SUCCESS on success,
* SOCKET_ERROR_E on socket errors,
* TPM_RC_FAILURE on other errors
*/
int TPM2_SWTPM_SendCommand(TPM2_CTX* ctx, TPM2_Packet* packet)
Expand Down Expand Up @@ -251,7 +250,7 @@ int TPM2_SWTPM_SendCommand(TPM2_CTX* ctx, TPM2_Packet* packet)
printf("Response size(%d) larger than command buffer(%d)\n",
rspSz, packet->pos);
#endif
rc = SOCKET_ERROR_E;
rc = TPM_RC_FAILURE;
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/tpm2_wrap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6489,7 +6489,7 @@ int wolfTPM2_GetPolicyDigest(WOLFTPM2_DEV* dev, TPM_HANDLE sessionHandle,
rc = LENGTH_ONLY_E;
}
else if (policyGetDigestOut->policyDigest.size > *policyDigestSz) {
rc = INPUT_SIZE_E;
rc = BUFFER_E;
}
else {
XMEMCPY(policyDigest, policyGetDigestOut->policyDigest.buffer,
Expand Down
5 changes: 0 additions & 5 deletions wolftpm/tpm2_types.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,6 @@ typedef int64_t INT64;
#include <wolfssl/wolfcrypt/types.h>
#include <wolfssl/wolfcrypt/logging.h>
#include <wolfssl/wolfcrypt/error-crypt.h>
#include <wolfssl/error-ssl.h>
#include <wolfssl/wolfcrypt/hash.h>
#include <wolfssl/wolfcrypt/rsa.h>
#include <wolfssl/wolfcrypt/ecc.h>
Expand Down Expand Up @@ -151,10 +150,6 @@ typedef int64_t INT64;
#define BAD_FUNC_ARG -173 /* Bad function argument provided */
#define NOT_COMPILED_IN -174 /* Feature not compiled in */
#define LENGTH_ONLY_E -202 /* Returning output length only */
#define INPUT_SIZE_E -412 /* input size too big error */

/* Errors from wolfssl/error-ssl.h */
#define SOCKET_ERROR_E -308 /* error state on socket */

#define ENCODING_TYPE_PEM CTC_FILETYPE_PEM
#define ENCODING_TYPE_ASN1 CTC_FILETYPE_ASN1
Expand Down