From f7e4f2c0531cbad3e2ea4f3e5c1ad6d7d9d15070 Mon Sep 17 00:00:00 2001 From: Stefan Brand Date: Wed, 8 Nov 2017 08:30:13 +0100 Subject: [PATCH 1/4] Fixup URLs and openssl command in README --- README.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index c7acef5..854d86c 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ From the main view a token can be copied to the clipboard by tapping on it. From the pulley menu the token database can be exported to a file for backup purposes. The backup is a AES-256-CBC encrypted and Base64 encoded file containing a JSON-representation of the database. It can be decrypted with openssl using the following command: -openssl enc -d -a -aes-256-cbc -in +openssl enc -d -a -A -md md5 -aes-256-cbc -in if you need the information outside of SailOTP. @@ -25,8 +25,9 @@ It is also possible to generate tokens for SteamGuard (Steams TOTP-Variant for 2 ## Contact and Issues -If you find any bugs or want to suggest a feature, feel free to use Githubs -Issues feature or write an email to sailfish _AT_ seiichiro0185.org +If you find any bugs or want to suggest a feature, feel free to use Githubs Issues feature at +https://github.com/seiichiro0185/sailotp/issues +or write an email to sailfish _AT_ seiichiro0185.org ## License @@ -40,7 +41,7 @@ SailOTP uses the SHA-1 and HMAC-Implementation from SailOTP also uses the AES-Implementation from -https://github.com/mdp/gibberish-aes +https://code.google.com/archive/p/crypto-js/ The implementation of the TOTP-algorithm was inspired by: From 00b1c594c9b0982629213df887e966d0690c4b52 Mon Sep 17 00:00:00 2001 From: Stefan Brand Date: Mon, 25 Dec 2017 12:07:42 +0100 Subject: [PATCH 2/4] Fix About Page, Add Manual and Github Links --- qml/pages/About.qml | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/qml/pages/About.qml b/qml/pages/About.qml index 551ef08..fa007d0 100644 --- a/qml/pages/About.qml +++ b/qml/pages/About.qml @@ -45,12 +45,19 @@ Page { Column { id: column width: parent.width - spacing: Theme.paddingLarge + spacing: Theme.paddingSmall + TextArea { + id: spacer + anchors.horizontalCenter: parent.horizontalCenter + width: parent.width + readOnly: true + text: "" + height: Theme.paddingLarge*2 + } Image { id: logo source: "../sailotp.png" - anchors.topMargin: 20 anchors.horizontalCenter: parent.horizontalCenter } Label { @@ -77,12 +84,20 @@ Page { text: qsTr("Copyright: Stefan Brand\nLicense: BSD (3-clause)") color: "white" } + Button { + id: manual + anchors.horizontalCenter: parent.horizontalCenter + text: "Online Manual" + onClicked: { + Qt.openUrlExternally("https://www.seiichiro0185.org/sailfish:apps:sailotp:manual") + } + } Button { id: homepage anchors.horizontalCenter: parent.horizontalCenter - text: "Source Code" + text: "Source Code & Issue Tracker" onClicked: { - Qt.openUrlExternally("https://www.seiichiro0185.org/git/SailfishOS/harbour-sailotp") + Qt.openUrlExternally("https://github.com/seiichiro0185/sailotp/") } } TextArea { @@ -92,7 +107,7 @@ Page { font.pixelSize: Theme.fontSizeSmall horizontalAlignment: TextEdit.Center readOnly: true - text: qsTr("SailOTP uses the following third party libs:")+"\n\nhttp://caligatio.github.io/jsSHA/\nhttps://github.com/mdp/gibberish-aes/\nhttp://sourceforge.net/projects/qzxing/\nhttp://fukuchi.org/works/qrencode/" + text: qsTr("SailOTP uses the following third party libs:")+"\n\nhttp://caligatio.github.io/jsSHA/\nhttps://code.google.com/archive/p/crypto-js/\nhttp://sourceforge.net/projects/qzxing/\nhttp://fukuchi.org/works/qrencode/" color: "white" } From ff3f1d30840026c792de7ee03b7786380694fe63 Mon Sep 17 00:00:00 2001 From: Stefan Brand Date: Mon, 25 Dec 2017 12:10:19 +0100 Subject: [PATCH 3/4] About Page Layout Fixes --- qml/pages/About.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qml/pages/About.qml b/qml/pages/About.qml index fa007d0..e9eb458 100644 --- a/qml/pages/About.qml +++ b/qml/pages/About.qml @@ -107,7 +107,7 @@ Page { font.pixelSize: Theme.fontSizeSmall horizontalAlignment: TextEdit.Center readOnly: true - text: qsTr("SailOTP uses the following third party libs:")+"\n\nhttp://caligatio.github.io/jsSHA/\nhttps://code.google.com/archive/p/crypto-js/\nhttp://sourceforge.net/projects/qzxing/\nhttp://fukuchi.org/works/qrencode/" + text: "\n"+qsTr("SailOTP uses the following third party libs:")+"\n\nhttp://caligatio.github.io/jsSHA/\nhttps://code.google.com/archive/p/crypto-js/\nhttp://sourceforge.net/projects/qzxing/\nhttp://fukuchi.org/works/qrencode/" color: "white" } From 0e990b9e2d4824b4b22c0d893941e447a2da5625 Mon Sep 17 00:00:00 2001 From: Stefan Brand Date: Mon, 25 Dec 2017 12:39:12 +0100 Subject: [PATCH 4/4] Added OpenSSL Decryption Commandline to Export Page --- i18n/de.ts | 33 +++++++++++++++++++-------------- i18n/en.ts | 33 +++++++++++++++++++-------------- i18n/fi.ts | 34 ++++++++++++++++++++-------------- i18n/fr.ts | 30 ++++++++++++++++++------------ i18n/ru.ts | 36 +++++++++++++++++++++--------------- i18n/sv.ts | 34 ++++++++++++++++++++-------------- qml/pages/ExportPage.qml | 6 +++--- 7 files changed, 120 insertions(+), 86 deletions(-) diff --git a/i18n/de.ts b/i18n/de.ts index 2187c75..6e5f095 100644 --- a/i18n/de.ts +++ b/i18n/de.ts @@ -12,36 +12,36 @@ Copyright: Stefan Brand<br/>Lizenz: BSD (3-Klausel) - + A Simple Sailfish OTP Generator (RFC 6238/4226 compatible) Ein einfacher Sailfish OTP-Generator (RFC 6238/4226-kompatibel) - + Copyright: Stefan Brand License: BSD (3-clause) Copyright: Stefan Brand Lizenz: BSD (3-Klausel) - + SailOTP uses the following third party libs: SailOTP verwendet folgende externe Bibliotheken: - + Contributors: Mitwirkende: - + Support Unterstützung - + Translators: Übersetzer: @@ -49,12 +49,12 @@ Lizenz: BSD (3-Klausel) AddOTP - + Show QR-Code QR-Code anzeigen - + Can't create QR-Code from incomplete settings! Ein QR-Code kann nur mit vollständigen Einstellungen erzeugt werden! @@ -109,28 +109,28 @@ Lizenz: BSD (3-Klausel) Geheimer Schlüssel - + Length Länge - + Length of the Token Länge des Tokens - - + + Time Derivation (Seconds) Zeitabweichung (Sekunden) - + Next Counter Value Nächster Zählerwert - + Next Value of the Counter Nächster Wert für den Zähler @@ -214,6 +214,11 @@ Lizenz: BSD (3-Klausel) Here you can export Tokens to a file. The exported file will be encrypted with AES-256-CBC and Base64 encoded. Choose a strong password, the file will contain the secrets used to generate the Tokens for your accounts. Pull left to start the export. Hier können Tokens in eine Datei exportiert werden. Die Datei wird mit AES-256-CBC verschlüsselt und Base64-kodiert. Wähle ein starkes Passwort, die Datei enthält die geheimen Schlüssel zur Erzeugung der Tokens für deine Accounts. Nach links ziehen um zu starten. + + + To view the content of the export file outside of SailOTP use the following openssl command: + Mit folgendem Openssl-Befehl kann der Inhalt der Exportdatei außerhalb von SailOTP angezeigt werden: + Error writing to file diff --git a/i18n/en.ts b/i18n/en.ts index 2197812..773c286 100644 --- a/i18n/en.ts +++ b/i18n/en.ts @@ -4,34 +4,34 @@ About - + A Simple Sailfish OTP Generator (RFC 6238/4226 compatible) - + Copyright: Stefan Brand License: BSD (3-clause) - + SailOTP uses the following third party libs: - + Contributors: Contributor: - + Support support - + Translators: Translators: @@ -39,12 +39,12 @@ License: BSD (3-clause) AddOTP - + Show QR-Code Show QR-Code - + Can't create QR-Code from incomplete settings! Can't create QR-Code from incomplete settings! @@ -99,28 +99,28 @@ License: BSD (3-clause) - + Length Length - + Length of the Token Length of the Token - - + + Time Derivation (Seconds) Time Derivation (Seconds) - + Next Counter Value - + Next Value of the Counter @@ -204,6 +204,11 @@ License: BSD (3-clause) Here you can export Tokens to a file. The exported file will be encrypted with AES-256-CBC and Base64 encoded. Choose a strong password, the file will contain the secrets used to generate the Tokens for your accounts. Pull left to start the export. + + + To view the content of the export file outside of SailOTP use the following openssl command: + + Error writing to file diff --git a/i18n/fi.ts b/i18n/fi.ts index bf02926..b52e2ad 100644 --- a/i18n/fi.ts +++ b/i18n/fi.ts @@ -4,36 +4,36 @@ About - + A Simple Sailfish OTP Generator (RFC 6238/4226 compatible) Yksinkertainen Sailfish OTP-generaattori (RFC 6238/4226-yhteensopiva) - + Copyright: Stefan Brand License: BSD (3-clause) Copyright: Stefan Brand Lisenssi: BSD (3-clause) - + SailOTP uses the following third party libs: SailOTP käyttää seuraavat kolmannen osapuolen kirjastot: - + Contributors: Avustajat: - + Support tuki - + Translators: Kääntäjät: @@ -41,12 +41,12 @@ Lisenssi: BSD (3-clause) AddOTP - + Show QR-Code Näytä QR-koodi - + Can't create QR-Code from incomplete settings! QR-koodin luonti epäonnistui puutteellisten asetuksien takia! @@ -101,28 +101,28 @@ Lisenssi: BSD (3-clause) Salainen OTP-avain - + Length Pituus - + Length of the Token Tunnuksen pituus - - + + Time Derivation (Seconds) Aikapoikkeama (sekunneissa) - + Next Counter Value Seuraava laskenta-arvo - + Next Value of the Counter Laskurin seuraava arvo @@ -206,6 +206,12 @@ Lisenssi: BSD (3-clause) Here you can export Tokens to a file. The exported file will be encrypted with AES-256-CBC and Base64 encoded. Choose a strong password, the file will contain the secrets used to generate the Tokens for your accounts. Pull left to start the export. Voit eksportoida tunnukset tiedostoon. Eksportoitu tiedosto enkryptataan AES-256-CBC- ja Base64-salauksella. Valitse vahva salasana, koska tiedostosta voidaan kääntää tiliesi tunnukset. Pyyhkäise vasemmalle aloittaaksesi eksportin. + + + To view the content of the export file outside of SailOTP use the following openssl command: + Translated using Google Translate + Jos haluat tarkastella vientitiedoston sisältöä SailOTP: n ulkopuolella, käytä seuraavaa openssl-komentoa: + Error writing to file diff --git a/i18n/fr.ts b/i18n/fr.ts index 69fe2a6..b6dfe4d 100644 --- a/i18n/fr.ts +++ b/i18n/fr.ts @@ -4,35 +4,35 @@ About - + A Simple Sailfish OTP Generator (RFC 6238/4226 compatible) Un générateur d'OTP simple pour Sailfish (compatible avec les RFC6238 et 4226) - + Copyright: Stefan Brand License: BSD (3-clause) Copyright: Stefan Brand Licence : BSD (3 clauses) - + SailOTP uses the following third party libs: SailOTP utilise les bibliothèques tierces suivantes : - + Contributors: Contributeurs : - + Support Support - + Translators: Traducteurs : @@ -100,28 +100,28 @@ Licence : BSD (3 clauses) Clé secrète OTP - + Length Longueur - + Length of the Token Longueur du jeton - - + + Time Derivation (Seconds) Dérivation de temps (secondes) - + Next Counter Value Prochaine valeur du compteur - + Next Value of the Counter Prochaine valeur du compteur @@ -205,6 +205,12 @@ Licence : BSD (3 clauses) Here you can export Tokens to a file. The exported file will be encrypted with AES-256-CBC and Base64 encoded. Choose a strong password, the file will contain the secrets used to generate the Tokens for your accounts. Pull left to start the export. Vous pouvez ici exporter les paramètres d'OTP vers un fichier. Ce fichier sera chiffré en AES-256-CBC et encodé en Base64. Ce fichier contiendra les secrets utilisés pour générer les OTP de vos comptes, choisissez donc un mot de passe fort. Glissez vers la droite pour démarrer l'export. + + + To view the content of the export file outside of SailOTP use the following openssl command: + Translated using Google Translate + Pour afficher le contenu du fichier d'exportation en dehors de SailOTP, utilisez la commande openssl suivante: + Error writing to file diff --git a/i18n/ru.ts b/i18n/ru.ts index 228d77f..9378c20 100644 --- a/i18n/ru.ts +++ b/i18n/ru.ts @@ -1,39 +1,39 @@ - + About - + A Simple Sailfish OTP Generator (RFC 6238/4226 compatible) Простой генератор OTP для Sailfish (совместим с RFS 6238/4226) - + Copyright: Stefan Brand License: BSD (3-clause) Авторские права: Стефан Брэнд Лицензия: BSD (3-clause) - + SailOTP uses the following third party libs: SailOTP использует следующие сторонние библиотеки: - + Contributors: Участники: - + Support Поддержка - + Translators: Переводчики: @@ -41,12 +41,12 @@ License: BSD (3-clause) AddOTP - + Show QR-Code Показать QR-код - + Can't create QR-Code from incomplete settings! Невозможно создать QR-код из-за неполных настроек! @@ -101,28 +101,28 @@ License: BSD (3-clause) Секретный ключ OTP - + Length Длина - + Length of the Token Длина токена - - + + Time Derivation (Seconds) Интервал расхождения (секунд) - + Next Counter Value Следующее значение счетчика - + Next Value of the Counter Следующее значение счетчика @@ -206,6 +206,12 @@ License: BSD (3-clause) Here you can export Tokens to a file. The exported file will be encrypted with AES-256-CBC and Base64 encoded. Choose a strong password, the file will contain the secrets used to generate the Tokens for your accounts. Pull left to start the export. Здесь можно экспортировать токены в файл. Экспортированный файл будет зашифрован с использованием AES-256-CBC и кодирован в Base64. Выберите сильный пароль — файл будет содержать секреты, использованные для генерации токенов для Ваших аккаунтов. Потяните влево чтобы начать экспорт. + + + To view the content of the export file outside of SailOTP use the following openssl command: + Translated using Google Translate + Чтобы просмотреть содержимое файла экспорта за пределами SailOTP, используйте следующую команду openssl: + Error writing to file diff --git a/i18n/sv.ts b/i18n/sv.ts index bc48975..b2be2f0 100644 --- a/i18n/sv.ts +++ b/i18n/sv.ts @@ -4,36 +4,36 @@ About - + A Simple Sailfish OTP Generator (RFC 6238/4226 compatible) En enkel Sailfish OTP-generator (RFC 6238/4226-kompatibel) - + Copyright: Stefan Brand License: BSD (3-clause) Copyright: Stefan Brand Licens: BSD (3-clause) - + SailOTP uses the following third party libs: SailOTP använder följande tredjeparts bibliotek: - + Contributors: Medarbetare: - + Support försörjning - + Translators: Översättare: @@ -41,12 +41,12 @@ Licens: BSD (3-clause) AddOTP - + Show QR-Code Visa QR-kod - + Can't create QR-Code from incomplete settings! Kan inte skapa QR-kod från ofullständiga inställningar! @@ -101,28 +101,28 @@ Licens: BSD (3-clause) Hemlig OTP-nyckel - + Length längd - + Length of the Token Längden av token - - + + Time Derivation (Seconds) Tidsavvikelsen (sekunder) - + Next Counter Value Nästa räknarvärde - + Next Value of the Counter Nästa värde på räknaren @@ -206,6 +206,12 @@ Licens: BSD (3-clause) Here you can export Tokens to a file. The exported file will be encrypted with AES-256-CBC and Base64 encoded. Choose a strong password, the file will contain the secrets used to generate the Tokens for your accounts. Pull left to start the export. Här kan du exportera Token till en fil. Den exporterade filen kommer att krypteras med AES-256-CBC och Base64. Välj ett starkt lösenord, filen kommer att innehålla hemligheterna som användes för att generera Token för ditt konto. Svep åt vänster för att starta exporten. + + + To view the content of the export file outside of SailOTP use the following openssl command: + Translated using Google Translate + Om du vill visa innehållet i exportfilen utanför SailOTP använder du följande openssl-kommando: + Error writing to file diff --git a/qml/pages/ExportPage.qml b/qml/pages/ExportPage.qml index d814fd1..131a60f 100644 --- a/qml/pages/ExportPage.qml +++ b/qml/pages/ExportPage.qml @@ -166,7 +166,7 @@ Dialog { wrapMode: Text.Wrap maximumLineCount: 15 - font.pixelSize: Theme.fontSizeSmall + font.pixelSize: Theme.fontSizeTiny color: Theme.secondaryColor visible: mode == "import" @@ -182,11 +182,11 @@ Dialog { wrapMode: Text.Wrap maximumLineCount: 15 - font.pixelSize: Theme.fontSizeSmall + font.pixelSize: Theme.fontSizeTiny color: Theme.secondaryColor visible: mode == "export" - text: qsTr("Here you can export Tokens to a file. The exported file will be encrypted with AES-256-CBC and Base64 encoded. Choose a strong password, the file will contain the secrets used to generate the Tokens for your accounts. Pull left to start the export.") + text: qsTr("Here you can export Tokens to a file. The exported file will be encrypted with AES-256-CBC and Base64 encoded. Choose a strong password, the file will contain the secrets used to generate the Tokens for your accounts. Pull left to start the export.")+"\n\n"+qsTr("To view the content of the export file outside of SailOTP use the following openssl command:") + "\n\nopenssl enc -d -a -A -md md5 -aes-256-cbc -in " } } }