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.

diff --git a/src/libcharon/plugins/android/android_creds.c b/src/libcharon/plugins/android/android_creds.c
index 0018496154283e3d0bdedb8aac39530fcfd3cf76..aa7fc6f922f8ba557d675762608b4b786c8a064b 100644 (file)
--- 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 */