diff --git a/ChangeLog.md b/ChangeLog.md --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,3 +1,6 @@ # Changelog for passman ## Unreleased changes + +- corrected a bug that was causing the pwGenerate function to hang occasionally. + - this may cause some passwords to be generated differently diff --git a/README.md b/README.md --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # passman -Copyright (C) 2018 Jonathan Lamothe +Copyright (C) 2018, 2019 Jonathan Lamothe This program is free software: you can redistribute it and/or modify @@ -38,7 +38,7 @@ refer to [their website](https://docs.haskellstack.org/en/stable/README/#how-to-install) for instructions on installing Haskell Stack. Once you have done -this, you can simply enterg the command `stack install passman` in the +this, you can simply enter the command `stack install passman` in the terminal to install passman. ## GitHub diff --git a/app/Main.hs b/app/Main.hs --- a/app/Main.hs +++ b/app/Main.hs @@ -1,7 +1,7 @@ {- passman -Copyright (C) 2018 Jonathan Lamothe +Copyright (C) 2018, 2019 Jonathan Lamothe This program is free software: you can redistribute it and/or modify diff --git a/app/Types.hs b/app/Types.hs --- a/app/Types.hs +++ b/app/Types.hs @@ -1,7 +1,7 @@ {- passman -Copyright (C) 2018 Jonathan Lamothe +Copyright (C) 2018, 2019 Jonathan Lamothe This program is free software: you can redistribute it and/or modify diff --git a/app/UI.hs b/app/UI.hs --- a/app/UI.hs +++ b/app/UI.hs @@ -1,7 +1,7 @@ {- passman -Copyright (C) 2018 Jonathan Lamothe +Copyright (C) 2018, 2019 Jonathan Lamothe This program is free software: you can redistribute it and/or modify diff --git a/app/Util.hs b/app/Util.hs --- a/app/Util.hs +++ b/app/Util.hs @@ -1,7 +1,7 @@ {- passman -Copyright (C) 2018 Jonathan Lamothe +Copyright (C) 2018, 2019 Jonathan Lamothe This program is free software: you can redistribute it and/or modify diff --git a/passman.cabal b/passman.cabal --- a/passman.cabal +++ b/passman.cabal @@ -4,10 +4,10 @@ -- -- see: https://github.com/sol/hpack -- --- hash: a473235a2ea1c6b4f7ae03fe7d61721790a46db852b52e49ea852a4b47abdd03 +-- hash: 4a0cc4498747fbf939026e1fe1ad6b24fb5999132e9af2eb12c848da6ccf7cdf name: passman -version: 0.1 +version: 0.1.1 synopsis: a simple password manager description: Please see the README on GitHub at category: Security @@ -15,7 +15,7 @@ bug-reports: https://github.com/jlamothe/passman/issues author: Jonathan Lamothe maintainer: jlamothe1980@gmail.com -copyright: (C) 2018 Jonathan Lamothe +copyright: (C) 2018, 2019 Jonathan Lamothe license: LGPL-3 license-file: LICENSE build-type: Simple diff --git a/src/Password.hs b/src/Password.hs --- a/src/Password.hs +++ b/src/Password.hs @@ -2,7 +2,7 @@ Module: Password Description: a simple password manager -Copyright: (C) 2018 Jonathan Lamothe +Copyright: (C) 2018, 2019 Jonathan Lamothe License: LGPLv3 (or later) Maintainer: jlamothe1980@gmail.com @@ -332,7 +332,7 @@ mkPool :: B.ByteString -> String mkPool = toB64 . raw where raw x = let x' = mkHash x in - x' `B.append` raw x + x' `B.append` raw x' mkSeed :: String -> PWData -> B.ByteString mkSeed pw d = toUTF8 pw `B.append` (d^.pwSalt) diff --git a/test/Spec.hs b/test/Spec.hs --- a/test/Spec.hs +++ b/test/Spec.hs @@ -1,7 +1,7 @@ {- passman -Copyright (C) 2018 Jonathan Lamothe +Copyright (C) 2018, 2019 Jonathan Lamothe This program is free software: you can redistribute it and/or modify diff --git a/test/Spec/JSON.hs b/test/Spec/JSON.hs --- a/test/Spec/JSON.hs +++ b/test/Spec/JSON.hs @@ -1,7 +1,7 @@ {- passman -Copyright (C) 2018 Jonathan Lamothe +Copyright (C) 2018, 2019 Jonathan Lamothe This program is free software: you can redistribute it and/or modify diff --git a/test/Spec/NewPWData.hs b/test/Spec/NewPWData.hs --- a/test/Spec/NewPWData.hs +++ b/test/Spec/NewPWData.hs @@ -1,7 +1,7 @@ {- passman -Copyright (C) 2018 Jonathan Lamothe +Copyright (C) 2018, 2019 Jonathan Lamothe This program is free software: you can redistribute it and/or modify diff --git a/test/Spec/NewPWDatabase.hs b/test/Spec/NewPWDatabase.hs --- a/test/Spec/NewPWDatabase.hs +++ b/test/Spec/NewPWDatabase.hs @@ -1,7 +1,7 @@ {- passman -Copyright (C) 2018 Jonathan Lamothe +Copyright (C) 2018, 2019 Jonathan Lamothe This program is free software: you can redistribute it and/or modify diff --git a/test/Spec/NewPWPolicy.hs b/test/Spec/NewPWPolicy.hs --- a/test/Spec/NewPWPolicy.hs +++ b/test/Spec/NewPWPolicy.hs @@ -1,7 +1,7 @@ {- passman -Copyright (C) 2018 Jonathan Lamothe +Copyright (C) 2018, 2019 Jonathan Lamothe This program is free software: you can redistribute it and/or modify diff --git a/test/Spec/NewPWSalt.hs b/test/Spec/NewPWSalt.hs --- a/test/Spec/NewPWSalt.hs +++ b/test/Spec/NewPWSalt.hs @@ -1,7 +1,7 @@ {- passman -Copyright (C) 2018 Jonathan Lamothe +Copyright (C) 2018, 2019 Jonathan Lamothe This program is free software: you can redistribute it and/or modify diff --git a/test/Spec/PWGenerate.hs b/test/Spec/PWGenerate.hs --- a/test/Spec/PWGenerate.hs +++ b/test/Spec/PWGenerate.hs @@ -1,7 +1,7 @@ {- passman -Copyright (C) 2018 Jonathan Lamothe +Copyright (C) 2018, 2019 Jonathan Lamothe This program is free software: you can redistribute it and/or modify diff --git a/test/Spec/PWGetService.hs b/test/Spec/PWGetService.hs --- a/test/Spec/PWGetService.hs +++ b/test/Spec/PWGetService.hs @@ -1,7 +1,7 @@ {- passman -Copyright (C) 2018 Jonathan Lamothe +Copyright (C) 2018, 2019 Jonathan Lamothe This program is free software: you can redistribute it and/or modify diff --git a/test/Spec/PWHasService.hs b/test/Spec/PWHasService.hs --- a/test/Spec/PWHasService.hs +++ b/test/Spec/PWHasService.hs @@ -1,7 +1,7 @@ {- passman -Copyright (C) 2018 Jonathan Lamothe +Copyright (C) 2018, 2019 Jonathan Lamothe This program is free software: you can redistribute it and/or modify diff --git a/test/Spec/PWRemoveService.hs b/test/Spec/PWRemoveService.hs --- a/test/Spec/PWRemoveService.hs +++ b/test/Spec/PWRemoveService.hs @@ -1,7 +1,7 @@ {- passman -Copyright (C) 2018 Jonathan Lamothe +Copyright (C) 2018, 2019 Jonathan Lamothe This program is free software: you can redistribute it and/or modify diff --git a/test/Spec/PWSearch.hs b/test/Spec/PWSearch.hs --- a/test/Spec/PWSearch.hs +++ b/test/Spec/PWSearch.hs @@ -1,7 +1,7 @@ {- passman -Copyright (C) 2018 Jonathan Lamothe +Copyright (C) 2018, 2019 Jonathan Lamothe This program is free software: you can redistribute it and/or modify diff --git a/test/Spec/PWSetService.hs b/test/Spec/PWSetService.hs --- a/test/Spec/PWSetService.hs +++ b/test/Spec/PWSetService.hs @@ -1,7 +1,7 @@ {- passman -Copyright (C) 2018 Jonathan Lamothe +Copyright (C) 2018, 2019 Jonathan Lamothe This program is free software: you can redistribute it and/or modify diff --git a/test/Spec/ValidatePWData.hs b/test/Spec/ValidatePWData.hs --- a/test/Spec/ValidatePWData.hs +++ b/test/Spec/ValidatePWData.hs @@ -1,7 +1,7 @@ {- passman -Copyright (C) 2018 Jonathan Lamothe +Copyright (C) 2018, 2019 Jonathan Lamothe This program is free software: you can redistribute it and/or modify diff --git a/test/Spec/ValidatePWDatabase.hs b/test/Spec/ValidatePWDatabase.hs --- a/test/Spec/ValidatePWDatabase.hs +++ b/test/Spec/ValidatePWDatabase.hs @@ -1,7 +1,7 @@ {- passman -Copyright (C) 2018 Jonathan Lamothe +Copyright (C) 2018, 2019 Jonathan Lamothe This program is free software: you can redistribute it and/or modify diff --git a/test/Spec/ValidatePWPolicy.hs b/test/Spec/ValidatePWPolicy.hs --- a/test/Spec/ValidatePWPolicy.hs +++ b/test/Spec/ValidatePWPolicy.hs @@ -1,7 +1,7 @@ {- passman -Copyright (C) 2018 Jonathan Lamothe +Copyright (C) 2018, 2019 Jonathan Lamothe This program is free software: you can redistribute it and/or modify