enable openssl DSO (typo, it's -DDSO_DLFCN not -DSO_DLFCN); Douglas Santos

4 files changed, 10 insertions, 10 deletions

diff --git a/src/lib/libcrypto/dso/dso_dlfcn.c b/src/lib/libcrypto/dso/dso_dlfcn.c
index 9d49ebc253..2e72969431 100644
--- a/src/lib/libcrypto/dso/dso_dlfcn.c
+++ b/src/lib/libcrypto/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/src/lib/libssl/crypto/Makefile b/src/lib/libssl/crypto/Makefile
index b1bda36b18..67936d9450 100644
--- a/src/lib/libssl/crypto/Makefile
+++ b/src/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/src/lib/libssl/src/crypto/dso/dso_dlfcn.c b/src/lib/libssl/src/crypto/dso/dso_dlfcn.c
index 9d49ebc253..2e72969431 100644
--- a/src/lib/libssl/src/crypto/dso/dso_dlfcn.c
+++ b/src/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/src/lib/libssl/ssl/Makefile b/src/lib/libssl/ssl/Makefile
index 40b523c591..9dc278a633 100644
--- a/src/lib/libssl/ssl/Makefile
+++ b/src/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    \