logo

oasis

Own branch of Oasis Linux (upstream: <https://git.sr.ht/~mcf/oasis/>) git clone https://anongit.hacktivis.me/git/oasis.git

0002-Use-portable-int-pack-unpack-routines.patch (2377B)

    

  1. From 503ef43e485e76f015b95f3c24233e691ff55e32 Mon Sep 17 00:00:00 2001
  2. From: Michael Forney <mforney@mforney.org>
  3. Date: Wed, 1 Apr 2026 15:17:55 -0700
  4. Subject: [PATCH] Use portable int pack/unpack routines
  6. These compile to the exact same assembly on gcc with -O2.
  7. ---
  8.  src/curve25519.c | 38 +++++++++++---------------------------
  9.  1 file changed, 11 insertions(+), 27 deletions(-)
  11. diff --git a/src/curve25519.c b/src/curve25519.c
  12. index d3bc005..e67591c 100644
  13. --- a/src/curve25519.c
  14. +++ b/src/curve25519.c
  15. @@ -8,16 +8,6 @@
  16.  #include <stdint.h>
  17.  #include <string.h>
  18.  
  19. -#ifndef __BYTE_ORDER__
  20. -#include <sys/param.h>
  21. -#if !defined(BYTE_ORDER) || !defined(BIG_ENDIAN) || !defined(LITTLE_ENDIAN)
  22. -#error "Unable to determine endianness."
  23. -#endif
  24. -#define __BYTE_ORDER__ BYTE_ORDER
  25. -#define __ORDER_BIG_ENDIAN__ BIG_ENDIAN
  26. -#define __ORDER_LITTLE_ENDIAN__ LITTLE_ENDIAN
  27. -#endif
  28. -
  29.  #ifdef __linux__
  30.  #include <linux/types.h>
  31.  typedef __u64 u64;
  32. @@ -30,15 +20,6 @@ typedef uint32_t u32, __le32;
  33.  typedef uint8_t u8;
  34.  typedef int64_t s64;
  35.  #endif
  36. -#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
  37. -#define le64_to_cpup(a) __builtin_bswap64(*(a))
  38. -#define le32_to_cpup(a) __builtin_bswap32(*(a))
  39. -#define cpu_to_le64(a) __builtin_bswap64(a)
  40. -#else
  41. -#define le64_to_cpup(a) (*(a))
  42. -#define le32_to_cpup(a) (*(a))
  43. -#define cpu_to_le64(a) (a)
  44. -#endif
  45.  #ifndef __unused
  46.  #define __unused  __attribute__((unused))
  47.  #endif
  48. @@ -57,20 +38,23 @@ typedef int64_t s64;
  49.  
  50.  static __always_inline __unused __le32 get_unaligned_le32(const u8 *a)
  51.  {
  52. -	__le32 l;
  53. -	__builtin_memcpy(&l, a, sizeof(l));
  54. -	return le32_to_cpup(&l);
  55. +	return (__le32)a[0] | (__le32)a[1] << 8 | (__le32)a[2] << 16 | (__le32)a[3] << 24;
  56.  }
  57.  static __always_inline __unused __le64 get_unaligned_le64(const u8 *a)
  58.  {
  59. -	__le64 l;
  60. -	__builtin_memcpy(&l, a, sizeof(l));
  61. -	return le64_to_cpup(&l);
  62. +	return (__le64)a[0] | (__le64)a[1] << 8 | (__le64)a[2] << 16 | (__le64)a[3] << 24 |
  63. +	       (__le64)a[4] << 32 | (__le64)a[5] << 40 | (__le64)a[6] << 48 | (__le64)a[7] << 56;
  64.  }
  65.  static __always_inline __unused void put_unaligned_le64(u64 s, u8 *d)
  66.  {
  67. -	__le64 l = cpu_to_le64(s);
  68. -	__builtin_memcpy(d, &l, sizeof(l));
  69. +	d[0] = s;
  70. +	d[1] = s >> 8;
  71. +	d[2] = s >> 16;
  72. +	d[3] = s >> 24;
  73. +	d[4] = s >> 32;
  74. +	d[5] = s >> 40;
  75. +	d[6] = s >> 48;
  76. +	d[7] = s >> 56;
  77.  }
  78.  
  79.  static noinline void memzero_explicit(void *s, size_t count)
  80. -- 
  81. 2.49.0