js/CryptoPassphrase
1
1
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Compare commits

base: js:v1.0.1
Branches Tags
js:main
js:v1.0.1
js:v1.0
...
compare: js:main
Branches Tags
js:main
js:v1.0.1
js:v1.0

5 commits
v1.0.1 ... main

Author SHA1 Message Date
Jonathan Schleifer
d984b1781e
Update URL 2025-06-24 18:19:21 +02:00
Jonathan Schleifer
de918b4b07
Convert .fossil/ignore-glob to .gitignore 2025-06-22 22:34:20 +02:00
Jonathan Schleifer
a6d5cc9bf9 Add .fossil-settings 
FossilOrigin-Name: b64bd1e5b7be7de7f114c30fa2f6d72283e3221a38977c468cf6e8d6cff13df2
 2024-12-21 20:58:20 +00:00
Jonathan Schleifer
a8b4dc943f Update copyright 
FossilOrigin-Name: 32913793c8ee46edae2797f5e1063ed0a034aa77da6bcad037899286a53dc5c9
 2024-12-21 20:55:46 +00:00
Jonathan Schleifer
2d69e05096 [iOS] Remove key upload functionality 
It was never finished and uploading a key file unencrypted via WiFi is a
bad idea anyway.

FossilOrigin-Name: 0c2ffe58fdc61f477675a204326a34910f476539441b81af07db77518955d844
 2024-08-25 10:48:32 +00:00
20 changed files with 41 additions and 122 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored Normal file
View file

@ -0,0 +1,2 @@
/iOS/CryptoPassphrase.xcodeproj/project.xcworkspace
/iOS/CryptoPassphrase.xcodeproj/xcuserdata

4
CryptoPassphrase.h
View file

@ -1,7 +1,7 @@
/*
* Copyright (c) 2016 - 2023 Jonathan Schleifer <js@nil.im>
* Copyright (c) 2016 - 2024 Jonathan Schleifer <js@nil.im>
*
* https://fl.nil.im/cryptopassphrase
* https://git.nil.im/js/CryptoPassphrase
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above

4
CryptoPassphrase.m
View file

@ -1,7 +1,7 @@
/*
* Copyright (c) 2016 - 2023 Jonathan Schleifer <js@nil.im>
* Copyright (c) 2016 - 2024 Jonathan Schleifer <js@nil.im>
*
* https://fl.nil.im/cryptopassphrase
* https://git.nil.im/js/CryptoPassphrase
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above

4
LegacyPasswordGenerator.h
View file

@ -1,7 +1,7 @@
/*
* Copyright (c) 2016 - 2023 Jonathan Schleifer <js@nil.im>
* Copyright (c) 2016 - 2024 Jonathan Schleifer <js@nil.im>
*
* https://fl.nil.im/cryptopassphrase
* https://git.nil.im/js/CryptoPassphrase
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above

4
LegacyPasswordGenerator.m
View file

@ -1,7 +1,7 @@
/*
* Copyright (c) 2016 - 2023 Jonathan Schleifer <js@nil.im>
* Copyright (c) 2016 - 2024 Jonathan Schleifer <js@nil.im>
*
* https://fl.nil.im/cryptopassphrase
* https://git.nil.im/js/CryptoPassphrase
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above

4
NewPasswordGenerator.h
View file

@ -1,7 +1,7 @@
/*
* Copyright (c) 2016 - 2023 Jonathan Schleifer <js@nil.im>
* Copyright (c) 2016 - 2024 Jonathan Schleifer <js@nil.im>
*
* https://fl.nil.im/cryptopassphrase
* https://git.nil.im/js/CryptoPassphrase
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above

4
NewPasswordGenerator.m
View file

@ -1,7 +1,7 @@
/*
* Copyright (c) 2016 - 2023 Jonathan Schleifer <js@nil.im>
* Copyright (c) 2016 - 2024 Jonathan Schleifer <js@nil.im>
*
* https://fl.nil.im/cryptopassphrase
* https://git.nil.im/js/CryptoPassphrase
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above

4
PasswordGenerator.h
View file

@ -1,7 +1,7 @@
/*
* Copyright (c) 2016 - 2023 Jonathan Schleifer <js@nil.im>
* Copyright (c) 2016 - 2024 Jonathan Schleifer <js@nil.im>
*
* https://fl.nil.im/cryptopassphrase
* https://git.nil.im/js/CryptoPassphrase
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above

4
iOS/AboutController.swift
View file

@ -1,7 +1,7 @@
/*
* Copyright (c) 2016 - 2023 Jonathan Schleifer <js@nil.im>
* Copyright (c) 2016 - 2024 Jonathan Schleifer <js@nil.im>
*
* https://fl.nil.im/cryptopassphrase
* https://git.nil.im/js/CryptoPassphrase
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above

4
iOS/AddSiteController.swift
View file

@ -1,7 +1,7 @@
/*
* Copyright (c) 2016 - 2023 Jonathan Schleifer <js@nil.im>
* Copyright (c) 2016 - 2024 Jonathan Schleifer <js@nil.im>
*
* https://fl.nil.im/cryptopassphrase
* https://git.nil.im/js/CryptoPassphrase
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above

4
iOS/AppDelegate.swift
View file

@ -1,7 +1,7 @@
/*
* Copyright (c) 2016 - 2023 Jonathan Schleifer <js@nil.im>
* Copyright (c) 2016 - 2024 Jonathan Schleifer <js@nil.im>
*
* https://fl.nil.im/cryptopassphrase
* https://git.nil.im/js/CryptoPassphrase
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above

23
iOS/Base.lproj/Main.storyboard
View file

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="19529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="BN3-Y7-zvx">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="BN3-Y7-zvx">
<device id="retina4_7" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19519"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22685"/>
<capability name="System colors in document resources" minToolsVersion="11.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
@ -13,7 +13,7 @@
<objects>
<navigationController id="BN3-Y7-zvx" sceneMemberID="viewController">
<navigationBar key="navigationBar" contentMode="scaleToFill" id="K8n-wn-irC">
<rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
<rect key="frame" x="0.0" y="20" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
</navigationBar>
<connections>
@ -40,14 +40,14 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<searchBar contentMode="redraw" translatesAutoresizingMaskIntoConstraints="NO" id="CMc-ZN-RAn">
<rect key="frame" x="0.0" y="44" width="375" height="51"/>
<rect key="frame" x="0.0" y="64" width="375" height="56"/>
<textInputTraits key="textInputTraits"/>
<connections>
<outlet property="delegate" destination="P19-6i-fpd" id="G7P-7f-gbO"/>
</connections>
</searchBar>
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="eoq-EJ-t3s">
<rect key="frame" x="0.0" y="95" width="375" height="572"/>
<rect key="frame" x="0.0" y="120" width="375" height="547"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<connections>
<outlet property="dataSource" destination="P19-6i-fpd" id="1sa-qY-oQx"/>
@ -101,7 +101,7 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<webView contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="2xd-QR-99d">
<rect key="frame" x="0.0" y="44" width="375" height="623"/>
<rect key="frame" x="0.0" y="64" width="375" height="603"/>
<color key="backgroundColor" red="0.36078431370000003" green="0.38823529410000002" blue="0.4039215686" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<connections>
<outlet property="delegate" destination="MZ3-iZ-Dsf" id="uKq-6T-ltJ"/>
@ -234,7 +234,7 @@
<rect key="frame" x="0.0" y="186" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Oqt-88-vl9" id="j4y-Zr-ep4">
<rect key="frame" x="0.0" y="0.0" width="350.5" height="44"/>
<rect key="frame" x="0.0" y="0.0" width="348.5" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Key file" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Uyw-CW-atj">
@ -247,7 +247,7 @@
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="None" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wv8-GU-ahj">
<rect key="frame" x="124" y="11.5" width="217.5" height="21"/>
<rect key="frame" x="124" y="11.5" width="215.5" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
@ -309,7 +309,7 @@
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" id="QAR-8T-qhV">
<rect key="frame" x="0.0" y="44.5" width="375" height="43.5"/>
<rect key="frame" x="0.0" y="50" width="375" height="43.5"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="QAR-8T-qhV" id="u3r-6g-c9v">
<rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
@ -325,11 +325,6 @@
<toolbarItems/>
<navigationItem key="navigationItem" id="bWa-Dd-f4f">
<nil key="title"/>
<barButtonItem key="rightBarButtonItem" enabled="NO" title="Upload" id="85s-WF-868">
<connections>
<action selector="upload:" destination="4bs-rP-TxE" id="DnV-UG-h0y"/>
</connections>
</barButtonItem>
</navigationItem>
<simulatedToolbarMetrics key="simulatedBottomBarMetrics"/>
</tableViewController>

4
iOS/CryptoPassphrase.xcodeproj/project.pbxproj
View file

@ -15,7 +15,6 @@
4B5BCEFB22B5CF3200E551BD /* MainViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B5BCEFA22B5CF3200E551BD /* MainViewController.swift */; };
4B5BCEFD22B5D98800E551BD /* SelectKeyFileController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B5BCEFC22B5D98800E551BD /* SelectKeyFileController.swift */; };
4B5BCEFF22B5E36900E551BD /* ShowDetailsController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B5BCEFE22B5E36900E551BD /* ShowDetailsController.swift */; };
4B93656E22B5ADA00099DD08 /* HTTPServerDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B93656D22B5ADA00099DD08 /* HTTPServerDelegate.swift */; };
4B93657022B5AE2C0099DD08 /* AboutController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B93656F22B5AE2C0099DD08 /* AboutController.swift */; };
4B93657222B5B1FB0099DD08 /* AddSiteController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B93657122B5B1FB0099DD08 /* AddSiteController.swift */; };
4B9525251F96BB900095F259 /* ObjFW.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B9525231F96BB820095F259 /* ObjFW.framework */; };
@ -56,7 +55,6 @@
4B5BCEFA22B5CF3200E551BD /* MainViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainViewController.swift; sourceTree = "<group>"; };
4B5BCEFC22B5D98800E551BD /* SelectKeyFileController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SelectKeyFileController.swift; sourceTree = "<group>"; };
4B5BCEFE22B5E36900E551BD /* ShowDetailsController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShowDetailsController.swift; sourceTree = "<group>"; };
4B93656D22B5ADA00099DD08 /* HTTPServerDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HTTPServerDelegate.swift; sourceTree = "<group>"; };
4B93656F22B5AE2C0099DD08 /* AboutController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AboutController.swift; sourceTree = "<group>"; };
4B93657122B5B1FB0099DD08 /* AddSiteController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddSiteController.swift; sourceTree = "<group>"; };
4B9525231F96BB820095F259 /* ObjFW.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ObjFW.framework; path = Frameworks/ObjFW.framework; sourceTree = "<group>"; };
@ -110,7 +108,6 @@
4B93656F22B5AE2C0099DD08 /* AboutController.swift */,
4B93657122B5B1FB0099DD08 /* AddSiteController.swift */,
4B5BCEF822B5B94C00E551BD /* AppDelegate.swift */,
4B93656D22B5ADA00099DD08 /* HTTPServerDelegate.swift */,
4B2E52F01DA942840040D091 /* Info.plist */,
4B2E52ED1DA942840040D091 /* LaunchScreen.storyboard */,
4B2E52E81DA942840040D091 /* Main.storyboard */,
@ -223,7 +220,6 @@
buildActionMask = 2147483647;
files = (
4B5BCEF922B5B94C00E551BD /* AppDelegate.swift in Sources */,
4B93656E22B5ADA00099DD08 /* HTTPServerDelegate.swift in Sources */,
4B5BCEFB22B5CF3200E551BD /* MainViewController.swift in Sources */,
4B93657222B5B1FB0099DD08 /* AddSiteController.swift in Sources */,
4BA115D21DA9432D007ED4EA /* LegacyPasswordGenerator.m in Sources */,

27
iOS/HTTPServerDelegate.swift
View file

@ -1,27 +0,0 @@
/*
* Copyright (c) 2016 - 2023 Jonathan Schleifer <js@nil.im>
*
* https://fl.nil.im/cryptopassphrase
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
*
* THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
* REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
* AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
* INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
* LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
* OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
import Foundation
import ObjFW
class HTTPServerDelegate: OFObject, OFHTTPServerDelegate {
func server(_ server: OFHTTPServer, didReceive request: OFHTTPRequest,
requestBody: OFStream?, response: OFHTTPResponse) {
print("\(request)")
}
}

4
iOS/MainViewController.swift
View file

@ -1,7 +1,7 @@
/*
* Copyright (c) 2016 - 2023 Jonathan Schleifer <js@nil.im>
* Copyright (c) 2016 - 2024 Jonathan Schleifer <js@nil.im>
*
* https://fl.nil.im/cryptopassphrase
* https://git.nil.im/js/CryptoPassphrase
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above

51
iOS/SelectKeyFileController.swift
View file

@ -1,7 +1,7 @@
/*
* Copyright (c) 2016 - 2023 Jonathan Schleifer <js@nil.im>
* Copyright (c) 2016 - 2024 Jonathan Schleifer <js@nil.im>
*
* https://fl.nil.im/cryptopassphrase
* https://git.nil.im/js/CryptoPassphrase
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
@ -23,21 +23,6 @@ class SelectKeyFileController: UITableViewController {
public var addSiteController: AddSiteController?
private var keyFiles: [String] = []
private var httpServer: OFHTTPServer
private var httpServerDelegate: HTTPServerDelegate
private var httpServerThread: OFThread
required init?(coder aDecoder: NSCoder) {
httpServer = OFHTTPServer()
httpServer.host = "127.0.0.1".ofObject
httpServerDelegate = HTTPServerDelegate()
httpServer.delegate = self.httpServerDelegate
httpServerThread = OFThread()
super.init(coder: aDecoder)
}
override func viewDidLoad() {
super.viewDidLoad()
@ -58,13 +43,6 @@ class SelectKeyFileController: UITableViewController {
navigationController?.popViewController(animated: true)
return
}
httpServerThread.start()
}
override func viewDidDisappear(_ animated: Bool) {
httpServerThread.runLoop.stop()
httpServerThread.join()
}
override func tableView(_ tableView: UITableView,
@ -92,29 +70,4 @@ class SelectKeyFileController: UITableViewController {
self.navigationController?.popViewController(animated: true)
}
@IBAction func upload(_ sender: Any?) {
let timer = OFTimer.scheduledTimer(withTimeInterval: 0,
repeats: false) { (OFTimer) in
self.httpServer.port = 0
self.httpServer.start()
let message =
"Navigate to http://\(self.httpServer.host!.nsObject):" +
"\(self.httpServer.port)/ in your browser.\n\n" +
"Press OK when done."
let alert = UIAlertController(title: "Server Running",
message: message,
preferredStyle: .alert)
alert.addAction(
UIAlertAction(title: "OK", style: .default, handler: nil))
DispatchQueue.main.sync {
self.present(alert, animated: true) {
self.httpServer.stop()
}
}
}
httpServerThread.runLoop.add(timer)
}
}

4
iOS/ShowDetailsController.swift
View file

@ -1,7 +1,7 @@
/*
* Copyright (c) 2016 - 2023 Jonathan Schleifer <js@nil.im>
* Copyright (c) 2016 - 2024 Jonathan Schleifer <js@nil.im>
*
* https://fl.nil.im/cryptopassphrase
* https://git.nil.im/js/CryptoPassphrase
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above

4
iOS/SiteStorage.swift
View file

@ -1,7 +1,7 @@
/*
* Copyright (c) 2016 - 2023 Jonathan Schleifer <js@nil.im>
* Copyright (c) 2016 - 2024 Jonathan Schleifer <js@nil.im>
*
* https://fl.nil.im/cryptopassphrase
* https://git.nil.im/js/CryptoPassphrase
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above

2
iOS/bridge.h
View file

@ -1,7 +1,7 @@
/*
* Copyright (c) 2016 - 2023 Jonathan Schleifer <js@nil.im>
*
* https://fl.nil.im/cryptopassphrase
* https://git.nil.im/js/CryptoPassphrase
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above

2
iOS/main.m
View file

@ -1,7 +1,7 @@
/*
* Copyright (c) 2016 - 2023 Jonathan Schleifer <js@nil.im>
*
* https://fl.nil.im/cryptopassphrase
* https://git.nil.im/js/CryptoPassphrase
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above