iodine 0.4.8 → 0.4.10

data/ext/iodine/xor-crypt.c

@@ -103,14 +103,17 @@ int bscrypt_xor_crypt(xor_key_s *key, void *target, const void *source,
   while (length > i) {
     while ((key->length - key->position >= 8) // we have 8 bytes for key.
            && ((i + 8) <= length)             // we have 8 bytes for stream.
-           && (((uintptr_t)(target + i)) & 7) == 0 // target memory is aligned.
-           && (((uintptr_t)(source + i)) & 7) == 0 // source memory is aligned.
+           && (((uintptr_t)((uintptr_t)target + i)) & 7) ==
+                  0 // target memory is aligned.
+           && (((uintptr_t)((uintptr_t)source + i)) & 7) ==
+                  0 // source memory is aligned.
            && ((uintptr_t)(key->key + key->position) & 7) == 0 // key aligned.
            ) {
       // fprintf(stderr, "XOR optimization used i= %lu, key pos = %lu.\n", i,
       //         key->position);
-      *((uint64_t *)(target + i)) = *((uint64_t *)(source + i)) ^
-                                    *((uint64_t *)(key->key + key->position));
+      *((uint64_t *)((uintptr_t)target + i)) =
+          *((uint64_t *)((uintptr_t)source + i)) ^
+          *((uint64_t *)(key->key + key->position));
       key->position += 8;
       i += 8;
       if (key->position < key->length)
@@ -122,8 +125,9 @@ int bscrypt_xor_crypt(xor_key_s *key, void *target, const void *source,
 
     if (i < length) {
       // fprintf(stderr, "XOR single byte.\n");
-      *((uint8_t *)(target + i)) =
-          *((uint8_t *)(source + i)) ^ *((uint8_t *)(key->key + key->position));
+      *((uint8_t *)((uintptr_t)target + i)) =
+          *((uint8_t *)((uintptr_t)source + i)) ^
+          *((uint8_t *)(key->key + key->position));
       ++i;
       ++key->position;
       if (key->position == key->length) {
@@ -145,8 +149,8 @@ int bscrypt_xor128_crypt(uint64_t *key, void *target, const void *source,
   uint8_t pos = 0;
   for (size_t i = 0; i < (length >> 3); i++) {
     ((uint64_t *)target)[0] = ((uint64_t *)source)[0] ^ key[pos++];
-    target += 8;
-    source += 8;
+    target = (void *)((uintptr_t)target + 8);
+    source = (void *)((uintptr_t)source + 8);
     if (pos < 2)
       continue;
     if (on_cycle && on_cycle(key))
@@ -169,8 +173,8 @@ int bscrypt_xor256_crypt(uint64_t *key, void *target, const void *source,
     ((uint64_t *)target)[1] = ((uint64_t *)source)[1] ^ key[1];
     ((uint64_t *)target)[2] = ((uint64_t *)source)[2] ^ key[2];
     ((uint64_t *)target)[3] = ((uint64_t *)source)[3] ^ key[3];
-    target += 32;
-    source += 32;
+    target = (void *)((uintptr_t)target + 32);
+    source = (void *)((uintptr_t)source + 32);
     if (on_cycle && on_cycle(key))
       return -1;
   }
@@ -178,8 +182,8 @@ int bscrypt_xor256_crypt(uint64_t *key, void *target, const void *source,
   uint8_t pos = 0;
   for (size_t i = 0; i < (length >> 3); i++) {
     ((uint64_t *)target)[0] = ((uint64_t *)source)[0] ^ key[pos++];
-    target += 8;
-    source += 8;
+    target = (void *)((uintptr_t)target + 8);
+    source = (void *)((uintptr_t)source + 8);
   }
   length = length & 7;
   for (size_t i = 0; i < length; i++) {

data/lib/iodine/version.rb

@@ -1,3 +1,3 @@
 module Iodine
-  VERSION = '0.4.8'.freeze
+  VERSION = '0.4.10'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iodine
 version: !ruby/object:Gem::Version
-  version: 0.4.8
+  version: 0.4.10
 platform: ruby
 authors:
 - Boaz Segev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-23 00:00:00.000000000 Z
+date: 2017-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -132,16 +132,33 @@ files:
 - ext/iodine/bscrypt.h
 - ext/iodine/defer.c
 - ext/iodine/defer.h
-- ext/iodine/empty.h
 - ext/iodine/evio.c
 - ext/iodine/evio.h
 - ext/iodine/extconf.rb
 - ext/iodine/facil.c
 - ext/iodine/facil.h
+- ext/iodine/fio2resp.c
+- ext/iodine/fio2resp.h
+- ext/iodine/fio_cli_helper.c
+- ext/iodine/fio_cli_helper.h
 - ext/iodine/fio_dict.c
 - ext/iodine/fio_dict.h
 - ext/iodine/fio_hash_table.h
 - ext/iodine/fio_list.h
+- ext/iodine/fiobj.h
+- ext/iodine/fiobj_alloc.c
+- ext/iodine/fiobj_ary.c
+- ext/iodine/fiobj_generic.c
+- ext/iodine/fiobj_hash.c
+- ext/iodine/fiobj_io.c
+- ext/iodine/fiobj_json.c
+- ext/iodine/fiobj_misc.c
+- ext/iodine/fiobj_numbers.c
+- ext/iodine/fiobj_primitives.c
+- ext/iodine/fiobj_str.c
+- ext/iodine/fiobj_sym.c
+- ext/iodine/fiobj_tests.c
+- ext/iodine/fiobj_types.h
 - ext/iodine/hex.c
 - ext/iodine/hex.h
 - ext/iodine/http.c
@@ -198,6 +215,7 @@ files:
 - ext/iodine/sock.c
 - ext/iodine/sock.h
 - ext/iodine/spnlock.inc
+- ext/iodine/websocket_parser.h
 - ext/iodine/websockets.c
 - ext/iodine/websockets.h
 - ext/iodine/xor-crypt.c

data/ext/iodine/empty.h

@@ -1,26 +0,0 @@
-/*
-Copyright: Boaz segev, 2016-2017
-License: MIT except for any non-public-domain algorithms (none that I'm aware
-of), which might be subject to their own licenses.
-
-Feel free to copy, use and enjoy in accordance with to the license(s).
-*/
-#ifndef BSCRYPT_EMPTY_H
-#define BSCRYPT_EMPTY_H
-#include "bscrypt-common.h"
-/* *****************************************************************************
-C++ extern
-*/
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
-/* *****************************************************************************
-C++ extern finish
-*/
-#if defined(__cplusplus)
-}
-#endif
-
-/* ****************************************************************************/
-#endif /* include guard */