diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-03-04 18:34:42 +0100 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-03-04 18:34:42 +0100 |
| commit | 17a627919c967fa0a46a913c5229e3ff56ffb5b5 (patch) | |
| tree | bbaf1c63ea54cc0a5677d76cfca58da42eab328d /OpenKeychain/src/main/res/raw | |
| parent | fcc819d437960c380c3f852bd508a391bbda9c9c (diff) | |
| download | open-keychain-17a627919c967fa0a46a913c5229e3ff56ffb5b5.tar.gz open-keychain-17a627919c967fa0a46a913c5229e3ff56ffb5b5.tar.bz2 open-keychain-17a627919c967fa0a46a913c5229e3ff56ffb5b5.zip | |
Simplified language: Confirm keys
Diffstat (limited to 'OpenKeychain/src/main/res/raw')
| -rw-r--r-- | OpenKeychain/src/main/res/raw/help_certification.html | 32 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/raw/help_faq.html | 24 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/raw/help_nfc_beam.html | 16 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/raw/help_start.html | 10 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/raw/help_wot.html | 21 |
5 files changed, 39 insertions, 64 deletions
diff --git a/OpenKeychain/src/main/res/raw/help_certification.html b/OpenKeychain/src/main/res/raw/help_certification.html new file mode 100644 index 000000000..19ca85b4f --- /dev/null +++ b/OpenKeychain/src/main/res/raw/help_certification.html @@ -0,0 +1,32 @@ +<!-- Maintain structure with headings with h2 tags and content with p tags. +This makes it easy to translate the values with transifex! +And don't add newlines before or after p tags because of transifex --> +<html> +<head> +</head> +<body> + +<h2>Key Confirmation</h2> +Without confirmation, you cannot be sure if a key really corresponds to a specific person. +The most simplest way to confirm a key is by scanning the QR Code or exchanging it via NFC. +To confirm keys between more than two persons, we suggest to use the key exchange method available for your keys. + +<h2>Key Status</h2> +<p><img src="status_signature_verified_cutout_24px"/><br/>Confirmed: You have already confirmed this key, e.g., by scanning the QR Code. +<br/><img src="status_signature_unverified_cutout_24px"/><br/>Unconfirmed: This key has not been confirmed yet. You cannot be sure if the key really corresponds to a specific person. +<br/><img src="status_signature_expired_cutout_24px"/><br/>Expired: This key is no longer valid. Only the owner can extend its validity. +<br/><img src="status_signature_revoked_cutout_24px"/><br/>Revoked: This key is no longer valid. It has been revoked by its owner.</p> + +<h2>Advanced Information</h2> +<p>A "key confirmation" in OpenKeychain is implemented by creating a certification according to the OpenPGP standard. +This certification is a <a href="http://tools.ietf.org/html/rfc4880#section-5.2.1">"generic certification (0x10)"</a> described in the standard by: +"The issuer of this certification does not make any particular assertion as to how well the certifier has checked that the owner of the key is in fact the person described by the User ID."</p> + +<p>Traditionally, certifications (often with higher certification levels, such as "positive certifications" (0x13)) are organized in OpenPGP's Web of Trust. +Our model of key confirmation is a much simpler concept to avoid common usability problems related to this Web of Trust. +We assume that keys are verified only to a certain degree that is still usable enough to be executed "on the go". +We also do not implement (potentially transitive) trust signatures or any other internal trust model. +Furthermore, keys which contain at least one user ID certified by a trusted key will be marked as "confirmed" in the key listings.</p> + +</body> +</html> diff --git a/OpenKeychain/src/main/res/raw/help_faq.html b/OpenKeychain/src/main/res/raw/help_faq.html deleted file mode 100644 index 094065909..000000000 --- a/OpenKeychain/src/main/res/raw/help_faq.html +++ /dev/null @@ -1,24 +0,0 @@ -<!-- Maintain structure with headings with h2 tags and content with p tags. -This makes it easy to translate the values with transifex! -And don't add newlines before or after p tags because of transifex --> -<html> -<head> -</head> -<body> -<h2>How can I specify connection port for Keyserver?</h2> -<p>Add a new Keyserver (or modify existing one) by going to Preferences -> General -> Keyservers. Enter the port number after the Keyserver address and preceded it by a colon. For example, "p80.pool.sks-keyservers.net:80" (without quotation marks) means that server "p80.pool.sks-keyservers.net" is working on a port 80.</p> -<p>Default connection port is 11371 and it doesn't need to be specified.</p> - -<h2>A wrong primary user id is shown when searching on a Keyserver</h2> -<p>Unfortunately, this is a bug in the SKS Keyserver software. Its machine-readable output returns the user ids in an arbitrary order. Read the <a href="https://bitbucket.org/skskeyserver/sks-keyserver/issue/28/primary-uid-in-machine-readable-index">related bug report</a> for more information.</p> - -<h2>How do I activate OpenKeychain in K-9 Mail?</h2> -<p>To use OpenKeychain with K-9 Mail, you want to follow these steps:</p> -<ol> - <li>Open K-9 Mail and long-tap on the account you want to use OpenKeychain with.</li> - <li>Select "Account settings" and scroll to the very bottom and click "Cryptography".</li> - <li>Click on "OpenPGP Provider" and select OpenKeychain from the list.</li> -</ol> -<p>Thats it.</p> -</body> -</html> diff --git a/OpenKeychain/src/main/res/raw/help_nfc_beam.html b/OpenKeychain/src/main/res/raw/help_nfc_beam.html deleted file mode 100644 index 30060a897..000000000 --- a/OpenKeychain/src/main/res/raw/help_nfc_beam.html +++ /dev/null @@ -1,16 +0,0 @@ -<!-- Maintain structure with headings with h2 tags and content with p tags. -This makes it easy to translate the values with transifex! -And don't add newlines before or after p tags because of transifex --> -<html> -<head> -</head> -<body> -<h2>How to receive keys</h2> -<ol> -<li>Go to your partners keys and open the key you want to share.</li> -<li>Hold the two devices back to back (they have to be almost touching) and you’ll feel a vibration.</li> -<li>After it vibrates you’ll see the content on your partners device turn into a card-like object with Star Trek warp speed-looking animation in the background.</li> -<li>Tap the card and the content will then load on the your device.</li> -</ol> -</body> -</html> diff --git a/OpenKeychain/src/main/res/raw/help_start.html b/OpenKeychain/src/main/res/raw/help_start.html index 75fe9de26..0a30cbd92 100644 --- a/OpenKeychain/src/main/res/raw/help_start.html +++ b/OpenKeychain/src/main/res/raw/help_start.html @@ -5,10 +5,14 @@ And don't add newlines before or after p tags because of transifex --> <head> </head> <body> -<h2>Getting started</h2> -<p>First you need a personal key. Create one via the menu in "Keys" or import existing secret keys. Afterwards, you can download your friends' keys or exchange them via QR Codes or NFC.</p> -<p>On Android lower 4.4, it is recommended that you install <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> for enhanced file selection.</p> +<h2>How do I activate OpenKeychain in K-9 Mail?</h2> +<p>To use OpenKeychain with K-9 Mail, you want to follow these steps:</p> +<ol> + <li>Open K-9 Mail and long-tap on the account you want to use OpenKeychain with.</li> + <li>Select "Account settings" and scroll to the very bottom and click "Cryptography".</li> + <li>Click on "OpenPGP Provider" and select OpenKeychain from the list.</li> +</ol> <h2>I found a bug in OpenKeychain!</h2> <p>Please report the bug using the <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">issue tracker of OpenKeychain</a>.</p> diff --git a/OpenKeychain/src/main/res/raw/help_wot.html b/OpenKeychain/src/main/res/raw/help_wot.html deleted file mode 100644 index d2ce4a7ae..000000000 --- a/OpenKeychain/src/main/res/raw/help_wot.html +++ /dev/null @@ -1,21 +0,0 @@ -<!-- Maintain structure with headings with h2 tags and content with p tags. -This makes it easy to translate the values with transifex! -And don't add newlines before or after p tags because of transifex --> -<html> -<head> -</head> -<body> -<h2>Web of Trust</h2> -<p>The Web of Trust describes the part of OpenPGP which deals with creation and bookkeeping of certifications. It provides mechanisms to help the user keep track of who a public key belongs to, and share this information with others; To ensure the privacy of encrypted communication, it is essential to know that the public key you encrypt to belongs to the person you think it does.</p> - -<h2>Support in OpenKeychain</h2> -<p>There is only basic support for Web of Trust in OpenKeychain. This is a heavy work in progress and subject to changes in upcoming releases.</p> - -<h2>Trust Model</h2> -<p>Trust evaluation is based on the simple assumption that all keys which have secret keys available are trusted. Public keys which contain at least one user id certified by a trusted key will be marked with a green dot in the key listings. It is not (yet) possible to specify trust levels for certificates of other known public keys.</p> - -<h2>Certifying keys</h2> -<p>Support for key certification is available, and user ids can be certified individually. It is not yet possible to specify the level of trust or create local and other special types of certificates.</p> - -</body> -</html> |