Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef CRYPTO_CSSM_INIT_H_ | 5 #ifndef CRYPTO_CSSM_INIT_H_ |
| 6 #define CRYPTO_CSSM_INIT_H_ | 6 #define CRYPTO_CSSM_INIT_H_ |
| 7 | 7 |
| 8 #include <Security/cssm.h> | 8 #include <Security/cssm.h> |
| 9 | 9 |
| 10 #include "base/macros.h" | 10 #include "base/macros.h" |
| (...skipping 28 matching lines...) Expand all Loading... | |
| 39 // Wrapper class for CSSM_DATA type. This should only be used when using the | 39 // Wrapper class for CSSM_DATA type. This should only be used when using the |
| 40 // CL/TP/CSP handles from above, since that's the only time we're guaranteed (or | 40 // CL/TP/CSP handles from above, since that's the only time we're guaranteed (or |
| 41 // supposed to be guaranteed) that our memory management functions will be used. | 41 // supposed to be guaranteed) that our memory management functions will be used. |
| 42 // Apple's Sec* APIs manage their own memory so it shouldn't be used for those. | 42 // Apple's Sec* APIs manage their own memory so it shouldn't be used for those. |
| 43 // The constructor initializes data_ to zero and the destructor releases the | 43 // The constructor initializes data_ to zero and the destructor releases the |
| 44 // data properly. | 44 // data properly. |
| 45 class ScopedCSSMData { | 45 class ScopedCSSMData { |
| 46 public: | 46 public: |
| 47 ScopedCSSMData(); | 47 ScopedCSSMData(); |
| 48 ~ScopedCSSMData(); | 48 ~ScopedCSSMData(); |
| 49 // CSSM functions are deprecated as of OSX 10.7, but have no replacement. | |
|
Ryan Sleevi
2016/03/01 15:59:58
A newline between 48/49 would be helpful for reada
erikchen
2016/03/02 02:02:59
It looks like C++14 introduces a deprecated attrib
| |
| 50 // https://bugs.chromium.org/p/chromium/issues/detail?id=590914#c1 | |
| 51 #pragma clang diagnostic push | |
| 52 #pragma clang diagnostic ignored "-Wdeprecated-declarations" | |
| 49 operator CSSM_DATA*() { return &data_; } | 53 operator CSSM_DATA*() { return &data_; } |
| 50 CSSM_DATA* operator ->() { return &data_; } | 54 CSSM_DATA* operator ->() { return &data_; } |
| 51 | 55 |
| 52 private: | 56 private: |
| 53 CSSM_DATA data_; | 57 CSSM_DATA data_; |
| 58 #pragma clang diagnostic pop | |
| 54 | 59 |
| 55 DISALLOW_COPY_AND_ASSIGN(ScopedCSSMData); | 60 DISALLOW_COPY_AND_ASSIGN(ScopedCSSMData); |
| 56 }; | 61 }; |
| 57 | 62 |
| 58 } // namespace crypto | 63 } // namespace crypto |
| 59 | 64 |
| 60 #endif // CRYPTO_CSSM_INIT_H_ | 65 #endif // CRYPTO_CSSM_INIT_H_ |
| OLD | NEW |