diff options
| author | Chung-yih Wang <cywang@google.com> | 2009-07-28 18:37:13 +0800 |
|---|---|---|
| committer | Chung-yih Wang <cywang@google.com> | 2009-07-28 18:37:13 +0800 |
| commit | fd3db87e28e5b9ed186a15944234f6ff520773c6 (patch) | |
| tree | e21771e9cf7e20c51676f7a86ab659592441dffe /keystore | |
| parent | 191452378639f1135c9591e21911ce250d140769 (diff) | |
| download | frameworks_base-fd3db87e28e5b9ed186a15944234f6ff520773c6.zip frameworks_base-fd3db87e28e5b9ed186a15944234f6ff520773c6.tar.gz frameworks_base-fd3db87e28e5b9ed186a15944234f6ff520773c6.tar.bz2 | |
Support x509-user-cert mime type in browser.
+ Fix the public key matching and intent parameter mismatch.
Diffstat (limited to 'keystore')
| -rw-r--r-- | keystore/java/android/security/CertTool.java | 2 | ||||
| -rw-r--r-- | keystore/jni/cert.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/keystore/java/android/security/CertTool.java b/keystore/java/android/security/CertTool.java index 1de007d..b1b78ea 100644 --- a/keystore/java/android/security/CertTool.java +++ b/keystore/java/android/security/CertTool.java @@ -140,7 +140,7 @@ public class CertTool { private void addExtraIntentInfo(Intent intent, String namespace, String data) { - intent.putExtra(KEY_ITEM + "1", data); + intent.putExtra(KEY_ITEM + "1", data.getBytes()); intent.putExtra(KEY_NAMESPACE + "1", namespace); } diff --git a/keystore/jni/cert.c b/keystore/jni/cert.c index ea21b7d..006a0a3 100644 --- a/keystore/jni/cert.c +++ b/keystore/jni/cert.c @@ -46,7 +46,7 @@ static void save_in_store(EVP_PKEY *pkey) RSA *rsa = EVP_PKEY_get1_RSA(pkey); EVP_PKEY_set1_RSA(newpkey, rsa); PKEY_STORE_free(pkey_store[store_index]); - pkey_store[store_index].key_len = i2d_RSAPublicKey(rsa, &pkey_store[store_index].public_key); + pkey_store[store_index].key_len = i2d_RSA_PUBKEY(rsa, &pkey_store[store_index].public_key); pkey_store[store_index++].pkey = newpkey; store_index %= KEYGEN_STORE_SIZE; RSA_free(rsa); |