Switch to PKCS5_PBKDF2_HMAC and remove pbkdf2.h, pbkdf2.cpp

novacoin-project · Apr 1, 2015 · 7f21060 · 7f21060
1 parent 72462d5
commit 7f21060
Show file tree

Hide file tree

Showing 10 changed files with 97 additions and 280 deletions.
diff --git a/novacoin-qt.pro b/novacoin-qt.pro
@@ -212,7 +212,6 @@ HEADERS += src/qt/bitcoingui.h \
     src/uint256.h \
     src/kernel.h \
     src/scrypt.h \
-    src/pbkdf2.h \
     src/serialize.h \
     src/strlcpy.h \
     src/main.h \
@@ -343,7 +342,6 @@ SOURCES += src/qt/bitcoin.cpp src/qt/bitcoingui.cpp \
     src/noui.cpp \
     src/kernel.cpp \
     src/scrypt.cpp \
-    src/pbkdf2.cpp \
     src/qt/multisigaddressentry.cpp \
     src/qt/multisiginputentry.cpp \
     src/qt/multisigdialog.cpp

diff --git a/src/makefile.bsd b/src/makefile.bsd
@@ -128,7 +128,6 @@ OBJS= \
     obj/walletdb.o \
     obj/noui.o \
     obj/kernel.o \
-    obj/pbkdf2.o \
     obj/scrypt.o
 
 all: novacoind

diff --git a/src/makefile.linux-mingw b/src/makefile.linux-mingw
@@ -104,7 +104,6 @@ OBJS= \
     obj/walletdb.o \
     obj/noui.o \
     obj/kernel.o \
-    obj/pbkdf2.o \
     obj/scrypt.o
 
 all: novacoind.exe

diff --git a/src/makefile.mingw b/src/makefile.mingw
@@ -93,7 +93,6 @@ OBJS= \
     obj/walletdb.o \
     obj/noui.o \
     obj/kernel.o \
-    obj/pbkdf2.o \
     obj/scrypt.o
 
 all: novacoind.exe

diff --git a/src/makefile.osx b/src/makefile.osx
@@ -93,7 +93,6 @@ OBJS= \
     obj/wallet.o \
     obj/walletdb.o \
     obj/noui.o \
-    obj/pbkdf2.o \
     obj/kernel.o \
     obj/scrypt.o
 

diff --git a/src/makefile.unix b/src/makefile.unix
@@ -135,7 +135,6 @@ OBJS= \
     obj/walletdb.o \
     obj/noui.o \
     obj/kernel.o \
-    obj/pbkdf2.o \
     obj/scrypt.o
 
 all: novacoind

diff --git a/src/pbkdf2.cpp b/src/pbkdf2.cpp
diff --git a/src/pbkdf2.h b/src/pbkdf2.h