aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrent Cook <bcook@openbsd.org>2018-11-11 09:14:00 -0600
committerBrent Cook <bcook@openbsd.org>2018-11-11 09:14:00 -0600
commit1e2937e1a2e4ddfed1cf484b48b916d113f8fdac (patch)
treefa2a81c55e78fe4fc1057a493d95390df15cc88d
parentba2fe0e9499d718f14e4a1321008157d4e0a2a92 (diff)
downloadportable-1e2937e1a2e4ddfed1cf484b48b916d113f8fdac.tar.gz
portable-1e2937e1a2e4ddfed1cf484b48b916d113f8fdac.tar.bz2
portable-1e2937e1a2e4ddfed1cf484b48b916d113f8fdac.zip
added crypto_lock portable bits
-rw-r--r--crypto/Makefile.am5
-rw-r--r--crypto/compat/crypto_lock_win.c (renamed from crypto/crypto_lock_win.c)0
-rwxr-xr-xupdate.sh1
3 files changed, 6 insertions, 0 deletions
diff --git a/crypto/Makefile.am b/crypto/Makefile.am
index ba96c51..2d95359 100644
--- a/crypto/Makefile.am
+++ b/crypto/Makefile.am
@@ -213,6 +213,11 @@ endif
213libcrypto_la_SOURCES += cpt_err.c 213libcrypto_la_SOURCES += cpt_err.c
214libcrypto_la_SOURCES += cryptlib.c 214libcrypto_la_SOURCES += cryptlib.c
215libcrypto_la_SOURCES += crypto_init.c 215libcrypto_la_SOURCES += crypto_init.c
216if !HOST_WIN
217libcrypto_la_SOURCES += crypto_lock.c
218else
219libcrypto_la_SOURCES += crypto_lock_win.c
220endif
216libcrypto_la_SOURCES += cversion.c 221libcrypto_la_SOURCES += cversion.c
217libcrypto_la_SOURCES += ex_data.c 222libcrypto_la_SOURCES += ex_data.c
218libcrypto_la_SOURCES += malloc-wrapper.c 223libcrypto_la_SOURCES += malloc-wrapper.c
diff --git a/crypto/crypto_lock_win.c b/crypto/compat/crypto_lock_win.c
index 47c3dcc..47c3dcc 100644
--- a/crypto/crypto_lock_win.c
+++ b/crypto/compat/crypto_lock_win.c
diff --git a/update.sh b/update.sh
index 375d78d..f68eefb 100755
--- a/update.sh
+++ b/update.sh
@@ -154,6 +154,7 @@ for i in `awk '/SOURCES|HEADERS/ { print $3 }' crypto/Makefile.am` ; do
154 fi 154 fi
155done 155done
156$CP crypto/compat/b_win.c crypto/bio 156$CP crypto/compat/b_win.c crypto/bio
157$CP crypto/compat/crypto_lock_win.c crypto
157$CP crypto/compat/ui_openssl_win.c crypto/ui 158$CP crypto/compat/ui_openssl_win.c crypto/ui
158# add the libcrypto symbol export list 159# add the libcrypto symbol export list
159$GREP -v OPENSSL_ia32cap_P $libcrypto_src/Symbols.list | $GREP '^[A-Za-z0-9_]' > crypto/crypto.sym 160$GREP -v OPENSSL_ia32cap_P $libcrypto_src/Symbols.list | $GREP '^[A-Za-z0-9_]' > crypto/crypto.sym