Merge branch 'revision'

Author: chardoncs

.gitattributes

@@ -0,0 +1,25 @@
+*               text=auto
+
+# C
+*.h             text eol=lf
+*.c             text eol=lf
+
+# C++
+*.hpp           text eol=lf
+*.cpp           text eol=lf
+
+# Other
+*.md            text eol=lf
+*.clang-format  text eol=lf
+*.mak           text eol=lf
+*.json          text eol=lf
+*.cmake         text eol=lf
+*.txt          text eol=lf
+*.py            text eol=lf
+
+*.png           -text
+*.jpg           -text
+*.jpeg          -text
+*.webp          -text
+
+Makefile        text eol=lf

CMakeLists.txt

@@ -3,7 +3,12 @@ cmake_minimum_required(VERSION 3.16.0)
 set(CMAKE_C_COMPILER clang)
 set(CMAKE_CXX_COMPILER clang++)
 
-project(libpgfe VERSION 0.6.0 LANGUAGES C CXX)
+project(libpgfe
+  VERSION 0.5.1
+  DESCRIPTION "Cryptographic library"
+  HOMEPAGE_URL "https://github.com/chardon55/libpgfe"
+  LANGUAGES C CXX
+)
 
 set(CMAKE_C_STANDARD 11)
 set(CMAKE_CXX_STANDARD 14)
@@ -52,7 +57,6 @@ add_executable(pgfetestcpp ${test_dir}/test.cpp)
 # add_executable(totptestcpp ${test_dir}/totptest.cpp)
 
 target_include_directories(pgfe PRIVATE
-  ${src_dir}
   ${include_dir}
 )
 

include/backend/base-encoding-internal.h

@@ -37,11 +37,11 @@ size_t __pgfe_transform_codes(const pgfe_encode_t input[], size_t length, uint8_
 size_t
 __pgfe_unittostr(PGFE_BASE_PARAMS_DEF, const char alphabet[], const pgfe_encode_t unit[], char out[], bool padding);
 
-size_t __pgfe_encode_generic(
+size_t __pgfe_encode_base_generic(
     PGFE_BASE_PARAMS_DEF, const char alphabet[], const pgfe_encode_t input[], size_t input_length, char cs_out[]
 );
 
-size_t __pgfe_decode_generic(
+size_t __pgfe_decode_base_generic(
     PGFE_BASE_PARAMS_DEF, pgfe_encode_t (*func)(char), const char basexx_cs[], pgfe_encode_t output[]
 );
 

include/sequential_data.hpp

@@ -28,20 +28,23 @@ class SequentialData
 {
 private:
     seqdata_t *seq = nullptr;
-    size_t sz = 0, hex_sz = 0;
-
     char *hex_str = nullptr;
+    size_t sz = 0, hex_sz = 0;
 
-    bool _is_str, _apstr;
+    bool _is_str = false, _apstr = false;
 
     bool determine_ascii_str();
 
+    void check_range(size_t &start, size_t &length) const;
+
 public:
     SequentialData(const pgfe_encode_t *, size_t);
     SequentialData(const char *);
     SequentialData(std::string &);
     SequentialData(const SequentialData *);
+    SequentialData(const SequentialData &);
     SequentialData(SequentialData *, bool delete_current);
+
     ~SequentialData();
 
     const char *to_cs() const;

include/version.h

@@ -9,10 +9,10 @@
 #define LIBPGFE_VERSION_H
 
 #define LIBPGFE_MAJOR_VERSION 0
-#define LIBPGFE_MINOR_VERSION 6
-#define LIBPGFE_REVISION 0
-#define LIBPGFE_VARIANT "rc1"
+#define LIBPGFE_MINOR_VERSION 5
+#define LIBPGFE_REVISION 1
+#define LIBPGFE_VARIANT ""
 
-#define LIBPGFE_VERSION "0.6.0-rc1"
+#define LIBPGFE_VERSION "0.5.1"
 
 #endif

metadata.mak

@@ -1,5 +1,5 @@
 PROJECT := libpgfe
-VERSION := 0.6.0-rc1
+VERSION := 0.5.1
 
 BUILD_DIR := build
 

project.json

@@ -1,4 +1,4 @@
 {
     "name": "libpgfe",
-    "version": "0.6.0-rc1"
+    "version": "0.5.1"
 }

src/c/base_encoding/base-encoding-internal.c

@@ -11,38 +11,36 @@
 
 #include "backend/generic-internal.h"
 
-uint8_t __pgfe_build_mask(uint8_t digit_c);
+#define __bitsz 8
 
-inline uint8_t __pgfe_build_mask(uint8_t digit_c) {
-    return UINT8_MAX >> (to_bit(sizeof(uint8_t)) - digit_c);
-}
+#define __mkmask(digit) (UINT8_MAX >> (__bitsz - (digit)))
 
 size_t __pgfe_transform_codes(const pgfe_encode_t input[], size_t length, uint8_t chunk_size, pgfe_encode_t out[]) {
-    const uint16_t bitsz = to_bit(sizeof(pgfe_encode_t));
-    pgfe_encode_t *inp = (pgfe_encode_t *)input, *op = out;
+    const pgfe_encode_t *inp = input;
+    pgfe_encode_t *op = out;
     size_t low, high, mv_sz, sz_diff;
 
-    const uint8_t chunk_mask = __pgfe_build_mask(chunk_size);
+    const uint8_t chunk_mask = __mkmask(chunk_size);
 
-    for (low = 0, high = chunk_size % bitsz; inp - input <= length; inp++, op++) {
+    for (low = 0, high = chunk_size % __bitsz; inp - input <= length; inp++, op++) {
         if (low < high) {
-            *op = ((*inp) >> (bitsz - high)) & chunk_mask;
+            *op = ((*inp) >> (__bitsz - high)) & chunk_mask;
             inp--;
         }
         else if (!high) {
             *op = (*inp) & chunk_mask;
         }
         else {
-            sz_diff = bitsz - low;
+            sz_diff = __bitsz - low;
             mv_sz = chunk_size - sz_diff;
-            *op = ((*inp) & __pgfe_build_mask(sz_diff)) << mv_sz;
+            *op = ((*inp) & __mkmask(sz_diff)) << mv_sz;
             if (inp - input + 1 < length) {
-                *op |= ((*(inp + 1)) >> (bitsz - high)) & __pgfe_build_mask(high);
+                *op |= ((*(inp + 1)) >> (__bitsz - high)) & __mkmask(high);
             }
         }
 
-        low = (low + chunk_size) % bitsz;
-        high = (high + chunk_size) % bitsz;
+        low = (low + chunk_size) % __bitsz;
+        high = (high + chunk_size) % __bitsz;
     }
 
     return op - out;
@@ -75,10 +73,11 @@ size_t __pgfe_unittostr(
     return chunk_count;
 }
 
-size_t __pgfe_encode_generic(
+size_t __pgfe_encode_base_generic(
     PGFE_BASE_PARAMS_DEF, const char alphabet[], const pgfe_encode_t input[], size_t input_length, char cs_out[]
 ) {
-    pgfe_encode_t input_unit[unit_size], *inp = (pgfe_encode_t *)input;
+    pgfe_encode_t input_unit[unit_size];
+    const pgfe_encode_t *inp = input;
     size_t i, remain;
     char *sp = cs_out;
 
@@ -103,15 +102,14 @@ size_t __pgfe_encode_generic(
     return sp - cs_out;
 }
 
-size_t __pgfe_decode_generic(
+size_t __pgfe_decode_base_generic(
     PGFE_BASE_PARAMS_DEF, pgfe_encode_t (*func)(char), const char basexx_cs[], pgfe_encode_t output[]
 ) {
     pgfe_encode_t *op, ch, sig, o_unit[unit_size];
-    const size_t sz_ou = to_bit(sizeof(pgfe_encode_t));
-    char *sp = (char *)basexx_cs;
-    size_t i = 0, j;
+    const char *sp = basexx_cs;
+    size_t i, j;
     uint64_t u;
-    const uint8_t mask = __pgfe_build_mask(bit_size);
+    const uint8_t mask = __mkmask(bit_size);
 
     u = 0;
     op = output;
@@ -134,7 +132,7 @@ size_t __pgfe_decode_generic(
         }
 
         for (j = 0; j < unit_size; j++) {
-            o_unit[j] = (pgfe_encode_t)((u >> (sz_ou * (unit_size - j - 1))) & 0xFF);
+            o_unit[j] = (pgfe_encode_t)((u >> (__bitsz * (unit_size - j - 1))) & 0xFF);
         }
 
         memcpy(op, o_unit, unit_size);

src/c/base_encoding/base16.c

@@ -33,9 +33,9 @@ inline pgfe_encode_t pgfe_decode_base16_char(char base16_c) {
 }
 
 inline size_t pgfe_encode_base16(const pgfe_encode_t input[], size_t input_length, char cs_out[]) {
-    return __pgfe_encode_generic(PGFE_BASE_PARAMS(BASE16), BASE16_ALPHABET, input, input_length, cs_out);
+    return __pgfe_encode_base_generic(PGFE_BASE_PARAMS(BASE16), BASE16_ALPHABET, input, input_length, cs_out);
 }
 
 size_t pgfe_decode_base16(const char base16_cs[], pgfe_encode_t output[]) {
-    return __pgfe_decode_generic(PGFE_BASE_PARAMS(BASE16), pgfe_decode_base16_char, base16_cs, output);
+    return __pgfe_decode_base_generic(PGFE_BASE_PARAMS(BASE16), pgfe_decode_base16_char, base16_cs, output);
 }

src/c/base_encoding/base32.c

@@ -69,17 +69,17 @@ inline pgfe_encode_t pgfe_decode_base32hex_char(char base32_c) {
 }
 
 inline size_t pgfe_encode_base32(const pgfe_encode_t input[], size_t input_length, char cs_out[]) {
-    return __pgfe_encode_generic(PGFE_BASE_PARAMS(BASE32), BASE32_ALPHABET, input, input_length, cs_out);
+    return __pgfe_encode_base_generic(PGFE_BASE_PARAMS(BASE32), BASE32_ALPHABET, input, input_length, cs_out);
 }
 
 inline size_t pgfe_encode_base32hex(const pgfe_encode_t input[], size_t input_length, char cs_out[]) {
-    return __pgfe_encode_generic(PGFE_BASE_PARAMS(BASE32), BASE32_ALPHABET_EXTHEX, input, input_length, cs_out);
+    return __pgfe_encode_base_generic(PGFE_BASE_PARAMS(BASE32), BASE32_ALPHABET_EXTHEX, input, input_length, cs_out);
 }
 
 inline size_t pgfe_decode_base32(const char base32_cs[], pgfe_encode_t output[]) {
-    return __pgfe_decode_generic(PGFE_BASE_PARAMS(BASE32), pgfe_decode_base32_char, base32_cs, output);
+    return __pgfe_decode_base_generic(PGFE_BASE_PARAMS(BASE32), pgfe_decode_base32_char, base32_cs, output);
 }
 
 inline size_t pgfe_decode_base32hex(const char base32_cs[], pgfe_encode_t output[]) {
-    return __pgfe_decode_generic(PGFE_BASE_PARAMS(BASE32), pgfe_decode_base32hex_char, base32_cs, output);
+    return __pgfe_decode_base_generic(PGFE_BASE_PARAMS(BASE32), pgfe_decode_base32hex_char, base32_cs, output);
 }