summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorMarkus Friedl <markus@cvs.openbsd.org>2005-03-30 13:08:03 +0000
committerMarkus Friedl <markus@cvs.openbsd.org>2005-03-30 13:08:03 +0000
commitc487d12fded8fee51cadebdfbcace142b0a3f1ab (patch)
tree774c84db707f68337dacb36de10a9c120da7a0b9 /lib
parentecb8f851ab9f0fc220d4801c8dfb9e881c04d5cc (diff)
enable openssl DSO (typo, it's -DDSO_DLFCN not -DSO_DLFCN); Douglas Santos
Diffstat (limited to 'lib')
-rw-r--r--lib/libssl/crypto/Makefile4
-rw-r--r--lib/libssl/src/crypto/dso/dso_dlfcn.c6
-rw-r--r--lib/libssl/ssl/Makefile4
3 files changed, 7 insertions, 7 deletions
diff --git a/lib/libssl/crypto/Makefile b/lib/libssl/crypto/Makefile
index b1bda36b186..67936d94508 100644
--- a/lib/libssl/crypto/Makefile
+++ b/lib/libssl/crypto/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.37 2005/02/07 20:34:54 beck Exp $
+# $OpenBSD: Makefile,v 1.38 2005/03/30 13:08:02 markus Exp $
LIB= crypto
@@ -15,7 +15,7 @@ CFLAGS+= -DB_ENDIAN
.endif
CFLAGS+= -DOPENSSL_NO_IDEA -DTERMIOS -DANSI_SOURCE -DNO_ERR -DOPENSSL_NO_ASM
-CFLAGS+= -DOPENSSL_NO_RC5 -DOPENSSL_NO_KRB5 -DSO_DLFCN -DHAVE_DLFCN_H
+CFLAGS+= -DOPENSSL_NO_RC5 -DOPENSSL_NO_KRB5 -DDSO_DLFCN -DHAVE_DLFCN_H
CFLAGS+= -DOPENSSL_NO_MDC2
CFLAGS+= -DNO_WINDOWS_BRAINDEATH
CFLAGS+= -DOPENSSL_NO_HW_CSWIFT -DOPENSSL_NO_HW_NCIPHER -DOPENSSL_NO_HW_ATALLA
diff --git a/lib/libssl/src/crypto/dso/dso_dlfcn.c b/lib/libssl/src/crypto/dso/dso_dlfcn.c
index 9d49ebc2537..2e729694314 100644
--- a/lib/libssl/src/crypto/dso/dso_dlfcn.c
+++ b/lib/libssl/src/crypto/dso/dso_dlfcn.c
@@ -281,12 +281,12 @@ static char *dlfcn_name_converter(DSO *dso, const char *filename)
if(transform)
{
if ((DSO_flags(dso) & DSO_FLAG_NAME_TRANSLATION_EXT_ONLY) == 0)
- sprintf(translated, "lib%s.so", filename);
+ snprintf(translated, rsize, "lib%s.so", filename);
else
- sprintf(translated, "%s.so", filename);
+ snprintf(translated, rsize, "%s.so", filename);
}
else
- sprintf(translated, "%s", filename);
+ snprintf(translated, rsize, "%s", filename);
return(translated);
}
diff --git a/lib/libssl/ssl/Makefile b/lib/libssl/ssl/Makefile
index 40b523c5919..9dc278a633f 100644
--- a/lib/libssl/ssl/Makefile
+++ b/lib/libssl/ssl/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.19 2004/08/06 22:41:41 pefo Exp $
+# $OpenBSD: Makefile,v 1.20 2005/03/30 13:08:02 markus Exp $
LIB= ssl
@@ -22,7 +22,7 @@ CFLAGS+= -DB_ENDIAN
CFLAGS+= -DOPENSSL_NO_IDEA -DTERMIOS -DANSI_SOURCE -DNO_ERR
CFLAGS+= -DOPENSSL_NO_MDC2
-CFLAGS+= -DOPENSSL_NO_RC5 -DOPENSSL_NO_KRB5 -DSO_DLFCN -DHAVE_DLFCN_H
+CFLAGS+= -DOPENSSL_NO_RC5 -DOPENSSL_NO_KRB5 -DHAVE_DLFCN_H
CFLAGS+= -I${.CURDIR}/../${SSLEAYDIST}
SRCS= bio_ssl.c s2_clnt.c s3_both.c s3_srvr.c ssl_err2.c ssl_txt.c \