build: Suppressing openssl deprecation flags on OSX
The suppression needs to be enabled for the whole compilation unit.
Change-Id: I9a68e135a94dfd0fa31c4e814a731b5f0c59809a
Refs: #1429
diff --git a/src/security/openssl.hpp b/src/security/openssl.hpp
index fdbf55a..374bce3 100644
--- a/src/security/openssl.hpp
+++ b/src/security/openssl.hpp
@@ -12,14 +12,10 @@
#if defined(__APPLE__)
#ifdef __clang__
-#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
#endif // __clang__
#ifdef __GNUC__
-#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)
-#pragma GCC diagnostic push
-#endif
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif // __GNUC__
@@ -31,17 +27,4 @@
#include <openssl/rsa.h>
-#if defined(__APPLE__)
-
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif // __clang__
-
-#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)
-#pragma GCC diagnostic pop
-#endif // __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)
-
-#endif
-
-
#endif // NDN_SECURITY_OPENSSL_HPP
diff --git a/tests/security/test-certificate-cache.cpp b/tests/security/test-certificate-cache.cpp
index d259e28..e4e6f1d 100644
--- a/tests/security/test-certificate-cache.cpp
+++ b/tests/security/test-certificate-cache.cpp
@@ -43,13 +43,13 @@
cache->insertCertificate(cert1);
cache->insertCertificate(cert2);
- scheduler.scheduleEvent(time::milliseconds(300), bind(&getCertificateTtl, cache, name1, true));
- scheduler.scheduleEvent(time::milliseconds(300), bind(&getCertificateTtl, cache, name2, true));
- scheduler.scheduleEvent(time::milliseconds(600), bind(&getCertificateTtl, cache, name1, false));
- scheduler.scheduleEvent(time::milliseconds(600), bind(&getCertificateTtl, cache, name2, true));
- scheduler.scheduleEvent(time::milliseconds(600), bind(&CertificateCache::insertCertificate, &*cache, cert2));
- scheduler.scheduleEvent(time::milliseconds(1300), bind(&getCertificateTtl, cache, name2, true));
- scheduler.scheduleEvent(time::milliseconds(1700), bind(&getCertificateTtl, cache, name2, false));
+ scheduler.scheduleEvent(time::milliseconds(200), bind(&getCertificateTtl, cache, name1, true));
+ scheduler.scheduleEvent(time::milliseconds(200), bind(&getCertificateTtl, cache, name2, true));
+ scheduler.scheduleEvent(time::milliseconds(900), bind(&getCertificateTtl, cache, name1, false));
+ scheduler.scheduleEvent(time::milliseconds(900), bind(&getCertificateTtl, cache, name2, true));
+ scheduler.scheduleEvent(time::milliseconds(900), bind(&CertificateCache::insertCertificate, cache, cert2));
+ scheduler.scheduleEvent(time::milliseconds(1500), bind(&getCertificateTtl, cache, name2, true));
+ scheduler.scheduleEvent(time::milliseconds(2500), bind(&getCertificateTtl, cache, name2, false));
io->run();
}