From 135d17bed5c2b546ecae449367b9c6f4eb3af354 Mon Sep 17 00:00:00 2001 From: Jonathan Schleifer Date: Sun, 16 Jun 2019 19:26:34 +0200 Subject: [PATCH] Rename project to CryptoPassphrase --- .gitignore | 6 +-- ScryptPWGen.h => CryptoPassphrase.h | 4 +- ScryptPWGen.m => CryptoPassphrase.m | 11 ++--- LegacyPasswordGenerator.h | 2 +- LegacyPasswordGenerator.m | 2 +- Makefile | 4 +- NewPasswordGenerator.h | 2 +- NewPasswordGenerator.m | 2 +- PasswordGenerator.h | 2 +- iOS/AboutController.swift | 13 +++--- iOS/AddSiteController.swift | 2 +- iOS/AppDelegate.swift | 2 +- .../AppIcon.appiconset/Contents.json | 14 +++--- ...0x120.png => CryptoPassphrase 120x120.png} | Bin ...2x152.png => CryptoPassphrase 152x152.png} | Bin ...7x167.png => CryptoPassphrase 167x167.png} | Bin ...0x180.png => CryptoPassphrase 180x180.png} | Bin ...n 76x76.png => CryptoPassphrase 76x76.png} | Bin ...{scrypt-pwgen.png => CryptoPassphrase.png} | Bin iOS/Base.lproj/LaunchScreen.storyboard | 8 ++-- iOS/Base.lproj/Main.storyboard | 10 ++--- .../project.pbxproj | 34 +++++++-------- iOS/HTTPServerDelegate.swift | 2 +- iOS/Info.plist | 2 + iOS/MainViewController.swift | 2 +- iOS/SelectKeyFileController.swift | 2 +- iOS/ShowDetailsController.swift | 2 +- iOS/SiteStorage.swift | 40 +++++++++--------- iOS/bridge.h | 2 +- iOS/main.m | 12 +----- 30 files changed, 90 insertions(+), 92 deletions(-) rename ScryptPWGen.h => CryptoPassphrase.h (91%) rename ScryptPWGen.m => CryptoPassphrase.m (96%) rename iOS/Assets.xcassets/AppIcon.appiconset/{scrypt-pwgen 120x120.png => CryptoPassphrase 120x120.png} (100%) rename iOS/Assets.xcassets/AppIcon.appiconset/{scrypt-pwgen 152x152.png => CryptoPassphrase 152x152.png} (100%) rename iOS/Assets.xcassets/AppIcon.appiconset/{scrypt-pwgen 167x167.png => CryptoPassphrase 167x167.png} (100%) rename iOS/Assets.xcassets/AppIcon.appiconset/{scrypt-pwgen 180x180.png => CryptoPassphrase 180x180.png} (100%) rename iOS/Assets.xcassets/AppIcon.appiconset/{scrypt-pwgen 76x76.png => CryptoPassphrase 76x76.png} (100%) rename iOS/Assets.xcassets/AppIcon.appiconset/{scrypt-pwgen.png => CryptoPassphrase.png} (100%) rename iOS/{scrypt-pwgen.xcodeproj => CryptoPassphrase.xcodeproj}/project.pbxproj (95%) diff --git a/.gitignore b/.gitignore index f9811ff..23cd665 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,7 @@ *.o *~ -scrypt-pwgen +cryptopassphrase +iOS/CryptoPassphrase.xcodeproj/project.xcworkspace +iOS/CryptoPassphrase.xcodeproj/xcuserdata iOS/DerivedData iOS/ObjFW -iOS/scrypt-pwgen.xcodeproj/project.xcworkspace -iOS/scrypt-pwgen.xcodeproj/xcuserdata diff --git a/ScryptPWGen.h b/CryptoPassphrase.h similarity index 91% rename from ScryptPWGen.h rename to CryptoPassphrase.h index 678dc4b..795c190 100644 --- a/ScryptPWGen.h +++ b/CryptoPassphrase.h @@ -1,7 +1,7 @@ /* * Copyright (c) 2016 - 2019 Jonathan Schleifer * - * https://heap.zone/git/scrypt-pwgen.git + * https://heap.zone/git/cryptopassphrase.git * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -22,7 +22,7 @@ #import -@interface ScryptPWGen: OFObject +@interface CryptoPassphrase: OFObject { size_t _length; bool _legacy, _repeat; diff --git a/ScryptPWGen.m b/CryptoPassphrase.m similarity index 96% rename from ScryptPWGen.m rename to CryptoPassphrase.m index 81620ff..ef26bb2 100644 --- a/ScryptPWGen.m +++ b/CryptoPassphrase.m @@ -1,7 +1,7 @@ /* * Copyright (c) 2016 - 2019 Jonathan Schleifer * - * https://heap.zone/git/scrypt-pwgen.git + * https://heap.zone/git/cryptopassphrase.git * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -22,11 +22,11 @@ #include -#import "ScryptPWGen.h" +#import "CryptoPassphrase.h" #import "NewPasswordGenerator.h" #import "LegacyPasswordGenerator.h" -OF_APPLICATION_DELEGATE(ScryptPWGen) +OF_APPLICATION_DELEGATE(CryptoPassphrase) static void showHelp(OFStream *output, bool verbose) @@ -46,7 +46,7 @@ showHelp(OFStream *output, bool verbose) @" -r --repeat Repeat input\n"]; } -@implementation ScryptPWGen +@implementation CryptoPassphrase - (void)applicationDidFinishLaunching { OFString *keyFilePath, *lengthString; @@ -190,7 +190,8 @@ showHelp(OFStream *output, bool verbose) of_explicit_memset(passphrase, 0, strlen(passphrase)); if (keyFile != nil) - of_explicit_memset(keyFile.items, 0, keyFile.count); + of_explicit_memset(keyFile.mutableItems, 0, + keyFile.count); } [OFApplication terminate]; diff --git a/LegacyPasswordGenerator.h b/LegacyPasswordGenerator.h index f2ecccc..4679832 100644 --- a/LegacyPasswordGenerator.h +++ b/LegacyPasswordGenerator.h @@ -1,7 +1,7 @@ /* * Copyright (c) 2016 - 2019 Jonathan Schleifer * - * https://heap.zone/git/scrypt-pwgen.git + * https://heap.zone/git/cryptopassphrase.git * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/LegacyPasswordGenerator.m b/LegacyPasswordGenerator.m index 1c7b820..b819162 100644 --- a/LegacyPasswordGenerator.m +++ b/LegacyPasswordGenerator.m @@ -1,7 +1,7 @@ /* * Copyright (c) 2016 - 2019 Jonathan Schleifer * - * https://heap.zone/git/scrypt-pwgen.git + * https://heap.zone/git/cryptopassphrase.git * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/Makefile b/Makefile index ddecf90..ccaa1b4 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ all: - @objfw-compile -Werror -o scrypt-pwgen *.m + @objfw-compile -Werror -o cryptopassphrase *.m clean: - rm -f *.o *~ scrypt-pwgen + rm -f *.o *~ cryptopassphrase diff --git a/NewPasswordGenerator.h b/NewPasswordGenerator.h index 6c9fe98..a028f3e 100644 --- a/NewPasswordGenerator.h +++ b/NewPasswordGenerator.h @@ -1,7 +1,7 @@ /* * Copyright (c) 2016 - 2019 Jonathan Schleifer * - * https://heap.zone/git/scrypt-pwgen.git + * https://heap.zone/git/cryptopassphrase.git * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/NewPasswordGenerator.m b/NewPasswordGenerator.m index fc2eb94..9d776ed 100644 --- a/NewPasswordGenerator.m +++ b/NewPasswordGenerator.m @@ -1,7 +1,7 @@ /* * Copyright (c) 2016 - 2019 Jonathan Schleifer * - * https://heap.zone/git/scrypt-pwgen.git + * https://heap.zone/git/cryptopassphrase.git * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/PasswordGenerator.h b/PasswordGenerator.h index c9605cf..f680592 100644 --- a/PasswordGenerator.h +++ b/PasswordGenerator.h @@ -1,7 +1,7 @@ /* * Copyright (c) 2016 - 2019 Jonathan Schleifer * - * https://heap.zone/git/scrypt-pwgen.git + * https://heap.zone/git/cryptopassphrase.git * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/iOS/AboutController.swift b/iOS/AboutController.swift index b6b7c30..0da91b1 100644 --- a/iOS/AboutController.swift +++ b/iOS/AboutController.swift @@ -1,7 +1,7 @@ /* * Copyright (c) 2016 - 2019 Jonathan Schleifer * - * https://heap.zone/git/scrypt-pwgen.git + * https://heap.zone/git/cryptopassphrase.git * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -40,26 +40,29 @@ class AboutController: UIViewController, UIWebViewDelegate { "}" + "" + "#title {" + - " font-size: 2.5em;" + + " font-size: 2.1em;" + " font-weight: bold;" + + " text-align: center;" + "}" + "" + "#copyright {" + " font-size: 0.9em;" + " font-weight: bold;" + + " text-align: center;" + "}" + "" + "" + "" + "
" + - " scrypt-pwgen \(version ?? "")" + + " CryptoPassphrase \(version ?? "")" + "
" + "" + "

" + - " scrypt-pwgen is free software and the source code is available" + - " at here." + + " CryptoPassphrase is free software and the source code is" + + " available at" + + " here." + "

" + "

" + " It makes use of the" + diff --git a/iOS/AddSiteController.swift b/iOS/AddSiteController.swift index 73b369e..a765c72 100644 --- a/iOS/AddSiteController.swift +++ b/iOS/AddSiteController.swift @@ -1,7 +1,7 @@ /* * Copyright (c) 2016 - 2019 Jonathan Schleifer * - * https://heap.zone/git/scrypt-pwgen.git + * https://heap.zone/git/cryptopassphrase.git * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/iOS/AppDelegate.swift b/iOS/AppDelegate.swift index 2706ffb..521b9a9 100644 --- a/iOS/AppDelegate.swift +++ b/iOS/AppDelegate.swift @@ -1,7 +1,7 @@ /* * Copyright (c) 2016 - 2019 Jonathan Schleifer * - * https://heap.zone/git/scrypt-pwgen.git + * https://heap.zone/git/cryptopassphrase.git * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/iOS/Assets.xcassets/AppIcon.appiconset/Contents.json b/iOS/Assets.xcassets/AppIcon.appiconset/Contents.json index db35236..a099d89 100644 --- a/iOS/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/iOS/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -33,13 +33,13 @@ { "size" : "60x60", "idiom" : "iphone", - "filename" : "scrypt-pwgen 120x120.png", + "filename" : "CryptoPassphrase 120x120.png", "scale" : "2x" }, { "size" : "60x60", "idiom" : "iphone", - "filename" : "scrypt-pwgen 180x180.png", + "filename" : "CryptoPassphrase 180x180.png", "scale" : "3x" }, { @@ -75,25 +75,25 @@ { "size" : "76x76", "idiom" : "ipad", - "filename" : "scrypt-pwgen 76x76.png", + "filename" : "CryptoPassphrase 76x76.png", "scale" : "1x" }, { "size" : "76x76", "idiom" : "ipad", - "filename" : "scrypt-pwgen 152x152.png", + "filename" : "CryptoPassphrase 152x152.png", "scale" : "2x" }, { "size" : "83.5x83.5", "idiom" : "ipad", - "filename" : "scrypt-pwgen 167x167.png", + "filename" : "CryptoPassphrase 167x167.png", "scale" : "2x" }, { "size" : "1024x1024", "idiom" : "ios-marketing", - "filename" : "scrypt-pwgen.png", + "filename" : "CryptoPassphrase.png", "scale" : "1x" } ], @@ -101,4 +101,4 @@ "version" : 1, "author" : "xcode" } -} \ No newline at end of file +} diff --git a/iOS/Assets.xcassets/AppIcon.appiconset/scrypt-pwgen 120x120.png b/iOS/Assets.xcassets/AppIcon.appiconset/CryptoPassphrase 120x120.png similarity index 100% rename from iOS/Assets.xcassets/AppIcon.appiconset/scrypt-pwgen 120x120.png rename to iOS/Assets.xcassets/AppIcon.appiconset/CryptoPassphrase 120x120.png diff --git a/iOS/Assets.xcassets/AppIcon.appiconset/scrypt-pwgen 152x152.png b/iOS/Assets.xcassets/AppIcon.appiconset/CryptoPassphrase 152x152.png similarity index 100% rename from iOS/Assets.xcassets/AppIcon.appiconset/scrypt-pwgen 152x152.png rename to iOS/Assets.xcassets/AppIcon.appiconset/CryptoPassphrase 152x152.png diff --git a/iOS/Assets.xcassets/AppIcon.appiconset/scrypt-pwgen 167x167.png b/iOS/Assets.xcassets/AppIcon.appiconset/CryptoPassphrase 167x167.png similarity index 100% rename from iOS/Assets.xcassets/AppIcon.appiconset/scrypt-pwgen 167x167.png rename to iOS/Assets.xcassets/AppIcon.appiconset/CryptoPassphrase 167x167.png diff --git a/iOS/Assets.xcassets/AppIcon.appiconset/scrypt-pwgen 180x180.png b/iOS/Assets.xcassets/AppIcon.appiconset/CryptoPassphrase 180x180.png similarity index 100% rename from iOS/Assets.xcassets/AppIcon.appiconset/scrypt-pwgen 180x180.png rename to iOS/Assets.xcassets/AppIcon.appiconset/CryptoPassphrase 180x180.png diff --git a/iOS/Assets.xcassets/AppIcon.appiconset/scrypt-pwgen 76x76.png b/iOS/Assets.xcassets/AppIcon.appiconset/CryptoPassphrase 76x76.png similarity index 100% rename from iOS/Assets.xcassets/AppIcon.appiconset/scrypt-pwgen 76x76.png rename to iOS/Assets.xcassets/AppIcon.appiconset/CryptoPassphrase 76x76.png diff --git a/iOS/Assets.xcassets/AppIcon.appiconset/scrypt-pwgen.png b/iOS/Assets.xcassets/AppIcon.appiconset/CryptoPassphrase.png similarity index 100% rename from iOS/Assets.xcassets/AppIcon.appiconset/scrypt-pwgen.png rename to iOS/Assets.xcassets/AppIcon.appiconset/CryptoPassphrase.png diff --git a/iOS/Base.lproj/LaunchScreen.storyboard b/iOS/Base.lproj/LaunchScreen.storyboard index 308808e..941035a 100644 --- a/iOS/Base.lproj/LaunchScreen.storyboard +++ b/iOS/Base.lproj/LaunchScreen.storyboard @@ -1,11 +1,11 @@ - + - + @@ -21,9 +21,9 @@ -