summaryrefslogtreecommitdiffstats
path: root/crypto/x509
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2019-11-05 17:34:09 +0100
committerRichard Levitte <levitte@openssl.org>2019-11-07 11:37:25 +0100
commit00db8c60aaecd2ff9b0a5d9fd10c7771a1e1a73e (patch)
tree55a6f88db1ff6e53c4fdcf17b074672ff64e9263 /crypto/x509
parentUpdate source files for deprecation at 3.0 (diff)
downloadopenssl-00db8c60aaecd2ff9b0a5d9fd10c7771a1e1a73e.tar.xz
openssl-00db8c60aaecd2ff9b0a5d9fd10c7771a1e1a73e.zip
Update source files for pre-3.0 deprecation
Reviewed-by: Tim Hudson <tjh@openssl.org> (Merged from https://github.com/openssl/openssl/pull/10364)
Diffstat (limited to 'crypto/x509')
-rw-r--r--crypto/x509/x509_d2.c2
-rw-r--r--crypto/x509/x509cset.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/crypto/x509/x509_d2.c b/crypto/x509/x509_d2.c
index 5beb7034a7..cb0f84a7e8 100644
--- a/crypto/x509/x509_d2.c
+++ b/crypto/x509/x509_d2.c
@@ -74,7 +74,7 @@ int X509_STORE_load_store(X509_STORE *ctx, const char *uri)
}
/* Deprecated */
-#if OPENSSL_API_LEVEL < 3
+#ifndef OPENSSL_NO_DEPRECATED_3_0
int X509_STORE_load_locations(X509_STORE *ctx, const char *file,
const char *path)
{
diff --git a/crypto/x509/x509cset.c b/crypto/x509/x509cset.c
index f1992ddcf0..2350995239 100644
--- a/crypto/x509/x509cset.c
+++ b/crypto/x509/x509cset.c
@@ -91,7 +91,7 @@ const ASN1_TIME *X509_CRL_get0_nextUpdate(const X509_CRL *crl)
return crl->crl.nextUpdate;
}
-#if !OPENSSL_API_1_1_0
+#ifndef OPENSSL_NO_DEPRECATED_1_1_0
ASN1_TIME *X509_CRL_get_lastUpdate(X509_CRL *crl)
{
return crl->crl.lastUpdate;