Add new Base32 implementation

AlexGTII · Oct 21, 2017 · 19eb6a8 · 19eb6a8
1 parent 85f6522
commit 19eb6a8
Show file tree

Hide file tree

Showing 15 changed files with 788 additions and 358 deletions.
diff --git a/COPYING b/COPYING
@@ -214,10 +214,6 @@ Files: share/icons/database/C65_W.png
 Copyright: none
 License: public-domain
 
-Files: src/crypto/salsa20/*
-Copyright: none
-License: public-domain
-
 Files: src/streams/qtiocompressor.*
        src/streams/QtIOCompressor
        tests/modeltest.*
@@ -241,8 +237,3 @@ Files: src/gui/KMessageWidget.h
 Copyright: 2011 Aurélien Gâteau <[email protected]>
            2014 Dominik Haumann <[email protected]>
 License: LGPL-2.1
-
-Files: src/totp/base32.cpp
-       src/totp/base32.h
-Copyright: 2010 Google Inc.
-License: Apache 2.0
diff --git a/LICENSE.APACHE-2.0 b/LICENSE.APACHE-2.0
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -59,6 +59,9 @@ set(keepassx_SOURCES
     core/Tools.cpp
     core/Translator.cpp
     core/Uuid.cpp
+    core/Base32.h
+    core/Base32.cpp
+    core/Optional.h
     cli/PasswordInput.cpp
     cli/PasswordInput.h
     crypto/Crypto.cpp
@@ -138,8 +141,6 @@ set(keepassx_SOURCES
     streams/qtiocompressor.cpp
     streams/StoreDataStream.cpp
     streams/SymmetricCipherStream.cpp
-    totp/base32.h
-    totp/base32.cpp
     totp/totp.h
     totp/totp.cpp
 )