bare-buffer 2.5.8 → 2.5.10

package/CMakeLists.txt

@@ -26,6 +26,9 @@ target_sources(
 
 target_link_libraries(
   ${bare_buffer}
+  PRIVATE
+    $<TARGET_OBJECTS:base64>
+    $<TARGET_OBJECTS:hex>
   PUBLIC
     base64
     hex

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bare-buffer",
-  "version": "2.5.8",
+  "version": "2.5.10",
   "description": "Native buffers for JavaScript",
   "exports": {
     ".": "./index.js",

package/vendor/libbase64/include/base64.h

@@ -1,6 +1,7 @@
 #ifndef BASE64_H
 #define BASE64_H
 
+#include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <utf.h>
@@ -9,11 +10,116 @@
 extern "C" {
 #endif
 
-int
-base64_encode (const uint8_t *buffer, size_t buffer_len, utf8_t *string, size_t *string_len);
+static const char base64__alphabet[64] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
 
-int
-base64_decode (const utf8_t *string, size_t string_len, uint8_t *buffer, size_t *buffer_len);
+static const char base64__inverse_alphabet[256] = {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 62, -1, -1, -1, 63, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, -1, -1, -1, -1, -1, -1, -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -1, -1, -1, -1, -1, -1, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1};
+
+static inline int
+base64__encode (const uint8_t *buffer, size_t buffer_len, utf8_t *string, size_t *string_len) {
+  size_t len = 4 * ((buffer_len + 2) / 3);
+
+  if (string == NULL) {
+    *string_len = len;
+    return 0;
+  }
+
+  if (*string_len < len) return -1;
+
+  bool terminate = *string_len > len;
+
+  *string_len = len;
+
+  size_t k = 0, i = 0, n = buffer_len;
+
+  uint8_t a, b, c;
+
+  for (; i + 2 < n; i += 3) {
+    a = buffer[i];
+    b = buffer[i + 1];
+    c = buffer[i + 2];
+
+    string[k++] = base64__alphabet[a >> 2];
+    string[k++] = base64__alphabet[((a & 0x03) << 4) | (b >> 4)];
+    string[k++] = base64__alphabet[((b & 0x0f) << 2) | (c >> 6)];
+    string[k++] = base64__alphabet[c & 0x3f];
+  }
+
+  if (i < n) {
+    a = buffer[i];
+
+    string[k++] = base64__alphabet[a >> 2];
+
+    if (i + 1 < n) {
+      b = buffer[i + 1];
+
+      string[k++] = base64__alphabet[((a & 0x03) << 4) | (b >> 4)];
+      string[k++] = base64__alphabet[(b & 0x0f) << 2];
+    } else {
+      string[k++] = base64__alphabet[(a & 0x03) << 4];
+      string[k++] = '=';
+    }
+
+    string[k++] = '=';
+  }
+
+  if (terminate) string[k] = '\0';
+
+  return 0;
+}
+
+static inline int
+base64__decode (const utf8_t *string, size_t string_len, uint8_t *buffer, size_t *buffer_len) {
+  if (string_len % 4 != 0) return -1;
+
+  if (string_len == 0) {
+    *buffer_len = 0;
+    return 0;
+  }
+
+  size_t len = string_len / 4 * 3;
+
+  if (string[string_len - 1] == '=') len--;
+  if (string[string_len - 2] == '=') len--;
+
+  if (buffer == NULL) {
+    *buffer_len = len;
+    return 0;
+  }
+
+  if (*buffer_len < len) return -1;
+
+  *buffer_len = len;
+
+  size_t k = 0;
+
+  for (size_t i = 0, n = string_len; i < n; i += 4) {
+    char chunk[4];
+
+    for (size_t j = 0; j < 4; j++) {
+      chunk[j] = string[i + j] == '=' ? 0 : base64__inverse_alphabet[string[i + j]];
+
+      if (chunk[j] == (char) -1) return -1;
+    }
+
+    uint32_t triple = (chunk[0] << 3 * 6) + (chunk[1] << 2 * 6) + (chunk[2] << 1 * 6) + (chunk[3] << 0 * 6);
+
+    if (k < len) buffer[k++] = (triple >> 2 * 8) & 0xFF;
+    if (k < len) buffer[k++] = (triple >> 1 * 8) & 0xFF;
+    if (k < len) buffer[k++] = (triple >> 0 * 8) & 0xFF;
+  }
+
+  return 0;
+}
+
+inline int
+base64_encode (const uint8_t *buffer, size_t buffer_len, utf8_t *string, size_t *string_len) {
+  return base64__encode(buffer, buffer_len, string, string_len);
+}
+
+inline int
+base64_decode (const utf8_t *string, size_t string_len, uint8_t *buffer, size_t *buffer_len) {
+  return base64__decode(string, string_len, buffer, buffer_len);
+}
 
 #ifdef __cplusplus
 }

package/vendor/libbase64/src/base64.c

@@ -1,107 +1,10 @@
-#include <stdbool.h>
-#include <stddef.h>
 #include <stdint.h>
 #include <utf.h>
 
 #include "../include/base64.h"
 
-static const char base64_alphabet[64] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+extern int
+base64_encode (const uint8_t *buffer, size_t buffer_len, utf8_t *string, size_t *string_len);
 
-static const char base64_inverse_alphabet[256] = {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 62, -1, -1, -1, 63, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, -1, -1, -1, -1, -1, -1, -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -1, -1, -1, -1, -1, -1, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1};
-
-int
-base64_encode (const uint8_t *buffer, size_t buffer_len, utf8_t *string, size_t *string_len) {
-  size_t len = 4 * ((buffer_len + 2) / 3);
-
-  if (string == NULL) {
-    *string_len = len;
-    return 0;
-  }
-
-  if (*string_len < len) return -1;
-
-  bool terminate = *string_len > len;
-
-  *string_len = len;
-
-  size_t k = 0, i = 0, n = buffer_len;
-
-  uint8_t a, b, c;
-
-  for (; i + 2 < n; i += 3) {
-    a = buffer[i];
-    b = buffer[i + 1];
-    c = buffer[i + 2];
-
-    string[k++] = base64_alphabet[a >> 2];
-    string[k++] = base64_alphabet[((a & 0x03) << 4) | (b >> 4)];
-    string[k++] = base64_alphabet[((b & 0x0f) << 2) | (c >> 6)];
-    string[k++] = base64_alphabet[c & 0x3f];
-  }
-
-  if (i < n) {
-    a = buffer[i];
-
-    string[k++] = base64_alphabet[a >> 2];
-
-    if (i + 1 < n) {
-      b = buffer[i + 1];
-
-      string[k++] = base64_alphabet[((a & 0x03) << 4) | (b >> 4)];
-      string[k++] = base64_alphabet[(b & 0x0f) << 2];
-    } else {
-      string[k++] = base64_alphabet[(a & 0x03) << 4];
-      string[k++] = '=';
-    }
-
-    string[k++] = '=';
-  }
-
-  if (terminate) string[k] = '\0';
-
-  return 0;
-}
-
-int
-base64_decode (const utf8_t *string, size_t string_len, uint8_t *buffer, size_t *buffer_len) {
-  if (string_len % 4 != 0) return -1;
-
-  if (string_len == 0) {
-    *buffer_len = 0;
-    return 0;
-  }
-
-  size_t len = string_len / 4 * 3;
-
-  if (string[string_len - 1] == '=') len--;
-  if (string[string_len - 2] == '=') len--;
-
-  if (buffer == NULL) {
-    *buffer_len = len;
-    return 0;
-  }
-
-  if (*buffer_len < len) return -1;
-
-  *buffer_len = len;
-
-  size_t k = 0;
-
-  for (size_t i = 0, n = string_len; i < n; i += 4) {
-    char chunk[4];
-
-    for (size_t j = 0; j < 4; j++) {
-      chunk[j] = string[i + j] == '=' ? 0 : base64_inverse_alphabet[string[i + j]];
-
-      if (chunk[j] == (char) -1) return -1;
-    }
-
-    uint32_t triple = (chunk[0] << 3 * 6) + (chunk[1] << 2 * 6) + (chunk[2] << 1 * 6) + (chunk[3] << 0 * 6);
-
-    if (k < len) buffer[k++] = (triple >> 2 * 8) & 0xFF;
-    if (k < len) buffer[k++] = (triple >> 1 * 8) & 0xFF;
-    if (k < len) buffer[k++] = (triple >> 0 * 8) & 0xFF;
-  }
-
-  return 0;
-}
+extern int
+base64_decode (const utf8_t *string, size_t string_len, uint8_t *buffer, size_t *buffer_len);

package/vendor/libhex/include/hex.h

@@ -1,6 +1,7 @@
 #ifndef HEX_H
 #define HEX_H
 
+#include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <utf.h>
@@ -9,11 +10,76 @@
 extern "C" {
 #endif
 
-int
-hex_encode (const uint8_t *buffer, size_t buffer_len, utf8_t *string, size_t *string_len);
+static const char hex__alphabet[16] = "0123456789abcdef";
 
-int
-hex_decode (const utf8_t *string, size_t string_len, uint8_t *buffer, size_t *buffer_len);
+static const char hex__inverse_alphabet[256] = {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, -1, -1, -1, -1, -1, -1, -1, 10, 11, 12, 13, 14, 15, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 10, 11, 12, 13, 14, 15, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1};
+
+static inline int
+hex__encode (const uint8_t *buffer, size_t buffer_len, utf8_t *string, size_t *string_len) {
+  size_t len = buffer_len * 2;
+
+  if (string == NULL) {
+    *string_len = len;
+    return 0;
+  }
+
+  if (*string_len < len) return -1;
+
+  bool terminate = *string_len > len;
+
+  *string_len = len;
+
+  size_t k = 0;
+
+  for (size_t i = 0, n = buffer_len; i < n; i++) {
+    string[k++] = hex__alphabet[buffer[i] >> 4];
+    string[k++] = hex__alphabet[buffer[i] & 0x0f];
+  }
+
+  if (terminate) string[k] = '\0';
+
+  return 0;
+}
+
+static inline int
+hex__decode (const utf8_t *string, size_t string_len, uint8_t *buffer, size_t *buffer_len) {
+  size_t len = string_len >> 1;
+
+  if (buffer == NULL) {
+    *buffer_len = len;
+    return 0;
+  }
+
+  if (*buffer_len < len) return -1;
+
+  *buffer_len = len;
+
+  size_t k = 0;
+
+  for (size_t i = 0, n = string_len; i < n; i += 2) {
+    char chunk[2];
+
+    for (size_t j = 0; j < 2; j++) {
+      chunk[j] = i + j < n ? hex__inverse_alphabet[string[i + j]] : 0;
+
+      if (chunk[j] == (char) -1) return -1;
+    }
+
+    buffer[k++] = (chunk[0] << 4) | chunk[1];
+  }
+
+  return 0;
+}
+
+inline int
+hex_encode (const uint8_t *buffer, size_t buffer_len, utf8_t *string, size_t *string_len) {
+  return hex__encode(buffer, buffer_len, string, string_len);
+}
+
+inline int
+hex_decode (const utf8_t *string, size_t string_len, uint8_t *buffer, size_t *buffer_len) {
+  return hex__decode(string, string_len, buffer, buffer_len);
+}
 
 #ifdef __cplusplus
 }

package/vendor/libhex/src/hex.c

@@ -1,67 +1,10 @@
-#include <stdbool.h>
-#include <stddef.h>
 #include <stdint.h>
 #include <utf.h>
 
 #include "../include/hex.h"
 
-static const char hex_alphabet[16] = "0123456789abcdef";
+extern int
+hex_encode (const uint8_t *buffer, size_t buffer_len, utf8_t *string, size_t *string_len);
 
-static const char hex_inverse_alphabet[256] = {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, -1, -1, -1, -1, -1, -1, -1, 10, 11, 12, 13, 14, 15, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 10, 11, 12, 13, 14, 15, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1};
-
-int
-hex_encode (const uint8_t *buffer, size_t buffer_len, utf8_t *string, size_t *string_len) {
-  size_t len = buffer_len * 2;
-
-  if (string == NULL) {
-    *string_len = len;
-    return 0;
-  }
-
-  if (*string_len < len) return -1;
-
-  bool terminate = *string_len > len;
-
-  *string_len = len;
-
-  size_t k = 0;
-
-  for (size_t i = 0, n = buffer_len; i < n; i++) {
-    string[k++] = hex_alphabet[buffer[i] >> 4];
-    string[k++] = hex_alphabet[buffer[i] & 0x0f];
-  }
-
-  if (terminate) string[k] = '\0';
-
-  return 0;
-}
-
-int
-hex_decode (const utf8_t *string, size_t string_len, uint8_t *buffer, size_t *buffer_len) {
-  size_t len = string_len >> 1;
-
-  if (buffer == NULL) {
-    *buffer_len = len;
-    return 0;
-  }
-
-  if (*buffer_len < len) return -1;
-
-  *buffer_len = len;
-
-  size_t k = 0;
-
-  for (size_t i = 0, n = string_len; i < n; i += 2) {
-    char chunk[2];
-
-    for (size_t j = 0; j < 2; j++) {
-      chunk[j] = i + j < n ? hex_inverse_alphabet[string[i + j]] : 0;
-
-      if (chunk[j] == (char) -1) return -1;
-    }
-
-    buffer[k++] = (chunk[0] << 4) | chunk[1];
-  }
-
-  return 0;
-}
+extern int
+hex_decode (const utf8_t *string, size_t string_len, uint8_t *buffer, size_t *buffer_len);