From 191452378639f1135c9591e21911ce250d140769 Mon Sep 17 00:00:00 2001
From: Chung-yih Wang <cywang@google.com>
Date: Tue, 28 Jul 2009 15:15:51 +0800
Subject: [PATCH] Forgot to convert the jstring to char* in certificate
 request.

---
 keystore/jni/certtool.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/keystore/jni/certtool.c b/keystore/jni/certtool.c
index 1ae8dab4281f5..b36b34a2c5517 100644
--- a/keystore/jni/certtool.c
+++ b/keystore/jni/certtool.c
@@ -30,13 +30,17 @@ jstring
 android_security_CertTool_generateCertificateRequest(JNIEnv* env,
                                                      jobject thiz,
                                                      jint bits,
-                                                     jstring subject)
+                                                     jstring jChallenge)
 
 {
+    int ret = -1;
+    jboolean bIsCopy;
     char csr[REPLY_MAX];
-    if (gen_csr(bits, subject, csr) == 0) {
-        return (*env)->NewStringUTF(env, csr);
-    }
+    const char* challenge = (*env)->GetStringUTFChars(env, jChallenge, &bIsCopy);
+
+    ret = gen_csr(bits, challenge , csr);
+    (*env)->ReleaseStringUTFChars(env, jChallenge, challenge);
+    if (ret == 0) return (*env)->NewStringUTF(env, csr);
     return NULL;
 }