Suppress the clang warning "-Wdeprecated-declarations" for CSSM API calls.
The CSSM API has been deprecated since OSX 10.7, but there is no replacement.
BUG=590914
Review URL: https://codereview.chromium.org/1753553002
Cr-Original-Commit-Position: refs/heads/master@{#378668}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: bedc26167ab5402cf9e4a51afeeeb90ababb9da0
diff --git a/README.chromium b/README.chromium
index ad33723..e4b86f3 100644
--- a/README.chromium
+++ b/README.chromium
@@ -49,6 +49,8 @@
Modifications:
- Removed unneeded definitions for internal Apple CSP DL enums and structs
+- Added a suppression for the warning "-Wdeprecated-declarations" since CSSM
+ APIs are deprecated since OSX 10.7.
dnsinfo.h from:
http://www.opensource.apple.com/source/configd/configd-453.19/dnsinfo/dnsinfo.h
diff --git a/cssmapplePriv.h b/cssmapplePriv.h
index 18092bd..29d0c4d 100644
--- a/cssmapplePriv.h
+++ b/cssmapplePriv.h
@@ -1,15 +1,15 @@
/*
* Copyright (c) 2000-2004 Apple Computer, Inc. All Rights Reserved.
- *
+ *
* @APPLE_LICENSE_HEADER_START@
- *
+ *
* This file contains Original Code and/or Modifications of Original Code
* as defined in and that are subject to the Apple Public Source License
* Version 2.0 (the 'License'). You may not use this file except in
* compliance with the License. Please obtain a copy of the License at
* http://www.opensource.apple.com/apsl/ and read it before using this
* file.
- *
+ *
* The Original Code and all software distributed under the License are
* distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
* EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
@@ -17,26 +17,31 @@
* FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
* Please see the License for the specific language governing rights and
* limitations under the License.
- *
+ *
* @APPLE_LICENSE_HEADER_END@
*
* cssmapplePriv.h -- Private CSSM features specific to Apple's Implementation
*/
-
+
#ifndef _CSSMAPPLE_PRIV_H_
#define _CSSMAPPLE_PRIV_H_ 1
#include <Security/cssmtype.h>
#include <Security/cssmapple.h>
+// CSSM functions are deprecated as of OSX 10.7, but have no replacement.
+// https://bugs.chromium.org/p/chromium/issues/detail?id=590914#c1
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+
#ifdef __cplusplus
extern "C" {
#endif
-
-/*
- * Options for X509TP's CSSM_TP_CertGroupVerify for policy
- * CSSMOID_APPLE_TP_REVOCATION_OCSP. A pointer to, and length of, one
- * of these is optionally placed in
+
+/*
+ * Options for X509TP's CSSM_TP_CertGroupVerify for policy
+ * CSSMOID_APPLE_TP_REVOCATION_OCSP. A pointer to, and length of, one
+ * of these is optionally placed in
* CSSM_TP_VERIFY_CONTEXT.Cred->Policy.PolicyIds[n].FieldValue.
*/
@@ -64,7 +69,7 @@
};
typedef struct {
- uint32 Version;
+ uint32 Version;
CSSM_APPLE_TP_OCSP_OPT_FLAGS Flags;
CSSM_DATA_PTR LocalResponder; /* URI */
CSSM_DATA_PTR LocalResponderCert; /* X509 DER encoded cert */
@@ -74,4 +79,6 @@
}
#endif
+#pragma clang diagnostic pop // "-Wdeprecated-declarations"
+
#endif /* _CSSMAPPLE_PRIV_H_ */
