From: Richard Levitte <levitte@openssl.org>
Date: Tue, 15 Aug 2017 10:32:55 +0000 (+0200)
Subject: Rename crypto/evp/scrypt.c to crypto/evp/pbe_scrypt.c
X-Git-Tag: OpenSSL_1_1_1-pre1~850
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9237173eeba0a99de0d7a50f7b4a6149e983f866;p=openssl

Rename crypto/evp/scrypt.c to crypto/evp/pbe_scrypt.c

There already is a scrypt.c in crypto/kdf/, both becoming script.o or
script.obj.  With some linkers, the same object files name more than
once means one of them is dropped, either when building shared
libraries or when building executables from static libraries.

Reviewed-by: Tim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4164)
---

diff --git a/crypto/evp/build.info b/crypto/evp/build.info
index a3e4fc8273..88a5b6889f 100644
--- a/crypto/evp/build.info
+++ b/crypto/evp/build.info
@@ -9,7 +9,7 @@ SOURCE[../../libcrypto]=\
         p_open.c p_seal.c p_sign.c p_verify.c p_lib.c p_enc.c p_dec.c \
         bio_md.c bio_b64.c bio_enc.c evp_err.c e_null.c \
         c_allc.c c_alld.c evp_lib.c bio_ok.c \
-        evp_pkey.c evp_pbe.c p5_crpt.c p5_crpt2.c scrypt.c \
+        evp_pkey.c evp_pbe.c p5_crpt.c p5_crpt2.c pbe_scrypt.c \
         e_old.c pmeth_lib.c pmeth_fn.c pmeth_gn.c m_sigver.c \
         e_aes_cbc_hmac_sha1.c e_aes_cbc_hmac_sha256.c e_rc4_hmac_md5.c \
         e_chacha20_poly1305.c cmeth_lib.c
diff --git a/crypto/evp/scrypt.c b/crypto/evp/pbe_scrypt.c
similarity index 100%
rename from crypto/evp/scrypt.c
rename to crypto/evp/pbe_scrypt.c