Reviewed by Don.

	- move private gunk from header to implementation file.

        * WebCoreSupport.subproj/WebNewKeyGeneration.c:
        * WebCoreSupport.subproj/WebNewKeyGeneration.h:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@9262 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 043d8a47e1c7b358ae6d3e04f7c2bdb882a3b086..de91cec8f20eede1847b29960c41a917046d48c8 100644 (file)
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,12 @@
+2005-06-02  Maciej Stachowiak  <mjs@apple.com>
+
+        Reviewed by Don.
+
+       - move private gunk from header to implementation file.
+       
+        * WebCoreSupport.subproj/WebNewKeyGeneration.c:
+        * WebCoreSupport.subproj/WebNewKeyGeneration.h:
+
 2005-06-02  Maciej Stachowiak  <mjs@apple.com>
 
         Reviewed by Kevin.

diff --git a/WebKit/WebCoreSupport.subproj/WebNewKeyGeneration.c b/WebKit/WebCoreSupport.subproj/WebNewKeyGeneration.c
index f0059ba7382c977e850b799cf29cca50422fe14d..ed1da0a51e4de46f52dd45e9f17d00ee1a034f64 100644 (file)
--- a/WebKit/WebCoreSupport.subproj/WebNewKeyGeneration.c
+++ b/WebKit/WebCoreSupport.subproj/WebNewKeyGeneration.c
@@ -11,6 +11,60 @@
 
 #ifdef USE_NEW_KEY_GENERATION
 
+#import <Security/asn1Templates.h>
+#import <Security/SecAsn1Coder.h>
+#import <Security/secasn1t.h>
+#import <Security/Security.h>
+
+/*
+ * Netscape Certifiate Sequence is defined by Netscape as a PKCS7
+ * ContentInfo with a contentType of netscape-cert-sequence and a content
+ * consisting of a sequence of certificates.
+ *
+ * For simplicity - i.e., to avoid the general purpose ContentInfo
+ * polymorphism - we'll just hard-code this particular type right here.
+ *
+ * Inside the ContentInfo is an array of standard X509 certificates.
+ * We don't need to parse the certs themselves so they remain as
+ * opaque data blobs.
+ */
+typedef struct {
+  CSSM_OID              contentType;            // netscape-cert-sequence
+  CSSM_DATA             **certs;
+} NetscapeCertSequence;
+
+extern const SecAsn1Template NetscapeCertSequenceTemplate[];
+
+/*
+ * Public key/challenge, to send to CA.
+ *
+ * PublicKeyAndChallenge ::= SEQUENCE {
+ *
+ * ???\200?     spki SubjectPublicKeyInfo,
+ *      challenge IA5STRING
+ * }
+ *
+ * SignedPublicKeyAndChallenge ::= SEQUENCE {
+ *              publicKeyAndChallenge PublicKeyAndChallenge,
+ *              signatureAlgorithm AlgorithmIdentifier,
+ *              signature BIT STRING
+ * }
+ */
+typedef struct {
+  CSSM_X509_SUBJECT_PUBLIC_KEY_INFO     spki;
+  CSSM_DATA                                                     challenge;      // ASCII
+} PublicKeyAndChallenge;
+
+typedef struct {
+  PublicKeyAndChallenge                         pubKeyAndChallenge;
+  CSSM_X509_ALGORITHM_IDENTIFIER                algId;
+  CSSM_DATA                                                     signature; // length in BITS
+} SignedPublicKeyAndChallenge;
+
+extern const SecAsn1Template PublicKeyAndChallengeTemplate[];
+extern const SecAsn1Template SignedPublicKeyAndChallengeTemplate[];
+
+
 #import <WebKit/WebAssertions.h>
 
 #import <Security/keyTemplates.h>

diff --git a/WebKit/WebCoreSupport.subproj/WebNewKeyGeneration.h b/WebKit/WebCoreSupport.subproj/WebNewKeyGeneration.h
index e3ae9d1aa18f7b82be9791b782d8c570d1dc276f..5bb3852c9629b30498bcbbec8d6e71066648d2e6 100644 (file)
--- a/WebKit/WebCoreSupport.subproj/WebNewKeyGeneration.h
+++ b/WebKit/WebCoreSupport.subproj/WebNewKeyGeneration.h
@@ -16,63 +16,9 @@
 
 #import <CoreFoundation/CoreFoundation.h>
 
-#import <Security/asn1Templates.h>
-#import <Security/SecAsn1Coder.h>
-#import <Security/secasn1t.h>
-#import <Security/Security.h>
-
 #ifdef __cplusplus
 extern "C" {
 #endif
-    
-    /* 
-    * Netscape Certifiate Sequence is defined by Netscape as a PKCS7
-     * ContentInfo with a contentType of netscape-cert-sequence and a content
-     * consisting of a sequence of certificates.
-     *
-     * For simplicity - i.e., to avoid the general purpose ContentInfo
-     * polymorphism - we'll just hard-code this particular type right here.
-     *
-     * Inside the ContentInfo is an array of standard X509 certificates.
-     * We don't need to parse the certs themselves so they remain as 
-     * opaque data blobs. 
-     */
-    typedef struct {
-        CSSM_OID               contentType;            // netscape-cert-sequence
-        CSSM_DATA              **certs;
-    } NetscapeCertSequence;
-    
-    extern const SecAsn1Template NetscapeCertSequenceTemplate[];
-    
-    /*
-     * Public key/challenge, to send to CA.
-     *
-     * PublicKeyAndChallenge ::= SEQUENCE {
-         *
-         *         spki SubjectPublicKeyInfo,
-         *     challenge IA5STRING
-         * }
-     *
-     * SignedPublicKeyAndChallenge ::= SEQUENCE {
-         *             publicKeyAndChallenge PublicKeyAndChallenge,
-         *             signatureAlgorithm AlgorithmIdentifier,
-         *             signature BIT STRING
-         * }
-     */
-    typedef struct {
-        CSSM_X509_SUBJECT_PUBLIC_KEY_INFO      spki;
-        CSSM_DATA                                                      challenge;      // ASCII
-    } PublicKeyAndChallenge;
-    
-    typedef struct {
-        PublicKeyAndChallenge                          pubKeyAndChallenge;
-        CSSM_X509_ALGORITHM_IDENTIFIER         algId;
-        CSSM_DATA                                                      signature; // length in BITS
-    } SignedPublicKeyAndChallenge;
-    
-    extern const SecAsn1Template PublicKeyAndChallengeTemplate[];
-    extern const SecAsn1Template SignedPublicKeyAndChallengeTemplate[];
-
     CFStringRef signedPublicKeyAndChallengeString(unsigned keySize, CFStringRef challenge, CFStringRef keyDescription);
     WebCertificateParseResult addCertificatesToKeychainFromData(const void *bytes, unsigned length);