ci debug

ladnir · Oct 28, 2024 · 423884b · 423884b
1 parent f1a4d66
commit 423884b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
@@ -27,8 +27,8 @@ jobs:
            submodules: recursive
 
      # Runs a set of commands using the runners shell
-     #- name: build boost
-     #  run:  python3 build.py --setup --boost --par=4
+     # - name: build boost
+     #   run:  python3 build.py --setup --boost --par=4
 
      # - name: build relic
      #   run:  python3 build.py --setup --relic --par=4
@@ -37,7 +37,7 @@ jobs:
      #   run:  python3 build.py --setup --sodium --par=4
 
      - name: build cryptoTools
-       run:  python3 build.py --par=4 #-DENABLE_RELIC=ON  -D ENABLE_SODIUM=ON -DENABLE_CIRCUITS=ON
+       run:  python3 build.py --par=4 -DENABLE_RELIC=ON  -D ENABLE_SODIUM=ON -DENABLE_CIRCUITS=ON
 
      - name: unit tests
        run:  ./out/build/linux/frontend_cryptoTools/frontend_cryptoTools -u

diff --git a/cryptoTools/Crypto/AES.h b/cryptoTools/Crypto/AES.h
@@ -313,7 +313,7 @@ namespace osuCrypto {
 		}
 
 		template<AESTypes type>
-		void AES<type>::ecbEncCounterMode(block baseIdx, u64 blockLength, block* ciphertext) const
+		inline void AES<type>::ecbEncCounterMode(block baseIdx, u64 blockLength, block* ciphertext) const
 		{
 
 			constexpr u64 step = 8;

diff --git a/cryptoTools/Crypto/PRNG.cpp b/cryptoTools/Crypto/PRNG.cpp
@@ -70,13 +70,14 @@ namespace osuCrypto {
 
             if (mBytesIdx == mBufferByteCapacity)
             {
-                if (lengthu8 >= 8 * sizeof(block))
+                while (lengthu8 >= 8 * sizeof(block))
                 {
-                    span<block> b((block*)destu8, lengthu8 / sizeof(block));
+                    oc::AlignedArray<block, 8> b;
                     mAes.ecbEncCounterMode(mBlockIdx, b.size(), b.data());
+                    memcpy(destu8, &b, sizeof(b));
                     mBlockIdx += b.size();
 
-                    step = b.size() * sizeof(block);
+                    step = sizeof(b);
 
                     destu8 += step;
                     lengthu8 -= step;