The branch master has been updated
via 9237173eeba0a99de0d7a50f7b4a6149e983f866 (commit)
from 8d2214c0a49584044d96b80e846ac8f6df35a0ad (commit)
- Log -----------------------------------------------------------------
commit 9237173eeba0a99de0d7a50f7b4a6149e983f866
Author: Richard Levitte <[email protected]>
Date: Tue Aug 15 12:32:55 2017 +0200
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 <[email protected]>
(Merged from https://github.com/openssl/openssl/pull/4164)
-----------------------------------------------------------------------
Summary of changes:
crypto/evp/build.info | 2 +-
crypto/evp/{scrypt.c => pbe_scrypt.c} | 0
2 files changed, 1 insertion(+), 1 deletion(-)
rename crypto/evp/{scrypt.c => pbe_scrypt.c} (100%)
diff --git a/crypto/evp/build.info b/crypto/evp/build.info
index a3e4fc8..88a5b68 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
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
