From: Michael R Sweet Date: Fri, 23 Aug 2019 15:16:26 +0000 (-0400) Subject: Clean up versioning and API documentation. X-Git-Tag: v2.3.0~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c669a17e64c80e9faf6f36b70f9c91f1720a1c0d;p=thirdparty%2Fcups.git Clean up versioning and API documentation. --- diff --git a/cups/dest-options.c b/cups/dest-options.c index f4d75105cc..8c5fe666c4 100644 --- a/cups/dest-options.c +++ b/cups/dest-options.c @@ -59,7 +59,7 @@ static void cups_update_ready(http_t *http, cups_dinfo_t *dinfo); /* * 'cupsAddDestMediaOptions()' - Add the option corresponding to the specified media size. * - * @since CUPS 2.3@ + * @since CUPS 2.3/macOS 10.14@ */ int /* O - New number of options */ diff --git a/cups/encode.c b/cups/encode.c index bda910be7f..2469406e2f 100644 --- a/cups/encode.c +++ b/cups/encode.c @@ -1,7 +1,7 @@ /* * Option encoding routines for CUPS. * - * Copyright © 2007-2018 by Apple Inc. + * Copyright © 2007-2019 by Apple Inc. * Copyright © 1997-2007 by Easy Software Products. * * Licensed under Apache License v2.0. See the file "LICENSE" for more @@ -673,7 +673,7 @@ _cupsEncodeOption( /* * 'cupsEncodeOption()' - Encode a single option into an IPP attribute. * - * @since CUPS 2.3@ + * @since CUPS 2.3/macOS 10.14@ */ ipp_attribute_t * /* O - New attribute or @code NULL@ on error */ diff --git a/cups/tls-darwin.c b/cups/tls-darwin.c index f18ff215fa..e8c4fb713f 100644 --- a/cups/tls-darwin.c +++ b/cups/tls-darwin.c @@ -15,32 +15,7 @@ */ #include - -extern char **environ; - - -#ifndef _SECURITY_VERSION_GREATER_THAN_57610_ -typedef CF_OPTIONS(uint32_t, SecKeyUsage) { - kSecKeyUsageAll = 0x7FFFFFFF -}; -#endif /* !_SECURITY_VERSION_GREATER_THAN_57610_ */ -extern const void * kSecCSRChallengePassword; -extern const void * kSecSubjectAltName; -extern const void * kSecCertificateKeyUsage; -extern const void * kSecCSRBasicContraintsPathLen; -extern const void * kSecCertificateExtensions; -extern const void * kSecCertificateExtensionsEncoded; -extern const void * kSecOidCommonName; -extern const void * kSecOidCountryName; -extern const void * kSecOidStateProvinceName; -extern const void * kSecOidLocalityName; -extern const void * kSecOidOrganization; -extern const void * kSecOidOrganizationalUnit; -extern bool SecCertificateIsValid(SecCertificateRef certificate, CFAbsoluteTime verifyTime); -extern CFAbsoluteTime SecCertificateNotValidAfter(SecCertificateRef certificate); -extern SecCertificateRef SecGenerateSelfSignedCertificate(CFArrayRef subject, CFDictionaryRef parameters, SecKeyRef publicKey, SecKeyRef privateKey); -extern SecIdentityRef SecIdentityCreate(CFAllocatorRef allocator, SecCertificateRef certificate, SecKeyRef privateKey); - +#include "tls-darwin.h" /* * Constants, very secure stuff... diff --git a/cups/tls-darwin.h b/cups/tls-darwin.h new file mode 100644 index 0000000000..ca4136e3ac --- /dev/null +++ b/cups/tls-darwin.h @@ -0,0 +1,35 @@ +/* + * TLS support header for CUPS on macOS. + * + * Copyright © 2007-2019 by Apple Inc. + * Copyright © 1997-2007 by Easy Software Products, all rights reserved. + * + * Licensed under Apache License v2.0. See the file "LICENSE" for more + * information. + */ + +/**** This file is included from tls-darwin.c ****/ + +extern char **environ; + +#ifndef _SECURITY_VERSION_GREATER_THAN_57610_ +typedef CF_OPTIONS(uint32_t, SecKeyUsage) { + kSecKeyUsageAll = 0x7FFFFFFF +}; +#endif /* !_SECURITY_VERSION_GREATER_THAN_57610_ */ +extern const void * kSecCSRChallengePassword; +extern const void * kSecSubjectAltName; +extern const void * kSecCertificateKeyUsage; +extern const void * kSecCSRBasicContraintsPathLen; +extern const void * kSecCertificateExtensions; +extern const void * kSecCertificateExtensionsEncoded; +extern const void * kSecOidCommonName; +extern const void * kSecOidCountryName; +extern const void * kSecOidStateProvinceName; +extern const void * kSecOidLocalityName; +extern const void * kSecOidOrganization; +extern const void * kSecOidOrganizationalUnit; +extern bool SecCertificateIsValid(SecCertificateRef certificate, CFAbsoluteTime verifyTime); +extern CFAbsoluteTime SecCertificateNotValidAfter(SecCertificateRef certificate); +extern SecCertificateRef SecGenerateSelfSignedCertificate(CFArrayRef subject, CFDictionaryRef parameters, SecKeyRef publicKey, SecKeyRef privateKey); +extern SecIdentityRef SecIdentityCreate(CFAllocatorRef allocator, SecCertificateRef certificate, SecKeyRef privateKey); diff --git a/cups/versioning.h b/cups/versioning.h index aae2138e84..14c218fee0 100644 --- a/cups/versioning.h +++ b/cups/versioning.h @@ -116,9 +116,9 @@ # define _CUPS_API_1_7 API_AVAILABLE(macos(10.9), ios(11.0)) _CUPS_PUBLIC # define _CUPS_API_2_0 API_AVAILABLE(macos(10.10), ios(11.0)) _CUPS_PUBLIC # define _CUPS_API_2_2 API_AVAILABLE(macos(10.12), ios(11.0)) _CUPS_PUBLIC -# define _CUPS_API_2_2_4 API_AVAILABLE(macos(10.13), ios(11.0)) _CUPS_PUBLIC -# define _CUPS_API_2_2_7 API_AVAILABLE(macos(10.14), ios(11.0)) _CUPS_PUBLIC -# define _CUPS_API_2_3 _CUPS_PUBLIC +# define _CUPS_API_2_2_4 API_AVAILABLE(macos(10.13), ios(12.0)) _CUPS_PUBLIC +# define _CUPS_API_2_2_7 API_AVAILABLE(macos(10.14), ios(13.0)) _CUPS_PUBLIC +# define _CUPS_API_2_3 API_AVAILABLE(macos(10.14), ios(13.0)) _CUPS_PUBLIC # else # define _CUPS_API_1_1_19 _CUPS_PUBLIC # define _CUPS_API_1_1_20 _CUPS_PUBLIC diff --git a/doc/help/cupspm.epub b/doc/help/cupspm.epub index fea9e5af5e..1a8c388239 100644 Binary files a/doc/help/cupspm.epub and b/doc/help/cupspm.epub differ diff --git a/doc/help/cupspm.html b/doc/help/cupspm.html index c27281518c..fa1a87681e 100644 --- a/doc/help/cupspm.html +++ b/doc/help/cupspm.html @@ -187,7 +187,6 @@ h2.title, h3.title {
  • Authentication
  • Functions
    • -
  • Variables
  • Enumerations
    • cups_ptype_e
    • http_encoding_e
      • @@ -1215,19 +1211,6 @@ cups_password_cb2(const char *prompt, http_t *http,

      The resource argument specifies the path used for the request.

      The user_data argument provides the user data pointer from the cupsSetPasswordCB2 call.

      Functions

      -

      CF_OPTIONS

      -

      -

      -typedef CF_OPTIONS(uint32_t, SecKeyUsage);

      -

      Parameters

      - - - - - -
      uint32_t
      SecKeyUsage
      -

      Return Value

      -

      cupsAddDest

      Add a destination to the list of destinations.

      @@ -1256,7 +1239,7 @@ a copy of that destination's options.

      Use the cupsSaveDests function to save the updated list of destinations to the user's lpoptions file.

      -

       CUPS 2.3 cupsAddDestMediaOptions

      +

       CUPS 2.3/macOS 10.14 cupsAddDestMediaOptions

      Add the option corresponding to the specified media size.

      int cupsAddDestMediaOptions(http_t *http, cups_dest_t *dest, cups_dinfo_t *dinfo, unsigned flags, cups_size_t *size, int num_options, cups_option_t **options);

      @@ -1567,7 +1550,7 @@ int cupsDoAuthentication(http_t *http, const char *method, status, prior to resubmitting your request.

      -

       CUPS 2.3 cupsEncodeOption

      +

       CUPS 2.3/macOS 10.14 cupsEncodeOption

      Encode a single option into an IPP attribute.

      ipp_attribute_t *cupsEncodeOption(ipp_t *ipp, ipp_tag_t group_tag, const char *name, const char *value);

      @@ -6127,10 +6110,6 @@ typedef struct _ipp_s ipp_t; Top margin in hundredths of millimeters -

      Variables

      -

      kSecOidOrganizationalUnit

      -

      Constants, very secure stuff...

      -

      extern const void *kSecOidOrganizationalUnit;

      Constants

      cups_ptype_e

      Printer type/capability bit