diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-28 10:46:58 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-28 10:46:58 +0200 |
commit | b193965e585d0d492cf2744e3c86ecc9e45b71d4 (patch) | |
tree | a9c98de01980211258bb31d9d190ec973418744c /OpenKeychain/src/main/res | |
parent | 4aeacd5b51bed1358b2775aff6b2fc2a6d218165 (diff) | |
parent | 783dae8804fee1f1594cc910d3570fcf6178015c (diff) | |
download | open-keychain-b193965e585d0d492cf2744e3c86ecc9e45b71d4.tar.gz open-keychain-b193965e585d0d492cf2744e3c86ecc9e45b71d4.tar.bz2 open-keychain-b193965e585d0d492cf2744e3c86ecc9e45b71d4.zip |
Merge pull request #796 from open-keychain/develop
ECC support
Diffstat (limited to 'OpenKeychain/src/main/res')
-rw-r--r-- | OpenKeychain/src/main/res/layout/add_subkey_dialog.xml | 20 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 26 |
2 files changed, 42 insertions, 4 deletions
diff --git a/OpenKeychain/src/main/res/layout/add_subkey_dialog.xml b/OpenKeychain/src/main/res/layout/add_subkey_dialog.xml index e1ccfee1f..7af73be09 100644 --- a/OpenKeychain/src/main/res/layout/add_subkey_dialog.xml +++ b/OpenKeychain/src/main/res/layout/add_subkey_dialog.xml @@ -34,7 +34,7 @@ android:padding="4dp" /> </TableRow> - <TableRow> + <TableRow android:id="@+id/add_subkey_row_size"> <TextView android:layout_width="wrap_content" @@ -50,6 +50,24 @@ android:padding="4dp" /> </TableRow> + <TableRow + android:id="@+id/add_subkey_row_curve" + android:visibility="gone"> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:text="@string/label_ecc_curve"/> + + <Spinner + android:id="@+id/add_subkey_curve" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:gravity="right" + android:padding="4dp"/> + </TableRow> + <TextView android:id="@+id/add_subkey_custom_key_size_label" android:layout_width="wrap_content" diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 8b92db4cd..d31a08081 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -109,6 +109,7 @@ <string name="label_expiry">Expiry</string> <string name="label_usage">Usage</string> <string name="label_key_size">Key Size</string> + <string name="label_ecc_curve">Elliptic Curve</string> <string name="label_main_user_id">Primary identity</string> <string name="label_name">Name</string> <string name="label_comment">Comment</string> @@ -156,6 +157,8 @@ <string name="dsa">DSA</string> <string name="elgamal">ElGamal</string> <string name="rsa">RSA</string> + <string name="ecdh">ECDH</string> + <string name="ecdsa">ECDSA</string> <string name="filemanager_title_open">Open…</string> <string name="warning">Warning</string> <string name="error">Error</string> @@ -268,6 +271,8 @@ <string name="progress_generating_rsa">generating new RSA key…</string> <string name="progress_generating_dsa">generating new DSA key…</string> <string name="progress_generating_elgamal">generating new ElGamal key…</string> + <string name="progress_generating_ecdsa">generating new ECDSA key…</string> + <string name="progress_generating_ecdh">generating new ECDH key…</string> <string name="progress_modify">modifying keyring…</string> @@ -324,6 +329,16 @@ <string name="key_size_custom_info_rsa">RSA key length must be greater than 1024 and at most 16384. Also it must be multiplicity of 8.</string> <string name="key_size_custom_info_dsa">DSA key length must be at least 512 and at most 1024. Also it must be multiplicity of 64.</string> + <!-- elliptic curve names --> + <string name="key_curve_nist_p256">NIST P-256</string> + <string name="key_curve_nist_p384">NIST P-384</string> + <string name="key_curve_nist_p521">NIST P-521</string> + <!-- not in for now, see SaveKeyringParcel + <string name="key_curve_bp_p256">Brainpool P-256</string> + <string name="key_curve_bp_p384">Brainpool P-384</string> + <string name="key_curve_bp_p512">Brainpool P-512</string> + --> + <!-- compression --> <string name="compression_fast">fast</string> <string name="compression_very_slow">very slow</string> @@ -638,9 +653,14 @@ <string name="msg_cr_error_no_certify">Master key must have certify flag!</string> <string name="msg_cr_error_null_expiry">Expiry time cannot be "same as before" on key creation. This is a programming error, please file a bug report!</string> <string name="msg_cr_error_keysize_512">Key size must be greater or equal 512!</string> + <string name="msg_cr_error_no_curve">No key size specified! This is a programming error, please file a bug report!</string> + <string name="msg_cr_error_no_keysize">No elliptic curve specified! This is a programming error, please file a bug report!</string> <string name="msg_cr_error_internal_pgp">Internal PGP error!</string> - <string name="msg_cr_error_unknown_algo">Bad algorithm choice!</string> - <string name="msg_cr_error_master_elgamal">Master key must not be of type ElGamal!</string> + <string name="msg_cr_error_unknown_algo">Unknown algorithm selected! This is a programming error, please file a bug report!</string> + <string name="msg_cr_error_flags_dsa">Bad key flags selected, DSA cannot be used for encryption!</string> + <string name="msg_cr_error_flags_elgamal">Bad key flags selected, ElGamal cannot be used for signing!</string> + <string name="msg_cr_error_flags_ecdsa">Bad key flags selected, ECDSA cannot be used for encryption!</string> + <string name="msg_cr_error_flags_ecdh">Bad key flags selected, ECDH cannot be used for signing!</string> <!-- modifySecretKeyRing --> <string name="msg_mr">Modifying keyring %s</string> @@ -665,7 +685,7 @@ <string name="msg_mf_primary_new">Generating new certificate for new primary user id</string> <string name="msg_mf_subkey_change">Modifying subkey %s</string> <string name="msg_mf_error_subkey_missing">Tried to operate on missing subkey %s!</string> - <string name="msg_mf_subkey_new">Adding new subkey of type %2$s (%1$s bit)</string> + <string name="msg_mf_subkey_new">Adding new subkey of type %s</string> <string name="msg_mf_subkey_new_id">New subkey ID: %s</string> <string name="msg_mf_error_past_expiry">Expiry date cannot be in the past!</string> <string name="msg_mf_subkey_revoke">Revoking subkey %s</string> |