[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[cblu]

The following commit has been merged in the debian/unstable branch:
commit d77f3c1e9fad43c3fdf073a27aa7fab7ee2e6e5e
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Dec 15 21:44:54 2003 +0000

    	Fixed: <rdar://problem/3505546>: always get keychain prompt when sending mail using cert downloaded with Safari
    
            Reviewed by john.
    
            * WebCoreSupport.subproj/WebKeyGeneration.cpp:
            (signedPublicKeyAndChallengeString): set up the SecAccessRef with "everything goes" restrictions
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5800 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index ae91055..25ee96a 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,12 @@
+2003-12-15  Chris Blumenberg  <cblu at apple.com>
+
+	Fixed: <rdar://problem/3505546>: always get keychain prompt when sending mail using cert downloaded with Safari
+
+        Reviewed by john.
+
+        * WebCoreSupport.subproj/WebKeyGeneration.cpp:
+        (signedPublicKeyAndChallengeString): set up the SecAccessRef with "everything goes" restrictions
+
 2003-12-14  Darin Adler  <darin at apple.com>
 
         Reviewed by Maciej.
diff --git a/WebKit/WebCoreSupport.subproj/WebKeyGeneration.cpp b/WebKit/WebCoreSupport.subproj/WebKeyGeneration.cpp
index a5d8a89..e6ccad2 100644
--- a/WebKit/WebCoreSupport.subproj/WebKeyGeneration.cpp
+++ b/WebKit/WebCoreSupport.subproj/WebKeyGeneration.cpp
@@ -265,6 +265,8 @@ CFStringRef signedPublicKeyAndChallengeString(unsigned keySize, CFStringRef chal
     unsigned char	*spkcB64 = NULL;		// base64 encoded encodedSpkc
     unsigned		spkcB64Len;
     SecAccessRef        accessRef;
+    CFArrayRef          acls;
+    SecACLRef           acl;
     CFStringRef         result = NULL;
     
     ortn = SecAccessCreate(keyDescription, NULL, &accessRef);
@@ -272,14 +274,27 @@ CFStringRef signedPublicKeyAndChallengeString(unsigned keySize, CFStringRef chal
         ERROR("***SecAccessCreate %d", ortn);
         goto errOut;
     }
-    /* Cook up a key pair, just use any old params for now */
-    ortn = SecKeyCreatePair(nil,		// in default KC
-                            GNR_KEY_ALG,					// normally spec'd by user
-                            keySize,				// key size, ditto
-                            0,								// ContextHandle
-                            CSSM_KEYUSE_ANY,				// might want to restrict this
+    ortn = SecAccessCopySelectedACLList(accessRef, CSSM_ACL_AUTHORIZATION_DECRYPT, &acls);
+    if (ortn) {
+        ERROR("***SecAccessCopySelectedACLList %d", ortn);
+        goto errOut;
+    }
+    acl = (SecACLRef)CFArrayGetValueAtIndex(acls, 0);
+    CFRelease(acls);
+    ortn = SecACLSetSimpleContents(acl, NULL, keyDescription, NULL);
+    if (ortn) {
+        ERROR("***SecACLSetSimpleContents %d", ortn);
+        goto errOut;
+    }
+    
+    // Cook up a key pair, just use any old params for now
+    ortn = SecKeyCreatePair(nil,                                        // in default KC
+                            GNR_KEY_ALG,                                // normally spec'd by user
+                            keySize,                                    // key size, ditto
+                            0,                                          // ContextHandle
+                            CSSM_KEYUSE_ANY,                            // might want to restrict this
                             CSSM_KEYATTR_PERMANENT | CSSM_KEYATTR_EXTRACTABLE | 
-                            CSSM_KEYATTR_RETURN_REF,	// pub attrs
+                            CSSM_KEYATTR_RETURN_REF,                    // pub attrs
                             CSSM_KEYUSE_ANY,				// might want to restrict this
                             CSSM_KEYATTR_SENSITIVE | CSSM_KEYATTR_RETURN_REF |
                             CSSM_KEYATTR_PERMANENT | CSSM_KEYATTR_EXTRACTABLE,

-- 
WebKit Debian packaging