summaryrefslogtreecommitdiffstats
path: root/keystore/java/android/security/CertTool.java
diff options
context:
space:
mode:
Diffstat (limited to 'keystore/java/android/security/CertTool.java')
-rw-r--r--keystore/java/android/security/CertTool.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/keystore/java/android/security/CertTool.java b/keystore/java/android/security/CertTool.java
index 79418bd..b1b78ea 100644
--- a/keystore/java/android/security/CertTool.java
+++ b/keystore/java/android/security/CertTool.java
@@ -72,7 +72,7 @@ public class CertTool {
private native String getPkcs12PrivateKey(int handle);
private native String popPkcs12CertificateStack(int handle);
private native void freePkcs12Handle(int handle);
- private native String generateCertificateRequest(int bits, String subject);
+ private native String generateCertificateRequest(int bits, String challenge);
private native boolean isPkcs12Keystore(byte[] data);
private native int generateX509Certificate(byte[] data);
private native boolean isCaCertificate(int handle);
@@ -124,7 +124,7 @@ public class CertTool {
public String generateKeyPair(int keyStrengthIndex, String challenge,
String dirName) {
return generateCertificateRequest(getKeyLength(keyStrengthIndex),
- dirName);
+ challenge);
}
private Intent prepareIntent(String title, byte[] data, String namespace,
@@ -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);
}