WolfSSL
/
wolfTPM
mirror of https://github.com/wolfSSL/wolfTPM.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #326 from dgarske/htons 

Type cleanups for htons and byte swap
pull/329/head
lealem47 2024-01-29 10:18:53 -07:00 committed by GitHub
parent 0adf473e31 a2a45d2a3d
commit 0b3448c8d9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
wolftpm/tpm2_types.h
View File

@ -134,7 +134,6 @@ typedef int64_t INT64;
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <arpa/inet.h>
#ifdef WOLFTPM_USER_SETTINGS #ifdef WOLFTPM_USER_SETTINGS
#include "user_settings.h" #include "user_settings.h"
@ -231,20 +230,6 @@ typedef int64_t INT64;
#ifndef WOLFTPM_CUSTOM_TYPES #ifndef WOLFTPM_CUSTOM_TYPES
#include <stdlib.h> #include <stdlib.h>
#ifndef XHTONS
/* WOLFCRYPT_ONLY means no wolfio and no arpa/inet.h */
#ifdef WOLFCRYPT_ONLY
#ifdef BIG_ENDIAN_ORDER
#define XHTONS(s) (s)
#else
#define XHTONS(s) ((((s) & 0xff) << 8) | (((s) & 0xff00) >> 8))
#endif
#else
#include <arpa/inet.h>
#define XHTONS(s) htons((s))
#endif
#endif
#define XSTRTOL(s,e,b) strtol((s),(e),(b)) #define XSTRTOL(s,e,b) strtol((s),(e),(b))
#define XATOI(s) atoi((s)) #define XATOI(s) atoi((s))
@ -718,7 +703,7 @@ static inline word16 ByteReverseWord16(word16 value)
static inline word32 ByteReverseWord32(word32 value) static inline word32 ByteReverseWord32(word32 value)
{ {
#if !defined(WOLF_NO_BUILTIN) && defined(__GNUC_PREREQ) && __GNUC_PREREQ(4, 3) #if defined(WOLF_ALLOW_BUILTIN) && defined(__GNUC_PREREQ) && __GNUC_PREREQ(4, 3)
return (word32)__builtin_bswap32(value); return (word32)__builtin_bswap32(value);
#elif defined(PPC_INTRINSICS) #elif defined(PPC_INTRINSICS)
/* PPC: load reverse indexed instruction */ /* PPC: load reverse indexed instruction */
@ -758,7 +743,7 @@ static inline word32 ByteReverseWord32(word32 value)
static inline word64 ByteReverseWord64(word64 value) static inline word64 ByteReverseWord64(word64 value)
{ {
#if !defined(WOLF_NO_BUILTIN) && defined(__GNUC_PREREQ) && __GNUC_PREREQ(4, 3) #if defined(WOLF_ALLOW_BUILTIN) && defined(__GNUC_PREREQ) && __GNUC_PREREQ(4, 3)
return (word64)__builtin_bswap64(value); return (word64)__builtin_bswap64(value);
#else #else
return (word64)((word64)ByteReverseWord32((word32)value)) << 32 | return (word64)((word64)ByteReverseWord32((word32)value)) << 32 |