isomorfeus-iodine 0.7.49 → 0.7.50

data/ext/{iodine → iodine_ext}/fio_siphash.c

@@ -1,157 +1,157 @@
-/*
-Copyright: Boaz Segev, 2017-2019
-License: MIT
-*/
-#include <fio_siphash.h>
-
-/* *****************************************************************************
-
-                                    NOTICE
-
-This code won't be linked to the final application when using fio.h and fio.c.
-
-The code is here only to allow the FIOBJ library to be extracted from the
-facil.io framework library.
-
-***************************************************************************** */
-
-/* *****************************************************************************
-Hashing (SipHash implementation)
-***************************************************************************** */
-
-#if !defined(__BIG_ENDIAN__) && !defined(__LITTLE_ENDIAN__) &&                 \
-    __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-/* the algorithm was designed as little endian... so, byte swap 64 bit. */
-#define sip_local64(i)                                                         \
-  (((i)&0xFFULL) << 56) | (((i)&0xFF00ULL) << 40) |                            \
-      (((i)&0xFF0000ULL) << 24) | (((i)&0xFF000000ULL) << 8) |                 \
-      (((i)&0xFF00000000ULL) >> 8) | (((i)&0xFF0000000000ULL) >> 24) |         \
-      (((i)&0xFF000000000000ULL) >> 40) | (((i)&0xFF00000000000000ULL) >> 56)
-#else
-/* no need */
-#define sip_local64(i) (i)
-#endif
-
-/* 64Bit left rotation, inlined. */
-#define lrot64(i, bits)                                                        \
-  (((uint64_t)(i) << (bits)) | ((uint64_t)(i) >> (64 - (bits))))
-
-static inline uint64_t fio_siphash_xy(const void *data, size_t len, size_t x,
-                                      size_t y, uint64_t key1, uint64_t key2) {
-  /* initialize the 4 words */
-  uint64_t v0 = (0x0706050403020100ULL ^ 0x736f6d6570736575ULL) ^ key1;
-  uint64_t v1 = (0x0f0e0d0c0b0a0908ULL ^ 0x646f72616e646f6dULL) ^ key2;
-  uint64_t v2 = (0x0706050403020100ULL ^ 0x6c7967656e657261ULL) ^ key1;
-  uint64_t v3 = (0x0f0e0d0c0b0a0908ULL ^ 0x7465646279746573ULL) ^ key2;
-  const uint64_t *w64 = data;
-  uint8_t len_mod = len & 255;
-  union {
-    uint64_t i;
-    uint8_t str[8];
-  } word;
-
-#define hash_map_SipRound                                                      \
-  do {                                                                         \
-    v2 += v3;                                                                  \
-    v3 = lrot64(v3, 16) ^ v2;                                                  \
-    v0 += v1;                                                                  \
-    v1 = lrot64(v1, 13) ^ v0;                                                  \
-    v0 = lrot64(v0, 32);                                                       \
-    v2 += v1;                                                                  \
-    v0 += v3;                                                                  \
-    v1 = lrot64(v1, 17) ^ v2;                                                  \
-    v3 = lrot64(v3, 21) ^ v0;                                                  \
-    v2 = lrot64(v2, 32);                                                       \
-  } while (0);
-
-  while (len >= 8) {
-    word.i = sip_local64(*w64);
-    v3 ^= word.i;
-    /* Sip Rounds */
-    for (size_t i = 0; i < x; ++i) {
-      hash_map_SipRound;
-    }
-    v0 ^= word.i;
-    w64 += 1;
-    len -= 8;
-  }
-  word.i = 0;
-  uint8_t *pos = word.str;
-  uint8_t *w8 = (void *)w64;
-  switch (len) { /* fallthrough is intentional */
-  case 7:
-    pos[6] = w8[6];
-    /* fallthrough */
-  case 6:
-    pos[5] = w8[5];
-    /* fallthrough */
-  case 5:
-    pos[4] = w8[4];
-    /* fallthrough */
-  case 4:
-    pos[3] = w8[3];
-    /* fallthrough */
-  case 3:
-    pos[2] = w8[2];
-    /* fallthrough */
-  case 2:
-    pos[1] = w8[1];
-    /* fallthrough */
-  case 1:
-    pos[0] = w8[0];
-  }
-  word.str[7] = len_mod;
-
-  /* last round */
-  v3 ^= word.i;
-  hash_map_SipRound;
-  hash_map_SipRound;
-  v0 ^= word.i;
-  /* Finalization */
-  v2 ^= 0xff;
-  /* d iterations of SipRound */
-  for (size_t i = 0; i < y; ++i) {
-    hash_map_SipRound;
-  }
-  hash_map_SipRound;
-  hash_map_SipRound;
-  hash_map_SipRound;
-  hash_map_SipRound;
-  /* XOR it all together */
-  v0 ^= v1 ^ v2 ^ v3;
-#undef hash_map_SipRound
-  return v0;
-}
-
-#pragma weak fio_siphash24
-uint64_t __attribute__((weak))
-fio_siphash24(const void *data, size_t len, uint64_t key1, uint64_t key2) {
-  return fio_siphash_xy(data, len, 2, 4, key1, key2);
-}
-
-#pragma weak fio_siphash13
-uint64_t __attribute__((weak))
-fio_siphash13(const void *data, size_t len, uint64_t key1, uint64_t key2) {
-  return fio_siphash_xy(data, len, 1, 3, key1, key2);
-}
-
-#if DEBUG
-#include <stdio.h>
-#include <string.h>
-#include <time.h>
-
-void fiobj_siphash_test(void) {
-  fprintf(stderr, "===================================\n");
-  // fio_siphash_speed_test();
-  uint64_t result = 0;
-  clock_t start;
-  start = clock();
-  for (size_t i = 0; i < 100000; i++) {
-    char *data = "The quick brown fox jumps over the lazy dog ";
-    __asm__ volatile("" ::: "memory");
-    result += fio_siphash_xy(data, 43, 1, 3, 0, 0);
-  }
-  fprintf(stderr, "fio 100K SipHash: %lf\n",
-          (double)(clock() - start) / CLOCKS_PER_SEC);
-}
-#endif
+/*
+Copyright: Boaz Segev, 2017-2019
+License: MIT
+*/
+#include <fio_siphash.h>
+
+/* *****************************************************************************
+
+                                    NOTICE
+
+This code won't be linked to the final application when using fio.h and fio.c.
+
+The code is here only to allow the FIOBJ library to be extracted from the
+facil.io framework library.
+
+***************************************************************************** */
+
+/* *****************************************************************************
+Hashing (SipHash implementation)
+***************************************************************************** */
+
+#if !defined(__BIG_ENDIAN__) && !defined(__LITTLE_ENDIAN__) &&                 \
+    __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
+/* the algorithm was designed as little endian... so, byte swap 64 bit. */
+#define sip_local64(i)                                                         \
+  (((i)&0xFFULL) << 56) | (((i)&0xFF00ULL) << 40) |                            \
+      (((i)&0xFF0000ULL) << 24) | (((i)&0xFF000000ULL) << 8) |                 \
+      (((i)&0xFF00000000ULL) >> 8) | (((i)&0xFF0000000000ULL) >> 24) |         \
+      (((i)&0xFF000000000000ULL) >> 40) | (((i)&0xFF00000000000000ULL) >> 56)
+#else
+/* no need */
+#define sip_local64(i) (i)
+#endif
+
+/* 64Bit left rotation, inlined. */
+#define lrot64(i, bits)                                                        \
+  (((uint64_t)(i) << (bits)) | ((uint64_t)(i) >> (64 - (bits))))
+
+static inline uint64_t fio_siphash_xy(const void *data, size_t len, size_t x,
+                                      size_t y, uint64_t key1, uint64_t key2) {
+  /* initialize the 4 words */
+  uint64_t v0 = (0x0706050403020100ULL ^ 0x736f6d6570736575ULL) ^ key1;
+  uint64_t v1 = (0x0f0e0d0c0b0a0908ULL ^ 0x646f72616e646f6dULL) ^ key2;
+  uint64_t v2 = (0x0706050403020100ULL ^ 0x6c7967656e657261ULL) ^ key1;
+  uint64_t v3 = (0x0f0e0d0c0b0a0908ULL ^ 0x7465646279746573ULL) ^ key2;
+  const uint64_t *w64 = data;
+  uint8_t len_mod = len & 255;
+  union {
+    uint64_t i;
+    uint8_t str[8];
+  } word;
+
+#define hash_map_SipRound                                                      \
+  do {                                                                         \
+    v2 += v3;                                                                  \
+    v3 = lrot64(v3, 16) ^ v2;                                                  \
+    v0 += v1;                                                                  \
+    v1 = lrot64(v1, 13) ^ v0;                                                  \
+    v0 = lrot64(v0, 32);                                                       \
+    v2 += v1;                                                                  \
+    v0 += v3;                                                                  \
+    v1 = lrot64(v1, 17) ^ v2;                                                  \
+    v3 = lrot64(v3, 21) ^ v0;                                                  \
+    v2 = lrot64(v2, 32);                                                       \
+  } while (0);
+
+  while (len >= 8) {
+    word.i = sip_local64(*w64);
+    v3 ^= word.i;
+    /* Sip Rounds */
+    for (size_t i = 0; i < x; ++i) {
+      hash_map_SipRound;
+    }
+    v0 ^= word.i;
+    w64 += 1;
+    len -= 8;
+  }
+  word.i = 0;
+  uint8_t *pos = word.str;
+  uint8_t *w8 = (void *)w64;
+  switch (len) { /* fallthrough is intentional */
+  case 7:
+    pos[6] = w8[6];
+    /* fallthrough */
+  case 6:
+    pos[5] = w8[5];
+    /* fallthrough */
+  case 5:
+    pos[4] = w8[4];
+    /* fallthrough */
+  case 4:
+    pos[3] = w8[3];
+    /* fallthrough */
+  case 3:
+    pos[2] = w8[2];
+    /* fallthrough */
+  case 2:
+    pos[1] = w8[1];
+    /* fallthrough */
+  case 1:
+    pos[0] = w8[0];
+  }
+  word.str[7] = len_mod;
+
+  /* last round */
+  v3 ^= word.i;
+  hash_map_SipRound;
+  hash_map_SipRound;
+  v0 ^= word.i;
+  /* Finalization */
+  v2 ^= 0xff;
+  /* d iterations of SipRound */
+  for (size_t i = 0; i < y; ++i) {
+    hash_map_SipRound;
+  }
+  hash_map_SipRound;
+  hash_map_SipRound;
+  hash_map_SipRound;
+  hash_map_SipRound;
+  /* XOR it all together */
+  v0 ^= v1 ^ v2 ^ v3;
+#undef hash_map_SipRound
+  return v0;
+}
+
+#pragma weak fio_siphash24
+uint64_t __attribute__((weak))
+fio_siphash24(const void *data, size_t len, uint64_t key1, uint64_t key2) {
+  return fio_siphash_xy(data, len, 2, 4, key1, key2);
+}
+
+#pragma weak fio_siphash13
+uint64_t __attribute__((weak))
+fio_siphash13(const void *data, size_t len, uint64_t key1, uint64_t key2) {
+  return fio_siphash_xy(data, len, 1, 3, key1, key2);
+}
+
+#if DEBUG
+#include <stdio.h>
+#include <string.h>
+#include <time.h>
+
+void fiobj_siphash_test(void) {
+  fprintf(stderr, "===================================\n");
+  // fio_siphash_speed_test();
+  uint64_t result = 0;
+  clock_t start;
+  start = clock();
+  for (size_t i = 0; i < 100000; i++) {
+    char *data = "The quick brown fox jumps over the lazy dog ";
+    __asm__ volatile("" ::: "memory");
+    result += fio_siphash_xy(data, 43, 1, 3, 0, 0);
+  }
+  fprintf(stderr, "fio 100K SipHash: %lf\n",
+          (double)(clock() - start) / CLOCKS_PER_SEC);
+}
+#endif

data/ext/{iodine → iodine_ext}/fio_siphash.h

@@ -1,37 +1,37 @@
-#ifndef H_FIO_SIPHASH_H
-#define H_FIO_SIPHASH_H
-
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif
-
-#include <stdint.h>
-#include <sys/types.h>
-
-/**
- * A SipHash variation (2-4).
- */
-uint64_t fio_siphash24(const void *data, size_t len, uint64_t key1,
-                       uint64_t key2);
-
-/**
- * A SipHash 1-3 variation.
- */
-uint64_t fio_siphash13(const void *data, size_t len, uint64_t key1,
-                       uint64_t key2);
-
-/**
- * The Hashing function used by dynamic facil.io objects.
- *
- * Currently implemented using SipHash 1-3.
- */
-#define fio_siphash(data, length, k1, k2)                                      \
-  fio_siphash13((data), (length), (k1), (k2))
-
-#if DEBUG
-void fiobj_siphash_test(void);
-#else
-#define fiobj_siphash_test()
-#endif
-
-#endif /* H_FIO_SIPHASH_H */
+#ifndef H_FIO_SIPHASH_H
+#define H_FIO_SIPHASH_H
+
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
+
+#include <stdint.h>
+#include <sys/types.h>
+
+/**
+ * A SipHash variation (2-4).
+ */
+uint64_t fio_siphash24(const void *data, size_t len, uint64_t key1,
+                       uint64_t key2);
+
+/**
+ * A SipHash 1-3 variation.
+ */
+uint64_t fio_siphash13(const void *data, size_t len, uint64_t key1,
+                       uint64_t key2);
+
+/**
+ * The Hashing function used by dynamic facil.io objects.
+ *
+ * Currently implemented using SipHash 1-3.
+ */
+#define fio_siphash(data, length, k1, k2)                                      \
+  fio_siphash13((data), (length), (k1), (k2))
+
+#if DEBUG
+void fiobj_siphash_test(void);
+#else
+#define fiobj_siphash_test()
+#endif
+
+#endif /* H_FIO_SIPHASH_H */

data/ext/{iodine → iodine_ext}/fio_tls.h

@@ -1,129 +1,129 @@
-/*
-Copyright: Boaz Segev, 2018-2019
-License: MIT
-
-Feel free to copy, use and enjoy according to the license provided.
-*/
-#ifndef H_FIO_TLS
-
-/**
- * This is an SSL/TLS extension for the facil.io library.
- */
-#define H_FIO_TLS
-
-#include <stdint.h>
-
-#ifndef FIO_TLS_PRINT_SECRET
-/* if true, the master key secret should be printed using FIO_LOG_DEBUG */
-#define FIO_TLS_PRINT_SECRET 0
-#endif
-
-/** An opaque type used for the SSL/TLS functions. */
-typedef struct fio_tls_s fio_tls_s;
-
-/**
- * Creates a new SSL/TLS context / settings object with a default certificate
- * (if any).
- *
- * If no server name is provided and no private key and public certificate are
- * provided, an empty TLS object will be created, (maybe okay for clients).
- *
- *      fio_tls_s * tls = fio_tls_new("www.example.com",
- *                                    "public_key.pem",
- *                                    "private_key.pem", NULL );
- */
-fio_tls_s *fio_tls_new(const char *server_name, const char *public_cert_file,
-                       const char *private_key_file, const char *pk_password);
-
-/**
- * Adds a certificate a new SSL/TLS context / settings object (SNI support).
- *
- *      fio_tls_cert_add(tls, "www.example.com",
- *                            "public_key.pem",
- *                            "private_key.pem", NULL );
- */
-void fio_tls_cert_add(fio_tls_s *, const char *server_name,
-                      const char *public_cert_file,
-                      const char *private_key_file, const char *pk_password);
-
-/**
- * Adds an ALPN protocol callback to the SSL/TLS context.
- *
- * The first protocol added will act as the default protocol to be selected.
- *
- * The `on_selected` callback should accept the `uuid`, the user data pointer
- * passed to either `fio_tls_accept` or `fio_tls_connect` (here:
- * `udata_connetcion`) and the user data pointer passed to the
- * `fio_tls_alpn_add` function (`udata_tls`).
- *
- * The `on_cleanup` callback will be called when the TLS object is destroyed (or
- * `fio_tls_alpn_add` is called again with the same protocol name). The
- * `udata_tls` argument will be passed along, as is, to the callback (if set).
- *
- * Except for the `tls` and `protocol_name` arguments, all arguments can be
- * NULL.
- */
-void fio_tls_alpn_add(fio_tls_s *tls, const char *protocol_name,
-                      void (*on_selected)(intptr_t uuid, void *udata_connection,
-                                          void *udata_tls),
-                      void *udata_tls, void (*on_cleanup)(void *udata_tls));
-
-/**
- * Returns the number of registered ALPN protocol names.
- *
- * This could be used when deciding if protocol selection should be delegated to
- * the ALPN mechanism, or whether a protocol should be immediately assigned.
- *
- * If no ALPN protocols are registered, zero (0) is returned.
- */
-uintptr_t fio_tls_alpn_count(fio_tls_s *tls);
-
-/**
- * Adds a certificate to the "trust" list, which automatically adds a peer
- * verification requirement.
- *
- * Note, when the fio_tls_s object is used for server connections, this will
- * limit connections to clients that connect using a trusted certificate.
- *
- *      fio_tls_trust(tls, "google-ca.pem" );
- */
-void fio_tls_trust(fio_tls_s *, const char *public_cert_file);
-
-/**
- * Establishes an SSL/TLS connection as an SSL/TLS Server, using the specified
- * context / settings object.
- *
- * The `uuid` should be a socket UUID that is already connected to a peer (i.e.,
- * the result of `fio_accept`).
- *
- * The `udata` is an opaque user data pointer that is passed along to the
- * protocol selected (if any protocols were added using `fio_tls_alpn_add`).
- */
-void fio_tls_accept(intptr_t uuid, fio_tls_s *tls, void *udata);
-
-/**
- * Establishes an SSL/TLS connection as an SSL/TLS Client, using the specified
- * context / settings object.
- *
- * The `uuid` should be a socket UUID that is already connected to a peer (i.e.,
- * one received by a `fio_connect` specified callback `on_connect`).
- *
- * The `udata` is an opaque user data pointer that is passed along to the
- * protocol selected (if any protocols were added using `fio_tls_alpn_add`).
- */
-void fio_tls_connect(intptr_t uuid, fio_tls_s *tls, void *udata);
-
-/**
- * Increase the reference count for the TLS object.
- *
- * Decrease with `fio_tls_destroy`.
- */
-void fio_tls_dup(fio_tls_s *tls);
-
-/**
- * Destroys the SSL/TLS context / settings object and frees any related
- * resources / memory.
- */
-void fio_tls_destroy(fio_tls_s *tls);
-
-#endif
+/*
+Copyright: Boaz Segev, 2018-2019
+License: MIT
+
+Feel free to copy, use and enjoy according to the license provided.
+*/
+#ifndef H_FIO_TLS
+
+/**
+ * This is an SSL/TLS extension for the facil.io library.
+ */
+#define H_FIO_TLS
+
+#include <stdint.h>
+
+#ifndef FIO_TLS_PRINT_SECRET
+/* if true, the master key secret should be printed using FIO_LOG_DEBUG */
+#define FIO_TLS_PRINT_SECRET 0
+#endif
+
+/** An opaque type used for the SSL/TLS functions. */
+typedef struct fio_tls_s fio_tls_s;
+
+/**
+ * Creates a new SSL/TLS context / settings object with a default certificate
+ * (if any).
+ *
+ * If no server name is provided and no private key and public certificate are
+ * provided, an empty TLS object will be created, (maybe okay for clients).
+ *
+ *      fio_tls_s * tls = fio_tls_new("www.example.com",
+ *                                    "public_key.pem",
+ *                                    "private_key.pem", NULL );
+ */
+fio_tls_s *fio_tls_new(const char *server_name, const char *public_cert_file,
+                       const char *private_key_file, const char *pk_password);
+
+/**
+ * Adds a certificate a new SSL/TLS context / settings object (SNI support).
+ *
+ *      fio_tls_cert_add(tls, "www.example.com",
+ *                            "public_key.pem",
+ *                            "private_key.pem", NULL );
+ */
+void fio_tls_cert_add(fio_tls_s *, const char *server_name,
+                      const char *public_cert_file,
+                      const char *private_key_file, const char *pk_password);
+
+/**
+ * Adds an ALPN protocol callback to the SSL/TLS context.
+ *
+ * The first protocol added will act as the default protocol to be selected.
+ *
+ * The `on_selected` callback should accept the `uuid`, the user data pointer
+ * passed to either `fio_tls_accept` or `fio_tls_connect` (here:
+ * `udata_connetcion`) and the user data pointer passed to the
+ * `fio_tls_alpn_add` function (`udata_tls`).
+ *
+ * The `on_cleanup` callback will be called when the TLS object is destroyed (or
+ * `fio_tls_alpn_add` is called again with the same protocol name). The
+ * `udata_tls` argument will be passed along, as is, to the callback (if set).
+ *
+ * Except for the `tls` and `protocol_name` arguments, all arguments can be
+ * NULL.
+ */
+void fio_tls_alpn_add(fio_tls_s *tls, const char *protocol_name,
+                      void (*on_selected)(intptr_t uuid, void *udata_connection,
+                                          void *udata_tls),
+                      void *udata_tls, void (*on_cleanup)(void *udata_tls));
+
+/**
+ * Returns the number of registered ALPN protocol names.
+ *
+ * This could be used when deciding if protocol selection should be delegated to
+ * the ALPN mechanism, or whether a protocol should be immediately assigned.
+ *
+ * If no ALPN protocols are registered, zero (0) is returned.
+ */
+uintptr_t fio_tls_alpn_count(fio_tls_s *tls);
+
+/**
+ * Adds a certificate to the "trust" list, which automatically adds a peer
+ * verification requirement.
+ *
+ * Note, when the fio_tls_s object is used for server connections, this will
+ * limit connections to clients that connect using a trusted certificate.
+ *
+ *      fio_tls_trust(tls, "google-ca.pem" );
+ */
+void fio_tls_trust(fio_tls_s *, const char *public_cert_file);
+
+/**
+ * Establishes an SSL/TLS connection as an SSL/TLS Server, using the specified
+ * context / settings object.
+ *
+ * The `uuid` should be a socket UUID that is already connected to a peer (i.e.,
+ * the result of `fio_accept`).
+ *
+ * The `udata` is an opaque user data pointer that is passed along to the
+ * protocol selected (if any protocols were added using `fio_tls_alpn_add`).
+ */
+void fio_tls_accept(intptr_t uuid, fio_tls_s *tls, void *udata);
+
+/**
+ * Establishes an SSL/TLS connection as an SSL/TLS Client, using the specified
+ * context / settings object.
+ *
+ * The `uuid` should be a socket UUID that is already connected to a peer (i.e.,
+ * one received by a `fio_connect` specified callback `on_connect`).
+ *
+ * The `udata` is an opaque user data pointer that is passed along to the
+ * protocol selected (if any protocols were added using `fio_tls_alpn_add`).
+ */
+void fio_tls_connect(intptr_t uuid, fio_tls_s *tls, void *udata);
+
+/**
+ * Increase the reference count for the TLS object.
+ *
+ * Decrease with `fio_tls_destroy`.
+ */
+void fio_tls_dup(fio_tls_s *tls);
+
+/**
+ * Destroys the SSL/TLS context / settings object and frees any related
+ * resources / memory.
+ */
+void fio_tls_destroy(fio_tls_s *tls);
+
+#endif