Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add new Base32 implementation #1069

Merged
merged 8 commits into from
Oct 21, 2017
+760 −353
Merged

Add new Base32 implementation #1069

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
14094e7
Add new Base32 implementation
adolfogc Oct 15, 2017
ba911a4
Fix code style
adolfogc Oct 19, 2017
3473d2d
Fix for loop's variable increment style
adolfogc Oct 20, 2017
3bca598
Revert formatting change
adolfogc Oct 20, 2017
e28f091
Replace Optional with QVariant
adolfogc Oct 20, 2017
cd2f2f0
Fix bug in Base32::decode and add bounds check
adolfogc Oct 21, 2017
2c6a214
Improve testing of Base32
adolfogc Oct 21, 2017
71989b0
Improve readability of code
adolfogc Oct 21, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions COPYING
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.*
Expand All @@ -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
201 changes: 0 additions & 201 deletions LICENSE.APACHE-2.0
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,8 @@ set(keepassx_SOURCES
core/Tools.cpp
core/Translator.cpp
core/Uuid.cpp
core/Base32.h
core/Base32.cpp
cli/PasswordInput.cpp
cli/PasswordInput.h
crypto/Crypto.cpp
Expand Down Expand Up @@ -138,8 +140,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
)
Expand Down
Loading