CryptoPassphrase  Check-in [a3b521da82]

Overview
Comment:Adjust to recent ObjFW changes
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: a3b521da82c919bf4ebbd7cd2c1c3d18cd04fbb86ff95a07b56a54cbde972505
User & Date: js on 2017-05-08 00:39:06
Other Links: manifest | tags
Context
2017-08-11
20:17
Adjust to ObjFW changes check-in: 484db716a1 user: js tags: trunk
2017-05-08
00:39
Adjust to recent ObjFW changes check-in: a3b521da82 user: js tags: trunk
2017-04-15
19:23
Fix URL in copyright header check-in: 4514c363cd user: js tags: trunk
Changes

Modified PasswordGenerator.h from [8e2387dd06] to [a21fea91c9].

20
21
22
23
24
25
26
27
28
29
30
31
32
33
 * POSSIBILITY OF SUCH DAMAGE.
 */

#import <ObjFW/ObjFW.h>

@protocol PasswordGenerator
@property size_t length;
@property (copy) OFString *site;
@property const char *passphrase;
@property (readonly) unsigned char *output;

+ (instancetype)generator;
- (void)derivePassword;
@end







|






20
21
22
23
24
25
26
27
28
29
30
31
32
33
 * POSSIBILITY OF SUCH DAMAGE.
 */

#import <ObjFW/ObjFW.h>

@protocol PasswordGenerator
@property size_t length;
@property (nonatomic, copy) OFString *site;
@property const char *passphrase;
@property (readonly) unsigned char *output;

+ (instancetype)generator;
- (void)derivePassword;
@end

Modified iOS/AboutController.h from [a855cd3b87] to [28639844bc].

19
20
21
22
23
24
25
26
27
 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 * POSSIBILITY OF SUCH DAMAGE.
 */

@import UIKit;

@interface AboutController: UIViewController <UIWebViewDelegate>
@property (retain, nonatomic) IBOutlet UIWebView *webView;
@end







|

19
20
21
22
23
24
25
26
27
 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 * POSSIBILITY OF SUCH DAMAGE.
 */

@import UIKit;

@interface AboutController: UIViewController <UIWebViewDelegate>
@property (nonatomic, retain) IBOutlet UIWebView *webView;
@end

Modified iOS/AboutController.m from [ffeb2faff2] to [253edc0533].

whitespace changes only

Modified iOS/AddSiteController.h from [831f218447] to [2b7d1da06f].

21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
 */

@import UIKit;

#import "MainViewController.h"

@interface AddSiteController: UITableViewController
@property (retain, nonatomic) IBOutlet UITextField *nameField;
@property (retain, nonatomic) IBOutlet UITextField *lengthField;
@property (retain, nonatomic) IBOutlet UISwitch *legacySwitch;
@property (retain) MainViewController *mainViewController;

- (IBAction)done: (id)sender;
- (IBAction)cancel: (id)sender;
@end







|
|
|





21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
 */

@import UIKit;

#import "MainViewController.h"

@interface AddSiteController: UITableViewController
@property (nonatomic, retain) IBOutlet UITextField *nameField;
@property (nonatomic, retain) IBOutlet UITextField *lengthField;
@property (nonatomic, retain) IBOutlet UISwitch *legacySwitch;
@property (retain) MainViewController *mainViewController;

- (IBAction)done: (id)sender;
- (IBAction)cancel: (id)sender;
@end

Modified iOS/AppDelegate.h from [5d56a2961e] to [0d722456ba].

19
20
21
22
23
24
25
26
27
 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 * POSSIBILITY OF SUCH DAMAGE.
 */

@import UIKit;

@interface AppDelegate: UIResponder <UIApplicationDelegate>
@property (strong, nonatomic) UIWindow *window;
@end







|

19
20
21
22
23
24
25
26
27
 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 * POSSIBILITY OF SUCH DAMAGE.
 */

@import UIKit;

@interface AppDelegate: UIResponder <UIApplicationDelegate>
@property (nonatomic, strong) UIWindow *window;
@end

Modified iOS/MainViewController.h from [51c284ba33] to [ff0377e51e].

23
24
25
26
27
28
29
30
31
@import UIKit;

#import "SiteStorage.h"

@interface MainViewController: UIViewController <UITableViewDelegate,
    UITableViewDataSource>
@property (retain) SiteStorage *siteStorage;
@property (retain, nonatomic) IBOutlet UITableView *tableView;
@end







|

23
24
25
26
27
28
29
30
31
@import UIKit;

#import "SiteStorage.h"

@interface MainViewController: UIViewController <UITableViewDelegate,
    UITableViewDataSource>
@property (retain) SiteStorage *siteStorage;
@property (nonatomic, retain) IBOutlet UITableView *tableView;
@end

Modified iOS/MainViewController.m from [08c2db049a] to [6921fa1360].

whitespace changes only

Modified iOS/ShowDetailsController.m from [75a5ea2c02] to [07cb7c3f7e].

whitespace changes only

Modified iOS/SiteStorage.h from [742d8e3dfb] to [ad39e5016f].

26
27
28
29
30
31
32

33
34
35
36
37
38
39
40
41
42
{
	OFString *_path;
	OFMutableDictionary <OFString*, OFDictionary <OFNumber*, OFNumber*>*>
	    *_storage;
	OFArray *_sites;
}


- (OFArray*)sites;
- (size_t)sitesCount;
- (bool)hasSite: (OFString*)name;
- (size_t)lengthForSite: (OFString*)name;
- (bool)isSiteLegacy: (OFString*)name;
- (void)setSite: (OFString*)site
	 length: (size_t)length
	 legacy: (bool)legacy;
- (void)removeSite: (OFString*)name;
@end







>
|









26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
{
	OFString *_path;
	OFMutableDictionary <OFString*, OFDictionary <OFNumber*, OFNumber*>*>
	    *_storage;
	OFArray *_sites;
}

@property (readonly, nonatomic) OFArray<OFString *> *sites;

- (size_t)sitesCount;
- (bool)hasSite: (OFString*)name;
- (size_t)lengthForSite: (OFString*)name;
- (bool)isSiteLegacy: (OFString*)name;
- (void)setSite: (OFString*)site
	 length: (size_t)length
	 legacy: (bool)legacy;
- (void)removeSite: (OFString*)name;
@end

Modified iOS/SiteStorage.m from [06f1c18e56] to [ad9c1f261f].

80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
	[_path release];
	[_storage release];
	[_sites release];

	[super dealloc];
}

- (OFArray*)sites
{
	void *pool = objc_autoreleasePoolPush();
	OFArray *sites = [[_storage allKeys] sortedArray];

	[sites retain];
	objc_autoreleasePoolPop(pool);
	return [sites autorelease];







|







80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
	[_path release];
	[_storage release];
	[_sites release];

	[super dealloc];
}

- (OFArray<OFString *> *)sites
{
	void *pool = objc_autoreleasePoolPush();
	OFArray *sites = [[_storage allKeys] sortedArray];

	[sites retain];
	objc_autoreleasePoolPop(pool);
	return [sites autorelease];

Modified iOS/scrypt-pwgen.xcodeproj/project.pbxproj from [37645065ae] to [458f6062a4].

358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
				ENABLE_BITCODE = NO;
				FRAMEWORK_SEARCH_PATHS = (
					"$(inherited)",
					"$(PROJECT_DIR)",
				);
				INFOPLIST_FILE = Info.plist;
				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
				PRODUCT_BUNDLE_IDENTIFIER = "zone.heap.scrypt-pwgen";
				PRODUCT_NAME = "$(TARGET_NAME)";
			};
			name = Debug;
		};
		4B2E52F51DA942840040D091 /* Release */ = {
			isa = XCBuildConfiguration;
			buildSettings = {
				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
				CLANG_ENABLE_OBJC_ARC = NO;
				DEVELOPMENT_TEAM = MXKNFCKFL6;
				ENABLE_BITCODE = NO;
				FRAMEWORK_SEARCH_PATHS = (
					"$(inherited)",
					"$(PROJECT_DIR)",
				);
				INFOPLIST_FILE = Info.plist;
				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
				PRODUCT_BUNDLE_IDENTIFIER = "zone.heap.scrypt-pwgen";
				PRODUCT_NAME = "$(TARGET_NAME)";
			};
			name = Release;
		};
/* End XCBuildConfiguration section */

/* Begin XCConfigurationList section */







|

















|







358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
				ENABLE_BITCODE = NO;
				FRAMEWORK_SEARCH_PATHS = (
					"$(inherited)",
					"$(PROJECT_DIR)",
				);
				INFOPLIST_FILE = Info.plist;
				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
				PRODUCT_BUNDLE_IDENTIFIER = "zone.heap.scrypt-pwgen.ios";
				PRODUCT_NAME = "$(TARGET_NAME)";
			};
			name = Debug;
		};
		4B2E52F51DA942840040D091 /* Release */ = {
			isa = XCBuildConfiguration;
			buildSettings = {
				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
				CLANG_ENABLE_OBJC_ARC = NO;
				DEVELOPMENT_TEAM = MXKNFCKFL6;
				ENABLE_BITCODE = NO;
				FRAMEWORK_SEARCH_PATHS = (
					"$(inherited)",
					"$(PROJECT_DIR)",
				);
				INFOPLIST_FILE = Info.plist;
				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
				PRODUCT_BUNDLE_IDENTIFIER = "zone.heap.scrypt-pwgen.ios";
				PRODUCT_NAME = "$(TARGET_NAME)";
			};
			name = Release;
		};
/* End XCBuildConfiguration section */

/* Begin XCConfigurationList section */