final version of Table-Based OPPRF

pmpleader · Mar 17, 2017 · 4c63aba · 4c63aba
1 parent 882e0f4
commit 4c63aba
Show file tree

Hide file tree

Showing 38 changed files with 3,801 additions and 2,052 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.6)
+cmake_minimum_required (VERSION 2.8)
 
 project("libPSI")
 

diff --git a/cryptoTools/CMakeLists.txt b/cryptoTools/CMakeLists.txt
@@ -81,4 +81,4 @@ target_link_libraries(cryptoTools ${MIRACL_LIB})
 target_link_libraries(cryptoTools ${Boost_LIBRARIES})
 
 
-#set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
+#set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
diff --git a/cryptoTools/Common/ArrayView.h b/cryptoTools/Common/ArrayView.h
@@ -14,7 +14,7 @@ namespace osuCrypto {
             :mBegin(begin), mCur(cur), mEnd(end)
         {
             if (mCur > mEnd) throw std::runtime_error("iter went past end. " LOCATION);
-            if (mCur < mBegin - 1) throw std::runtime_error("iter went past begin. " LOCATION);
+            if (mCur && mCur < mBegin - 1) throw std::runtime_error("iter went past begin. " LOCATION);
         }
         T* mBegin, *mCur, *mEnd;
 
@@ -28,17 +28,6 @@ namespace osuCrypto {
             ++mCur;
             return ArrayIterator<T>(mBegin, mCur - 1, mEnd);
         }
-
-        ArrayIterator<T> operator+(int i) {
-            return ArrayIterator<T>(mBegin, mCur + i, mEnd);
-        }
-
-        ArrayIterator<T>& operator+=(int i) {
-            mCur += i;
-            if (mCur > mEnd) throw std::runtime_error("iter went past end. " LOCATION);
-            return *this;
-        }
-
         ArrayIterator<T>& operator--() {
             --mCur;
             if (mCur < mBegin - 1) throw std::runtime_error("iter went past end. " LOCATION);
@@ -50,20 +39,33 @@ namespace osuCrypto {
             return ArrayIterator<T>(mBegin, mCur + 1, mEnd);
         }
 
-        ArrayIterator<T> operator-(int i) {
+        ArrayIterator<T> operator+(i64 i) {
+            return ArrayIterator<T>(mBegin, mCur + i, mEnd);
+        }
+
+        ArrayIterator<T>& operator+=(i64 i) {
+            mCur += i;
+            if (mCur > mEnd) throw std::runtime_error("iter went past end. " LOCATION);
+            return *this;
+        }
+
+        ArrayIterator<T> operator-(i64 i) {
             return ArrayIterator<T>(mBegin, mCur - i, mEnd);
         }
 
-        ArrayIterator<T>& operator-=(int i) {
+        ArrayIterator<T>& operator-=(i64 i) {
             mCur -= i;
             if (mCur < mBegin - 1) throw std::runtime_error("iter went past end. " LOCATION);
             return *this;
         }
 
+        i64 operator-(T* i) {
+            return mCur - i;
+        }
 
         T& operator*() {
             if (mCur >= mEnd || mCur < mBegin)throw std::runtime_error("deref past begin or end. " LOCATION);
-            return *mCur; 
+            return *mCur;
         }
 
         T* operator->()
@@ -83,7 +85,7 @@ namespace osuCrypto {
         bool operator==(const ArrayIterator<T>& cmp) { return mCur == cmp.mCur; }
         bool operator!=(const ArrayIterator<T>& cmp) { return mCur != cmp.mCur; }
 
-        ArrayIterator<T>* operator=(const ArrayIterator<T>& cmp)
+        ArrayIterator<T>& operator=(const ArrayIterator<T>& cmp)
         {
             mBegin = cmp.mBegin; mCur = cmp.mCur; mEnd = cmp.mEnd; return *this;
         }
@@ -95,12 +97,13 @@ namespace osuCrypto {
     template<class T>
     class ArrayView
     {
-         
+
         T* mData;
         u64 mSize;
         bool mOwner;
-    public: 
+    public:
 
+        typedef T value_type;
 
         ArrayView()
             :mData(nullptr),
@@ -138,13 +141,17 @@ namespace osuCrypto {
         {}
 
         //template<typename Container>
-        
+
         template <class Iter>
         ArrayView(Iter start, Iter end, typename Iter::iterator_category *p = 0) :
             mData(&*start),
             mSize(end - start),
             mOwner(false)
         {
+            //static_assert(std::is_same<typename Iter::value_type, T>::value, "Iter iter must have the same value_type as ArrayView");
+            //(void*)p;
+            std::ignore = p;
+
         }
 
         ArrayView(T* begin, T* end, bool owner) :
@@ -153,14 +160,26 @@ namespace osuCrypto {
             mOwner(owner)
         {}
 
-        ArrayView(std::vector<T>& container)
-            : mData(container.data()),
-            mSize(container.size()),
+
+        template<template<typename, typename...> class C, typename... Args>
+        ArrayView(const C<T, Args...>& cont, typename C<T, Args...>::value_type* p = 0) :
+            mData(((C<T, Args...>&)cont).data()),
+            mSize((((C<T, Args...>&)cont).end() - ((C<T, Args...>&)cont).begin())),
             mOwner(false)
         {
+            std::ignore = p;
+            //static_assert(std::is_same<typename C<T, Args...>::value_type, T>::value, "Container cont must have the same value_type as ArrayView");
+            //(void*)p;
         }
 
-        template<u64 n>
+        //ArrayView(std::vector<T>& container)
+        //    : mData(container.data()),
+        //    mSize(container.size()),
+        //    mOwner(false)
+        //{
+        //}
+
+        template<size_t n>
         ArrayView(std::array<T,n>& container)
             : mData(container.data()),
             mSize(container.size()),
@@ -210,7 +229,7 @@ namespace osuCrypto {
         inline T& operator[](u64 idx) const
         {
 #ifndef NDEBUG
-            if (idx >= mSize) throw std::runtime_error(LOCATION); 
+            if (idx >= mSize) throw std::runtime_error(LOCATION);
 #endif
 
             return mData[idx];

diff --git a/cryptoTools/Common/ByteStream.cpp b/cryptoTools/Common/ByteStream.cpp
@@ -60,7 +60,7 @@ namespace osuCrypto {
     {
         if (loc > mCapacity) throw std::runtime_error("rt error at " LOCATION);
         mPutHead = loc;
-        mGetHead = std::min(mGetHead, mPutHead);
+        mGetHead = std::min<u64>(mGetHead, mPutHead);
     }
 
     u64 ByteStream::tellg()const

diff --git a/cryptoTools/Common/Defines.cpp b/cryptoTools/Common/Defines.cpp
@@ -5,7 +5,7 @@
 
 namespace osuCrypto {
 
-    Timer gTimer;
+    Timer gTimer(true);
     const block ZeroBlock = _mm_set_epi64x(0, 0);
     const block OneBlock = _mm_set_epi64x(0, 1);
     const block AllOneBlock = _mm_set_epi64x(u64(-1), u64(-1));

diff --git a/cryptoTools/Common/Defines.h b/cryptoTools/Common/Defines.h
@@ -1,5 +1,5 @@
 #pragma once
-// This file and the associated implementation has been placed in the public domain, waiving all copyright. No restrictions are placed on its use. 
+// This file and the associated implementation has been placed in the public domain, waiving all copyright. No restrictions are placed on its use.
 
 #include <cinttypes>
 #include <iomanip>
@@ -20,13 +20,13 @@
 #pragma GCC diagnostic ignored "-Wignored-attributes"
 #endif
 
-#ifdef _MSC_VER 
+#ifdef _MSC_VER
 #define __STR2__(x) #x
 #define __STR1__(x) __STR2__(x)
 #define TODO(x) __pragma(message (__FILE__ ":"__STR1__(__LINE__) " Warning:TODO - " #x))
-#define ALIGNED(__Declaration, __alignment) __declspec(align(__alignment)) __Declaration 
+#define ALIGNED(__Declaration, __alignment) __declspec(align(__alignment)) __Declaration
 #else
-#define TODO(x) 
+#define TODO(x)
 #define ALIGNED(__Declaration, __alignment) __Declaration __attribute__((aligned (16)))
 #endif
 
@@ -64,8 +64,11 @@ namespace osuCrypto {
     }
 
     typedef  __m128i block;
-    inline block toBlock(u8*data)
-    { return _mm_set_epi64x(((u64*)data)[1], ((u64*)data)[0]);}
+
+    inline block toBlock(u8*data) { return _mm_set_epi64x(((u64*)data)[1], ((u64*)data)[0]);}
+
+    inline block toBlock(u64 x)        { return _mm_set_epi64x(0,x); }
+    inline block toBlock(u64 x, u64 y) { return _mm_set_epi64x(x,y); }
 
     template <size_t N>
     using  MultiBlock = std::array<block, N>;
@@ -93,7 +96,7 @@ namespace osuCrypto {
         return _mm_add_epi64(lhs, rhs);
     }
 
-    
+
 #endif
 
     template <size_t N>
@@ -141,7 +144,7 @@ namespace osuCrypto {
     }
 
     std::ostream& operator<<(std::ostream& out, const block& block);
-    
+
     template <size_t N>
     std::ostream& operator<<(std::ostream& out, const MultiBlock<N>& block);
 

diff --git a/cryptoTools/Common/Log.cpp b/cryptoTools/Common/Log.cpp
@@ -10,6 +10,7 @@ namespace osuCrypto
 {
 
 
+
     std::mutex gIoStreamMtx;
 
     void setThreadName(const std::string name)

diff --git a/cryptoTools/Common/Log.h b/cryptoTools/Common/Log.h
@@ -8,6 +8,7 @@
 namespace osuCrypto
 {
 
+
     enum class Color {
         LightGreen = 2,
         LightGrey = 3,
@@ -41,8 +42,5 @@ namespace osuCrypto
 
     void setThreadName(const std::string name);
     void setThreadName(const char* name);
-
-}
 
-
-
+}
diff --git a/cryptoTools/Common/MatrixView.h b/cryptoTools/Common/MatrixView.h
@@ -21,7 +21,7 @@ namespace osuCrypto
 
     public:
 
-
+        typedef T value_type;
 
         MatrixView()
             :mData(nullptr),
@@ -48,11 +48,7 @@ namespace osuCrypto
 
 
         MatrixView(u64 rowSize, u64 columnSize) :
-#ifdef NDEBUG
-            mData(new T[rowSize * columnSize]),
-#else
             mData(new T[rowSize * columnSize]()),
-#endif
             mSize({ rowSize, columnSize }),
             mOwner(true)
         { }
@@ -77,13 +73,32 @@ namespace osuCrypto
             mSize({ (end - start) / numColumns, numColumns }),
             mOwner(false)
         {
+            //static_assert(std::is_same<Iter::value_type, T>::value, "Iter iter must have the same value_type as ArrayView");
+            std::ignore = p;
+
         }
 
-        //MatrixView(T* data, u64 rowSize, u64 columnSize) :
-        //    mData(data),
-        //    mSize({ rowSize, columnSize }),
+        //template<class C>
+        //MatrixView(const C& cont, u64 numColumns, typename C::value_type* p = 0) :
+        //    mData(&*((C&)cont).begin()),
+        //    mSize({ (((C&)cont).end() - ((C&)cont).begin()) / numColumns, numColumns }),
         //    mOwner(false)
-        //{}
+        //{
+        //    static_assert(std::is_same<C::value_type, T>::value, "Container cont must have the same value_type as ArrayView");
+
+        //    (void*)p;
+        //}
+
+        template<template<typename, typename...> class C, typename... Args>
+        MatrixView(const C<T, Args...>& cont, u64 numColumns, typename C<T, Args...>::value_type* p = 0) :
+            mData(&*((C<T, Args...>&)cont).begin()),
+            mSize({ (((C<T, Args...>&)cont).end() - ((C<T, Args...>&)cont).begin()) / numColumns, numColumns }),
+            mOwner(false)
+        {
+            //static_assert(std::is_same<C::value_type, T>::value, "Container cont must have the same value_type as ArrayView");
+            std::ignore = p;
+
+        }
 
 
         ~MatrixView()
@@ -129,11 +144,11 @@ namespace osuCrypto
         };
         ArrayIterator<T> end() const {
             T* e = (T*)mData + (mSize[0] * mSize[1]);
-            return ArrayIterator<T>(mData, e, e);
+            return ArrayIterator<T>(mData, e, e); 
         }
 #else
         T* begin() const { return mData; };
-        T* end() const { return mData + mSize; }
+        T* end() const { return mData + mSize[0] * mSize[1]; }
 #endif
 
         ArrayView<T> operator[](u64 rowIdx) const

diff --git a/cryptoTools/Common/Timer.cpp b/cryptoTools/Common/Timer.cpp
@@ -9,11 +9,13 @@ namespace osuCrypto
 
     const Timer::timeUnit& Timer::setTimePoint(const std::string& msg)
     {
+        //if (mLocking) mMtx.lock();
         mTimes.push_back(std::make_pair(timeUnit::clock::now(), msg));
-
+        auto& ret = mTimes.back().first;
+        //if (mLocking) mMtx.unlock();
         //std::cout << msg << "     " << std::chrono::duration_cast<std::chrono::milliseconds>(mTimes.back().first - mStart).count() << std::endl;
 
-        return mTimes.back().first;
+        return ret;
         //return mStart;
     }
 
@@ -30,7 +32,7 @@ namespace osuCrypto
             auto iter = timer.mTimes.begin();
             out << iter->second;
 
-            u64 tabs = std::min((u64)4, (u64)4 - (iter->second.size() / 8));
+            u64 tabs = std::min<u64>((u64)4, (u64)4 - (iter->second.size() / 8));
 
             for (u64 i = 0; i < tabs; ++i)
                 out << "\t";
@@ -42,7 +44,7 @@ namespace osuCrypto
             {
                 out << iter->second;
 
-                tabs = std::min((u64)4,  (u64)4 - (iter->second.size() / 8));
+                tabs = std::min<u64>((u64)4,  (u64)4 - (iter->second.size() / 8));
 
                 for (u64 i = 0; i < tabs ; ++i)
                     out << "\t";

diff --git a/cryptoTools/Common/Timer.h b/cryptoTools/Common/Timer.h
@@ -3,7 +3,7 @@
 #include <list>
 #include <chrono>
 #include <string>
-
+#include <mutex>
 namespace osuCrypto
 { 
 
@@ -14,10 +14,12 @@ namespace osuCrypto
 
         timeUnit mStart;
         std::list< std::pair<timeUnit, std::string>> mTimes;
-
+        bool mLocking;
+        //std::mutex mMtx;
     public: 
-        Timer()
+        Timer(bool locking = false)
         :mStart(Timer::timeUnit::clock::now()) 
+            , mLocking(locking)
         {}
         //Timer(const Timer&);
Original file line number	Diff line number	Diff line change
Expand Up		@@ -81,4 +81,4 @@ target_link_libraries(cryptoTools ${MIRACL_LIB})
		target_link_libraries(cryptoTools ${Boost_LIBRARIES})


		#set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
		#set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -10,6 +10,7 @@ namespace osuCrypto
		{



		std::mutex gIoStreamMtx;

		void setThreadName(const std::string name)
Expand Down