From: Richard Levitte <levitte@openssl.org>
Date: Fri, 20 Nov 2020 09:09:15 +0000 (+0100)
Subject: Switch deprecation method for SRP
X-Git-Tag: openssl-3.0.0-alpha10~139
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2b3f59fd494145fffa41943b003025887e8aec7d;p=thirdparty%2Fopenssl.git

Switch deprecation method for SRP

Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/13460)
---

diff --git a/include/openssl/srp.h.in b/include/openssl/srp.h.in
index 619816c65fd..8ddee32df36 100644
--- a/include/openssl/srp.h.in
+++ b/include/openssl/srp.h.in
@@ -98,7 +98,10 @@ int SRP_VBASE_init(SRP_VBASE *vb, char *verifier_file);
 
 int SRP_VBASE_add0_user(SRP_VBASE *vb, SRP_user_pwd *user_pwd);
 /* This method ignores the configured seed and fails for an unknown user. */
-DEPRECATEDIN_1_1_0(SRP_user_pwd *SRP_VBASE_get_by_user(SRP_VBASE *vb, char *username))
+# ifndef OPENSSL_NO_DEPRECATED_1_1_0
+OSSL_DEPRECATEDIN_1_1_0
+SRP_user_pwd *SRP_VBASE_get_by_user(SRP_VBASE *vb, char *username);
+# endif
 /* NOTE: unlike in SRP_VBASE_get_by_user, caller owns the returned pointer.*/
 SRP_user_pwd *SRP_VBASE_get1_by_user(SRP_VBASE *vb, char *username);