mawinkle 6 년 전
부모
커밋
3b730ca0eb
8개의 변경된 파일28개의 추가작업 그리고 11개의 파일을 삭제
  1. 1 2
      crypt/intrin.hpp
  2. 0 0
      crypt/uint128_t.cpp
  3. 0 0
      crypt/uint128_t.h
  4. 0 0
      crypt/uint128_t.o
  5. 5 0
      socketio.hpp
  6. 11 4
      socketio_posix.cpp
  7. 6 0
      socketio_win32.cpp
  8. 5 5
      test.cpp

+ 1 - 2
crypt/intrin.hpp

@@ -17,7 +17,7 @@
 #endif
 #endif
 #endif
-#ifdef __clang__
+#if defined(__clang__) && !defined(_DEF_INT128)
 #define _DEF_INT128
 #endif
 #ifndef _DEF_INT128
@@ -46,7 +46,6 @@ inline unsigned long long mulx_u64(unsigned long long a, unsigned long long b, u
 }
 #endif
 #ifdef _MSC_VER
-#error Hallo
 #include <intrin.h>
 inline int _leading_zeros(unsigned long long x){
 	int index = 0;

+ 0 - 0
crypt/uint128_t.cpp


+ 0 - 0
crypt/uint128_t.h


+ 0 - 0
crypt/uint128_t.o


+ 5 - 0
socketio.hpp

@@ -42,6 +42,7 @@ public:
 	void write(const std::string& message);
 	void write(const std::vector<char>& message);
 	std::vector<char> receive();
+	cppsocket& operator=(const cppsocket& o) = delete;
 	cppsocket& operator=(cppsocket&& o);
 };
 
@@ -58,9 +59,13 @@ private:
 	socklen_t addrlen;
 #endif
 public:
+	server_socket(const server_socket& o) = delete;
+	server_socket(server_socket&& o);
 	int port();
 	server_socket(int _port);
 	cppsocket accept_connection();
 	void close();
+	server_socket& operator=(const server_socket& o) = delete;
+	server_socket& operator=(server_socket&& o);
 };
 #endif

+ 11 - 4
socketio_posix.cpp

@@ -18,14 +18,14 @@ struct socket_exception : public std::exception{
     	return msg.length() == 0 ? "Connection creation failure" : msg.c_str();
     }
 };
-cppsocket::cppsocket(sockaddr_in _serv_addr,int _sock) : sock(_sock), serv_addr(_serv_addr){
+cppsocket::cppsocket(sockaddr_in _serv_addr,int _sock) :  serv_addr(_serv_addr),sock(_sock){
 	buffer = std::vector<char>(buffersize + 1,0);
 }
-cppsocket::cppsocket(){buffer = std::vector<char>(buffersize + 1, 0);};
+cppsocket::cppsocket(){buffer = std::vector<char>(buffersize + 1, 0);}
 cppsocket::cppsocket(const std::string& addr, unsigned int PORT){
-	struct sockaddr_in address;
+	//struct sockaddr_in address;
 	sock = 0;
-	int valread;
+	//int valread;
 	buffer = std::vector<char>(buffersize + 1, 0);
 	if ((sock = socket(AF_INET, SOCK_STREAM, 0)) < 0) {
 		throw socket_exception("Socket creation error");
@@ -112,6 +112,13 @@ server_socket::server_socket(int _port) : port_(_port){
 void server_socket::close(){
 	shutdown(server_fd, SHUT_RDWR);
 }
+server_socket::server_socket(server_socket&& o){
+	port_ = o.port_;
+	server_fd = o.server_fd;
+	o.server_fd = 0;
+	address = o.address;
+	addrlen = o.addrlen;
+}
 cppsocket server_socket::accept_connection(){
 	int new_socket;
 	sockaddr client_addr;

+ 6 - 0
socketio_win32.cpp

@@ -182,6 +182,12 @@ server_socket::server_socket(int port) {
 		WSACleanup();
 	}
 }
+server_socket::server_socket(server_socket&& o){
+	wsaData = o.wsaData;
+	iResult = o.iResult;
+	ListenSocket = o.ListenSocket;
+	o.ListenSocket = INVALID_SOCKET;
+}
 cppsocket server_socket::accept_connection() {
 	SOCKET ClientSocket = accept(ListenSocket, NULL, NULL);
 	if (ClientSocket == INVALID_SOCKET) {

+ 5 - 5
test.cpp

@@ -50,11 +50,11 @@ unsigned long long multTest(size_t s){
 	return std::accumulate(times.begin(), times.end(), 0ULL);
 }
 int main(){
-	BigInt a(gen, 2);
-	BigInt b(gen, 2);
-	std::cout << a.toString() << "  " << b.toString() << std::endl;
-	a = a.mult(b);
-	std::cout << a.toString() << std::endl;
+	BigInt a("4528437659827");
+	BigInt b(gen, 31);
+	BigInt res = a.modPow(b, secure_prime);
+	std::cout << res.toString() << std::endl;
+	return 0;
 	multTest(50);
 	multTest(100);
 	multTest(200);