From 3b089ca21b782f66083a11dbb51ba7279a4c2187 Mon Sep 17 00:00:00 2001 From: Rich Salz Date: Wed, 16 Dec 2015 17:05:20 -0500 Subject: [PATCH] Rename sec_mem to mem_sec, like other files. Reviewed-by: Tim Hudson --- crypto/Makefile | 12 ++++++------ crypto/{sec_mem.c => mem_sec.c} | 0 ...O_secure_malloc.pod => OPENSSL_secure_malloc.pod} | 5 ----- 3 files changed, 6 insertions(+), 11 deletions(-) rename crypto/{sec_mem.c => mem_sec.c} (100%) rename doc/crypto/{CRYPTO_secure_malloc.pod => OPENSSL_secure_malloc.pod} (96%) diff --git a/crypto/Makefile b/crypto/Makefile index 43cb71f008..468105751e 100644 --- a/crypto/Makefile +++ b/crypto/Makefile @@ -36,10 +36,10 @@ LIB= $(TOP)/libcrypto.a SHARED_LIB= libcrypto$(SHLIB_EXT) LIBSRC= cryptlib.c mem.c mem_clr.c mem_dbg.c cversion.c ex_data.c cpt_err.c \ ebcdic.c uid.c o_time.c o_str.c o_dir.c thr_id.c lock.c fips_ers.c \ - o_init.c o_fips.c sec_mem.c + o_init.c o_fips.c mem_sec.c LIBOBJ= cryptlib.o mem.o mem_dbg.o cversion.o ex_data.o cpt_err.o \ ebcdic.o uid.o o_time.o o_str.o o_dir.o thr_id.o lock.o fips_ers.o \ - o_init.o o_fips.o sec_mem.o $(CPUID_OBJ) + o_init.o o_fips.o mem_sec.o $(CPUID_OBJ) SRC= $(LIBSRC) @@ -187,6 +187,10 @@ mem_dbg.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h mem_dbg.o: ../include/openssl/ossl_typ.h ../include/openssl/safestack.h mem_dbg.o: ../include/openssl/stack.h ../include/openssl/symhacks.h mem_dbg.o: include/internal/cryptlib.h mem_dbg.c +mem_sec.o: ../e_os.h ../include/openssl/crypto.h ../include/openssl/e_os2.h +mem_sec.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h +mem_sec.o: ../include/openssl/ossl_typ.h ../include/openssl/safestack.h +mem_sec.o: ../include/openssl/stack.h ../include/openssl/symhacks.h mem_sec.c o_dir.o: ../e_os.h ../include/internal/o_dir.h ../include/openssl/e_os2.h o_dir.o: ../include/openssl/opensslconf.h LPdir_unix.c o_dir.c o_fips.o: ../e_os.h ../include/openssl/bio.h ../include/openssl/buffer.h @@ -213,10 +217,6 @@ o_time.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h o_time.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h o_time.o: ../include/openssl/ossl_typ.h ../include/openssl/safestack.h o_time.o: ../include/openssl/stack.h ../include/openssl/symhacks.h o_time.c -sec_mem.o: ../e_os.h ../include/openssl/crypto.h ../include/openssl/e_os2.h -sec_mem.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -sec_mem.o: ../include/openssl/ossl_typ.h ../include/openssl/safestack.h -sec_mem.o: ../include/openssl/stack.h ../include/openssl/symhacks.h sec_mem.c thr_id.o: ../e_os.h ../include/openssl/bio.h ../include/openssl/buffer.h thr_id.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h thr_id.o: ../include/openssl/err.h ../include/openssl/lhash.h diff --git a/crypto/sec_mem.c b/crypto/mem_sec.c similarity index 100% rename from crypto/sec_mem.c rename to crypto/mem_sec.c diff --git a/doc/crypto/CRYPTO_secure_malloc.pod b/doc/crypto/OPENSSL_secure_malloc.pod similarity index 96% rename from doc/crypto/CRYPTO_secure_malloc.pod rename to doc/crypto/OPENSSL_secure_malloc.pod index 5d233dbd77..588c4b15f9 100644 --- a/doc/crypto/CRYPTO_secure_malloc.pod +++ b/doc/crypto/OPENSSL_secure_malloc.pod @@ -83,9 +83,4 @@ return no values. L, L -=head1 HISTORY - -These functions were contributed to the OpenSSL project by -Akamai Technologies in April, 2014. - =cut