commit 556cc306ee7e040338000fbaa461da228e53cbf4
author Jeff Thompson <jefft0@gmail.com> Tue Oct 22 17:40:07 2013 -0700
committer Jeff Thompson <jefft0@gmail.com> Tue Oct 22 17:40:07 2013 -0700
tree 49e5263fb5bf08fdcc7a4b14515b8176fc15cfbb
parent 43a57b1e0ee1530d50157b4cf8086caadc144cbe

security: OSXPrivateKeyStorage: When calling CFStringCreateWithCString, need to use kCFStringEncodingUTF8.

src/security/identity/osx-private-key-storage.cpp

diff --git a/src/security/identity/osx-private-key-storage.cpp b/src/security/identity/osx-private-key-storage.cpp
index 136d054..f4fac6c 100644
--- a/src/security/identity/osx-private-key-storage.cpp
+++ b/src/security/identity/osx-private-key-storage.cpp
@@ -70,8 +70,8 @@
     SecKeyRef publicKey, privateKey;
 
     CFStringRef keyLabel = CFStringCreateWithCString(NULL, 
-                                                      keyNameUri.c_str(), 
-                                                      keyNameUri.size());
+                                                     keyNameUri.c_str(), 
+                                                     kCFStringEncodingUTF8);
     
     CFMutableDictionaryRef attrDict = CFDictionaryCreateMutable(NULL,
                                                              3,
@@ -108,8 +108,8 @@
                                                                 &kCFTypeDictionaryValueCallBacks);
 
     CFStringRef keyLabel = CFStringCreateWithCString(NULL, 
-                                                      keyNameUri.c_str(), 
-                                                      keyNameUri.size());
+                                                     keyNameUri.c_str(), 
+                                                     kCFStringEncodingUTF8);
 
     CFDictionaryAddValue(attrDict, kSecAttrKeyType, getSymKeyType(keyType));
     CFDictionaryAddValue(attrDict, kSecAttrKeySizeInBits, CFNumberCreate(kCFAllocatorDefault, kCFNumberSInt32Type, &keySize));
@@ -368,8 +368,8 @@
     string keyNameUri = toInternalKeyName(keyName, keyClass);
 
     CFStringRef keyLabel = CFStringCreateWithCString(NULL, 
-                                                      keyNameUri.c_str(), 
-                                                      keyNameUri.size());
+                                                     keyNameUri.c_str(), 
+                                                     kCFStringEncodingUTF8);
     
     CFMutableDictionaryRef attrDict = CFDictionaryCreateMutable(NULL,
                                                                 3,
@@ -394,9 +394,9 @@
   {
     string keyNameUri = toInternalKeyName(keyName, keyClass);
 
-    CFStringRef keyLabel = CFStringCreateWithCString (NULL, 
-                                                      keyNameUri.c_str(), 
-                                                      keyNameUri.size());
+    CFStringRef keyLabel = CFStringCreateWithCString(NULL, 
+                                                     keyNameUri.c_str(), 
+                                                     kCFStringEncodingUTF8);
     
     CFMutableDictionaryRef attrDict = CFDictionaryCreateMutable(NULL,
                                                              5,