Conversation
|
Wow this was great work! I'll do a thorough review and approve. |
|
good job @TheZ3ro !! |
weslly
left a comment
There was a problem hiding this comment.
Looks good!
We probably should also add the base32 class to COPYING and create a LICENSE.APACHE-2 file
|
Uh yeah I missed that. Here we have a small problem. |
|
@TheZ3ro I'm no license expert but since KeePassXC doesn't specify a version of GPL and is dual licensed, wouldn't this situation be covered by this line of GPLv2?
|
|
GPLv2 is inherently incompatible with GPLv3. Therefore you must pick and choose the sections that apply in both. Per my reading, section 6 in v2 is the problem. If we decide that v3 is in force for that section its all good. IANL |
|
We should use GPLv3 if you ask me. |
|
I've added the APACHE-2.0 license. |
| // Copyright 2010 Google Inc. | ||
| // Author: Markus Gutschke | ||
| // Source: https://github.com/google/google-authenticator-libpam/blob/master/src/base32.c | ||
| // Modifications copyright (C) 2017 KeePassXC team <https://keepassxc.org/> |
There was a problem hiding this comment.
@TheZ3ro just a small nitpick, doesn't apache v2.0 requires a modification notice? Most of this function was modified in comparison to the original file
There was a problem hiding this comment.
Yup, fixing this.
Edit: fixed with a rebase
3df44d0 to
e902573
Compare
e902573 to
11607b1
Compare
- Added YubiKey 2FA integration for unlocking databases [#127] - Added TOTP support [#519] - Added CSV import tool [#146, #490] - Added KeePassXC CLI tool [#254] - Added diceware password generator [#373] - Added support for entry references [#370, #378] - Added support for Twofish encryption [#167] - Enabled DEP and ASLR for in-memory protection [#371] - Enabled single instance mode [#510] - Enabled portable mode [#645] - Enabled database lock on screensaver and session lock [#545] - Redesigned welcome screen with common features and recent databases [#292] - Multiple updates to search behavior [#168, #213, #374, #471, #603, #654] - Added auto-type fields {CLEARFIELD}, {SPACE}, {{}, {}} [#267, #427, #480] - Fixed auto-type errors on Linux [#550] - Prompt user prior to executing a cmd:// URL [#235] - Entry attributes can be protected (hidden) [#220] - Added extended ascii to password generator [#538] - Added new database icon to toolbar [#289] - Added context menu entry to empty recycle bin in databases [#520] - Added "apply" button to entry and group edit windows [#624] - Added macOS tray icon and enabled minimize on close [#583] - Fixed issues with unclean shutdowns [#170, #580] - Changed keyboard shortcut to create new database to CTRL+SHIFT+N [#515] - Compare window title to entry URLs [#556] - Implemented inline error messages [#162] - Ignore group expansion and other minor changes when making database "dirty" [#464] - Updated license and copyright information on souce files [#632] - Added contributors list to about dialog [#629]
Closes #628
Description
Intro on copyright for free software projects:
https://www.softwarefreedom.org/resources/2012/ManagingCopyrightInformation.html
https://opensource.com/law/14/2/copyright-statements-source-files
Note the following points:
With those note in minds, what I've done here is pretty simple:
.cppfile that has difference and has been modified after the fork:.cppfile comes with an.hfile, add the new copyright to that as well.cppfile that has a copyright notice and was added after the fork, maintain the copyright and add KeePassXC Team (we can't really remove the copyright without asking the author).uifiles don't need copyright noticeCMakeLists.txt, if the file has some code (it's >10 lines long) add the copyright notice.pngfile, add the copyright notice to the COPYING fileOther then this, I have to report some other things:
src/cli/EntropyMeter.cppthe zxcvbn copyright since it was rewritten by me and (mostly by) @louibFelix Geyercopyright but they were added after the fork by different people, I've changed the copyright toKeePassXC Teamsrc/cli/Extract.cppsrc/cli/Merge.cppsrc/core/PassphraseGenerator.cppsrc/core/PassphraseGenerator.hsrc/gui/CloneDialog.cppsrc/gui/CloneDialog.hsrc/http/HttpPasswordGeneratorWidget.cppsrc/keys/YkChallengeResponseKey.hKeePassXC Teamnoticeshare/icons/application/16x16/actions/group-empty-trash.pngis missing, like noted here.I hope I've done a fine work. Waiting for feedback on this. @keepassxreboot/core-developers
Checklist: