2
0

Update to masterpassword.app domain.

This commit is contained in:
Maarten Billemont 2018-06-03 16:26:08 -04:00
parent a7f82d3148
commit 073ef4f439
13 changed files with 47 additions and 39 deletions

View File

@ -5,7 +5,7 @@
# [Master Password •••|](http://masterpasswordapp.com) # [Master Password •••|](http://masterpassword.app)
Master Password is a completely new way of thinking about passwords. Master Password is a completely new way of thinking about passwords.
@ -13,7 +13,7 @@ It consists of an algorithm that implements the core idea and applications for v
To skip the intro and go straight to the information on how to use the code, [click here](#source-code). To skip the intro and go straight to the information on how to use the code, [click here](#source-code).
Master Password is available for [📲 iOS](https://itunes.apple.com/app/id510296984), [🖥 macOS](https://masterpasswordapp.com/masterpassword-mac.zip), [📲 Android](https://masterpasswordapp.com/masterpassword-android.apk), [🖥 Desktop](https://masterpasswordapp.com/masterpassword-gui.jar), and [⌨ Console](https://masterpasswordapp.com/masterpassword-cli.tar.gz). Master Password is available for [📲 iOS](https://itunes.apple.com/app/id510296984), [🖥 macOS](https://masterpassword.app/masterpassword-mac.zip), [📲 Android](https://masterpassword.app/masterpassword-android.apk), [🖥 Desktop](https://masterpassword.app/masterpassword-gui.jar), and [⌨ Console](https://masterpassword.app/masterpassword-cli.tar.gz).
Master Password is also available from the following package managers: [macOS: Homebrew](https://brew.sh/) (`brew install mpw`). Master Password is also available from the following package managers: [macOS: Homebrew](https://brew.sh/) (`brew install mpw`).
Get in touch if you are interested in adding Master Password to any other package managers. Get in touch if you are interested in adding Master Password to any other package managers.
@ -90,7 +90,7 @@ Master Password is *not* a password manager. It does not store your website pas
## How does it work? ## How does it work?
The details of how Master Password works [are available here](https://masterpasswordapp.com/masterpassword-algorithm.pdf). The details of how Master Password works [are available here](https://masterpassword.app/masterpassword-algorithm.pdf).
In short: In short:
@ -136,7 +136,7 @@ Please don't hesitate to [get in touch](#support), we're more than happy to answ
# Source Code # Source Code
Master Password's algorithm is [documented](https://masterpasswordapp.com/masterpassword-algorithm.pdf) and its implementation is [Free Software (GPLv3)](LICENSE). Master Password's algorithm is [documented](https://masterpassword.app/masterpassword-algorithm.pdf) and its implementation is [Free Software (GPLv3)](LICENSE).

View File

@ -1,31 +1,39 @@
class Mpw < Formula class Mpw < Formula
homepage "http://masterpasswordapp.com" desc "Stateless/deterministic password and identity manager"
url "https://ssl.masterpasswordapp.com/mpw-2.1-cli4-0-gf6b2287.tar.gz" homepage "https://masterpassword.app/"
sha1 "036b3d8f4bd6f0676ae16e7e9c3de65f6030874f" url "https://masterpassword.app/mpw-2.6-cli-5-0-g344771db.tar.gz"
version "2.1-cli4" version "2.6-cli-5"
sha256 "954c07b1713ecc2b30a07bead9c11e6204dd774ca67b5bdf7d2d6ad1c4eec170"
head "https://github.com/Lyndir/MasterPassword.git"
depends_on "automake" => :build bottle do
depends_on "autoconf" => :build cellar :any
depends_on "openssl" sha256 "ae8b265936797778a7cde788377eed89d9eacd267755a0b1186790057a10ff3b" => :high_sierra
sha256 "b8a106c3c84ff939e928613d4a6ccf7b5234e40ebae1edf15e3cac52d8c2e5ea" => :sierra
resource "libscrypt" do sha256 "9b58425b028a2598932474e1d0c17c13aad57e0a53ae7308c1b38404da8f3331" => :el_capitan
url "http://masterpasswordapp.com/libscrypt-b12b554.tar.gz"
sha1 "ee871e0f93a786c4e3622561f34565337cfdb815"
end end
option "without-json-c", "Disable JSON configuration support"
option "without-ncurses", "Disable colorized identicon support"
depends_on "libsodium"
depends_on "json-c" => :recommended
depends_on "ncurses" => :recommended
def install def install
resource("libscrypt").stage buildpath/"lib/scrypt" cd "platform-independent/cli-c" if build.head?
touch "lib/scrypt/.unpacked"
ENV["targets"] = "mpw"
ENV["mpw_json"] = build.with?("json-c") ? "1" : "0"
ENV["mpw_color"] = build.with?("ncurses") ? "1" : "0"
ENV["targets"] = "mpw mpw-tests"
system "./build" system "./build"
system "./mpw-tests" system "./mpw-cli-tests"
bin.install "mpw" bin.install "mpw"
end end
test do test do
assert_equal "Jejr5[RepuSosp", assert_equal "Jejr5[RepuSosp",
shell_output("mpw -u 'Robert Lee Mitchell' -P 'banana colored duckling' masterpasswordapp.com").strip shell_output("#{bin}/mpw -q -Fnone -u 'Robert Lee Mitchell' -M 'banana colored duckling' -tlong -c1 -a3 'masterpasswordapp.com'").strip
end end
end end

View File

@ -44,7 +44,7 @@
- (IBAction)androidPlayStore:(id)sender { - (IBAction)androidPlayStore:(id)sender {
[[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"http://masterpasswordapp.com"]]; [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"https://masterpassword.app"]];
[self close]; [self close];
} }

View File

@ -207,13 +207,13 @@
- (IBAction)homePageButton:(id)sender { - (IBAction)homePageButton:(id)sender {
[[self dismissPopup].navigationController performSegueWithIdentifier:@"web" sender: [[self dismissPopup].navigationController performSegueWithIdentifier:@"web" sender:
[NSURL URLWithString:@"https://masterpasswordapp.com"]]; [NSURL URLWithString:@"https://masterpassword.app"]];
} }
- (IBAction)securityButton:(id)sender { - (IBAction)securityButton:(id)sender {
[[self dismissPopup].navigationController performSegueWithIdentifier:@"web" sender: [[self dismissPopup].navigationController performSegueWithIdentifier:@"web" sender:
[NSURL URLWithString:@"https://masterpasswordapp.com/security.html"]]; [NSURL URLWithString:@"https://masterpassword.app/security.html"]];
} }
- (IBAction)sourceButton:(id)sender { - (IBAction)sourceButton:(id)sender {

View File

@ -32,7 +32,7 @@
[super viewWillAppear:animated]; [super viewWillAppear:animated];
if (!self.initialURL) if (!self.initialURL)
self.initialURL = [NSURL URLWithString:@"https://masterpasswordapp.com"]; self.initialURL = [NSURL URLWithString:@"https://masterpassword.app"];
self.webNavigationItem.title = self.initialURL.host; self.webNavigationItem.title = self.initialURL.host;

View File

@ -489,7 +489,7 @@
<navigationBar contentMode="scaleToFill" barStyle="black" translatesAutoresizingMaskIntoConstraints="NO" id="03x-KT-JQN"> <navigationBar contentMode="scaleToFill" barStyle="black" translatesAutoresizingMaskIntoConstraints="NO" id="03x-KT-JQN">
<rect key="frame" x="0.0" y="20" width="375" height="74"/> <rect key="frame" x="0.0" y="20" width="375" height="74"/>
<items> <items>
<navigationItem title="masterpasswordapp.com" prompt="Loading" id="Wpf-6b-UJb"> <navigationItem title="masterpassword.app" prompt="Loading" id="Wpf-6b-UJb">
<barButtonItem key="rightBarButtonItem" systemItem="done" id="Tbg-c3-qOh"> <barButtonItem key="rightBarButtonItem" systemItem="done" id="Tbg-c3-qOh">
<connections> <connections>
<action selector="done:" destination="Sd5-eW-Cx2" id="cuN-bV-cwl"/> <action selector="done:" destination="Sd5-eW-Cx2" id="cuN-bV-cwl"/>
@ -2487,11 +2487,11 @@ See </string>
<paragraphStyle key="NSParagraphStyle" alignment="left" lineBreakMode="wordWrapping" baseWritingDirection="natural"/> <paragraphStyle key="NSParagraphStyle" alignment="left" lineBreakMode="wordWrapping" baseWritingDirection="natural"/>
</attributes> </attributes>
</fragment> </fragment>
<fragment content="http://masterpasswordapp.com/security.html"> <fragment content="https://masterpassword.app/security.html">
<attributes> <attributes>
<color key="NSColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <color key="NSColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<font key="NSFont" size="14" name="Exo2.0-Regular"/> <font key="NSFont" size="14" name="Exo2.0-Regular"/>
<url key="NSLink" string="http://masterpasswordapp.com/security.html"/> <url key="NSLink" string="https://masterpassword.app/security.html"/>
<paragraphStyle key="NSParagraphStyle" alignment="left" lineBreakMode="wordWrapping" baseWritingDirection="natural"/> <paragraphStyle key="NSParagraphStyle" alignment="left" lineBreakMode="wordWrapping" baseWritingDirection="natural"/>
</attributes> </attributes>
</fragment> </fragment>

View File

@ -66,7 +66,7 @@ int main(int argc, char *const argv[]) {
const char *fullName = "Robert Lee Mitchel"; const char *fullName = "Robert Lee Mitchel";
const char *masterPassword = "banana colored duckling"; const char *masterPassword = "banana colored duckling";
const char *siteName = "masterpasswordapp.com"; const char *siteName = "masterpassword.app";
const MPCounterValue siteCounter = MPCounterValueDefault; const MPCounterValue siteCounter = MPCounterValueDefault;
const MPResultType resultType = MPResultTypeDefault; const MPResultType resultType = MPResultTypeDefault;
const MPKeyPurpose keyPurpose = MPKeyPurposeAuthentication; const MPKeyPurpose keyPurpose = MPKeyPurposeAuthentication;

View File

@ -36,7 +36,7 @@ static void usage() {
inf( "" inf( ""
" Master Password v%s - CLI\n" " Master Password v%s - CLI\n"
"--------------------------------------------------------------------------------\n" "--------------------------------------------------------------------------------\n"
" https://masterpasswordapp.com\n", stringify_def( MP_VERSION ) ); " https://masterpassword.app\n", stringify_def( MP_VERSION ) );
inf( "" inf( ""
"\nUSAGE\n\n" "\nUSAGE\n\n"
" mpw [-u|-U full-name] [-m fd] [-t pw-type] [-P value] [-c counter]\n" " mpw [-u|-U full-name] [-m fd] [-t pw-type] [-P value] [-c counter]\n"

View File

@ -43,7 +43,7 @@ static void usage() {
inf( "" inf( ""
" Master Password v%s - Tests\n" " Master Password v%s - Tests\n"
"--------------------------------------------------------------------------------\n" "--------------------------------------------------------------------------------\n"
" https://masterpasswordapp.com\n", stringify_def( MP_VERSION ) ); " https://masterpassword.app\n", stringify_def( MP_VERSION ) );
inf( "" inf( ""
"\nUSAGE\n\n" "\nUSAGE\n\n"
" mpw-tests [-v|-q]* [-h] [test-name ...]\n" ); " mpw-tests [-v|-q]* [-h] [test-name ...]\n" );

View File

@ -32,4 +32,4 @@ echo
echo "Done. Ready to publish the site." echo "Done. Ready to publish the site."
echo " package: $mpwArchive" echo " package: $mpwArchive"
echo " signature: $mpwArchive.sig" echo " signature: $mpwArchive.sig"
echo " url: https://masterpasswordapp.com/$mpwArchive" echo " url: https://masterpassword.app/$mpwArchive"

View File

@ -86,7 +86,7 @@ public class GUI implements UnlockFrame.SignInCallback {
continue; continue;
String manifestRevision = attributes.getValue( Attributes.Name.IMPLEMENTATION_VERSION ); String manifestRevision = attributes.getValue( Attributes.Name.IMPLEMENTATION_VERSION );
String upstreamRevisionURL = "https://masterpasswordapp.com/masterpassword-gui.jar.rev"; String upstreamRevisionURL = "https://masterpassword.app/masterpassword-gui.jar.rev";
CharSource upstream = Resources.asCharSource( URI.create( upstreamRevisionURL ).toURL(), Charsets.UTF_8 ); CharSource upstream = Resources.asCharSource( URI.create( upstreamRevisionURL ).toURL(), Charsets.UTF_8 );
String upstreamRevision = upstream.readFirstLine(); String upstreamRevision = upstream.readFirstLine();
if ((manifestRevision != null) && (upstreamRevision != null) && !manifestRevision.equalsIgnoreCase( if ((manifestRevision != null) && (upstreamRevision != null) && !manifestRevision.equalsIgnoreCase(
@ -94,11 +94,11 @@ public class GUI implements UnlockFrame.SignInCallback {
logger.inf( "Local Revision: <%s>", manifestRevision ); logger.inf( "Local Revision: <%s>", manifestRevision );
logger.inf( "Upstream Revision: <%s>", upstreamRevision ); logger.inf( "Upstream Revision: <%s>", upstreamRevision );
logger.wrn( "You are not running the current official version. Please update from:%n%s", logger.wrn( "You are not running the current official version. Please update from:%n%s",
"https://masterpasswordapp.com/masterpassword-gui.jar" ); "https://masterpassword.app/masterpassword-gui.jar" );
JOptionPane.showMessageDialog( null, JOptionPane.showMessageDialog( null,
strf( "A new version of Master Password is available.%n " strf( "A new version of Master Password is available.%n "
+ "Please download the latest version from %s", + "Please download the latest version from %s",
"https://masterpasswordapp.com" ), "https://masterpassword.app" ),
"Update Available", JOptionPane.WARNING_MESSAGE ); "Update Available", JOptionPane.WARNING_MESSAGE );
} }
} }

View File

@ -56,8 +56,8 @@
<footer> <footer>
<p>This page was made possible thanks to <a href="https://tomthorogood.co.uk/" title="Tom Thorogood">tmthrgd</a>'s <a href="https://github.com/tmthrgd/mpw-js">mpw-js</a>.<br> <p>This page was made possible thanks to <a href="https://tomthorogood.co.uk/" title="Tom Thorogood">tmthrgd</a>'s <a href="https://github.com/tmthrgd/mpw-js">mpw-js</a>.<br>
<em><a href="http://masterpasswordapp.com">Master Password</a> is a security product and algorithm by <a href="http://www.lhunath.com" title="Maarten Billemont">Maarten Billemont</a>, <a href="http://www.lyndir.com">Lyndir</a> (&copy; 2011-2014).</em><br> <em><a href="https://masterpassword.app">Master Password</a> is a security product and algorithm by <a href="http://www.lhunath.com" title="Maarten Billemont">Maarten Billemont</a>, <a href="http://www.lyndir.com">Lyndir</a> (&copy; 2011-2014).</em><br>
Usage implies agreement with our <a href="http://masterpasswordapp.com/privacy.html">privacy policy and disclaimer</a>.</p> Usage implies agreement with our <a href="https://masterpassword.app/privacy.html">privacy policy and disclaimer</a>.</p>
</footer> </footer>
<!-- Scripts --> <!-- Scripts -->

View File

@ -2,5 +2,5 @@
set -e set -e
cd "${BASH_SOURCE[0]%/*}" cd "${BASH_SOURCE[0]%/*}"
#s3cmd sync --exclude '.git/**' --delete-removed --follow-symlinks --preserve --acl-public --reduced-redundancy . s3://js.masterpasswordapp.com/ #s3cmd sync --exclude '.git/**' --delete-removed --follow-symlinks --preserve --acl-public --reduced-redundancy . s3://js.masterpassword.app/
rsync -avP --delete --no-group . satura.lyndir.com:/usr/local/www/js.masterpasswordapp.com/htdocs-secure/ rsync -avP --delete --no-group . satura.lyndir.com:/usr/local/www/js.masterpassword.app/htdocs-secure/