Import CUPS v2.0.0

[thirdparty/cups.git] / cups / tls-darwin.c

diff --git a/cups/tls-darwin.c b/cups/tls-darwin.c
index 9fa0465dc57a199e3570f53923fab4b56268ef3a..be788a608a69cf5c58ca78827478bf132895103a 100644 (file)
--- a/cups/tls-darwin.c
+++ b/cups/tls-darwin.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: tls-darwin.c 12029 2014-07-15 18:59:26Z msweet $"
+ * "$Id: tls-darwin.c 12159 2014-09-23 14:56:14Z msweet $"
  *
  * TLS support code for CUPS on OS X.
  *
@@ -15,7 +15,7 @@
  * This file is subject to the Apple OS-Developed Software exception.
  */
 
-/**** This file is included from http.c ****/
+/**** This file is included from tls.c ****/
 
 /*
  * Include necessary headers...
@@ -61,7 +61,7 @@ static OSStatus               http_cdsa_write(SSLConnectionRef connection, const void *data,
 /*
  * 'cupsMakeServerCredentials()' - Make a self-signed certificate and private key pair.
  *
- * @since CUPS 2.0@
+ * @since CUPS 2.0/OS 10.10@
  */
 
 int                                    /* O - 1 on success, 0 on failure */
@@ -283,7 +283,7 @@ cleanup:
  * Note: The server credentials are used by all threads in the running process.
  * This function is threadsafe.
  *
- * @since CUPS 2.0@
+ * @since CUPS 2.0/OS X 10.10@
  */
 
 int                                    /* O - 1 on success, 0 on failure */
@@ -452,7 +452,7 @@ _httpCreateCredentials(
 /*
  * 'httpCredentialsAreValidForName()' - Return whether the credentials are valid for the given name.
  *
- * @since CUPS 2.0@
+ * @since CUPS 2.0/OS X 10.10@
  */
 
 int                                    /* O - 1 if valid, 0 otherwise */
@@ -515,7 +515,7 @@ httpCredentialsAreValidForName(
 /*
  * 'httpCredentialsGetTrust()' - Return the trust of credentials.
  *
- * @since CUPS 2.0@
+ * @since CUPS 2.0/OS X 10.10@
  */
 
 http_trust_t                           /* O - Level of trust */
@@ -599,7 +599,7 @@ httpCredentialsGetTrust(
 /*
  * 'httpCredentialsGetExpiration()' - Return the expiration date of the credentials.
  *
- * @since CUPS 2.0@
+ * @since CUPS 2.0/OS X 10.10@
  */
 
 time_t                                 /* O - Expiration date of credentials */
@@ -624,7 +624,7 @@ httpCredentialsGetExpiration(
 /*
  * 'httpCredentialsString()' - Return a string representing the credentials.
  *
- * @since CUPS 2.0@
+ * @since CUPS 2.0/OS X 10.10@
  */
 
 size_t                                 /* O - Total size of credentials string */
@@ -697,7 +697,7 @@ _httpFreeCredentials(
 /*
  * 'httpLoadCredentials()' - Load X.509 credentials from a keychain file.
  *
- * @since CUPS 2.0@
+ * @since CUPS 2.0/OS 10.10@
  */
 
 int                                    /* O - 0 on success, -1 on error */
@@ -803,7 +803,7 @@ httpLoadCredentials(
 /*
  * 'httpSaveCredentials()' - Save X.509 credentials to a keychain file.
  *
- * @since CUPS 2.0@
+ * @since CUPS 2.0/OS 10.10@
  */
 
 int                                    /* O - -1 on error, 0 on success */
@@ -1660,5 +1660,5 @@ http_cdsa_write(
 
 
 /*
- * End of "$Id: tls-darwin.c 12029 2014-07-15 18:59:26Z msweet $".
+ * End of "$Id: tls-darwin.c 12159 2014-09-23 14:56:14Z msweet $".
  */