Initial work on SSPI support in 2.0.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@12029 a1ca3aef-8c08-0410-bb20-df032aa958be

1 files changed, 16 insertions, 15 deletions

diff --git a/cups/tls-darwin.c b/cups/tls-darwin.c
index 7daa291d2..fc2028523 100644
--- a/cups/tls-darwin.c
+++ b/cups/tls-darwin.c
@@ -51,6 +51,7 @@ static _cups_mutex_t	tls_mutex = _CUPS_MUTEX_INITIALIZER;
 #ifdef HAVE_SECKEYCHAINOPEN
 static CFArrayRef	http_cdsa_copy_server(const char *common_name);
 #endif /* HAVE_SECKEYCHAINOPEN */
+static SecCertificateRef http_cdsa_create_credential(http_credential_t *credential);
 static const char	*http_cdsa_default_path(char *buffer, size_t bufsize);
 static OSStatus		http_cdsa_read(SSLConnectionRef connection, void *data, size_t *dataLength);
 static int		http_cdsa_set_credentials(http_t *http);
@@ -413,21 +414,6 @@ httpCopyCredentials(
 
 
 /*
- * 'http_cdsa_create_credential()' - Create a single credential in the internal format.
- */
-
-static SecCertificateRef			/* O - Certificate */
-http_cdsa_create_credential(
-    http_credential_t *credential)		/* I - Credential */
-{
-  if (!credential)
-    return (NULL);
-
-  return (SecCertificateCreateWithBytes(kCFAllocatorDefault, credential->data, (CFIndex)credential->datalen));
-}
-
-
-/*
  * '_httpCreateCredentials()' - Create credentials in the internal format.
  */
 
@@ -1492,6 +1478,21 @@ http_cdsa_copy_server(
 
 
 /*
+ * 'http_cdsa_create_credential()' - Create a single credential in the internal format.
+ */
+
+static SecCertificateRef			/* O - Certificate */
+http_cdsa_create_credential(
+    http_credential_t *credential)		/* I - Credential */
+{
+  if (!credential)
+    return (NULL);
+
+  return (SecCertificateCreateWithBytes(kCFAllocatorDefault, credential->data, (CFIndex)credential->datalen));
+}
+
+
+/*
  * 'http_cdsa_default_path()' - Get the default keychain path.
  */