From 0f21ebc81d65aa4e959578ca08e0c8293211622c Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Mon, 28 Jun 2010 17:18:53 +0200 Subject: The signature of keystore_get changed again. With Android 2.2 (Froyo) the interface of keystore_get was changed once again. The change was made to allow the keys to contain \0 characters. --- src/libcharon/plugins/android/android_creds.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/libcharon/plugins/android') diff --git a/src/libcharon/plugins/android/android_creds.c b/src/libcharon/plugins/android/android_creds.c index 001849615..aa7fc6f92 100644 --- a/src/libcharon/plugins/android/android_creds.c +++ b/src/libcharon/plugins/android/android_creds.c @@ -200,9 +200,11 @@ METHOD(android_creds_t, add_certificate, bool, bool status = FALSE; chunk_t chunk; #ifdef KEYSTORE_MESSAGE_SIZE + /* most current interface, the eclair interface (without key length) is + * currently not supported */ char value[KEYSTORE_MESSAGE_SIZE]; chunk.ptr = value; - chunk.len = keystore_get(name, chunk.ptr); + chunk.len = keystore_get(name, strlen(name), chunk.ptr); if (chunk.len > 0) #else /* 1.6 interface, allocates memory */ -- cgit v1.2.3