summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/lib/libssl/crypto/arch/alpha/opensslconf.h6
-rw-r--r--src/lib/libssl/crypto/arch/amd64/opensslconf.h6
-rw-r--r--src/lib/libssl/crypto/arch/arm/opensslconf.h6
-rw-r--r--src/lib/libssl/crypto/arch/hppa/opensslconf.h6
-rw-r--r--src/lib/libssl/crypto/arch/hppa64/opensslconf.h6
-rw-r--r--src/lib/libssl/crypto/arch/i386/opensslconf.h6
-rw-r--r--src/lib/libssl/crypto/arch/m68k/opensslconf.h6
-rw-r--r--src/lib/libssl/crypto/arch/m88k/opensslconf.h6
-rw-r--r--src/lib/libssl/crypto/arch/mips64/opensslconf.h6
-rw-r--r--src/lib/libssl/crypto/arch/powerpc/opensslconf.h6
-rw-r--r--src/lib/libssl/crypto/arch/sh/opensslconf.h6
-rw-r--r--src/lib/libssl/crypto/arch/sparc/opensslconf.h6
-rw-r--r--src/lib/libssl/crypto/arch/sparc64/opensslconf.h6
-rw-r--r--src/lib/libssl/crypto/arch/vax/opensslconf.h6
-rw-r--r--src/lib/libssl/shlib_version4
-rw-r--r--src/lib/libssl/src/Makefile4
-rw-r--r--src/lib/libssl/src/apps/s_client.c2
-rw-r--r--src/lib/libssl/ssl/Makefile3
-rw-r--r--src/lib/libssl/ssl/shlib_version4
-rw-r--r--src/usr.sbin/openssl/Makefile3
20 files changed, 96 insertions, 8 deletions
diff --git a/src/lib/libssl/crypto/arch/alpha/opensslconf.h b/src/lib/libssl/crypto/arch/alpha/opensslconf.h
index a49bd23031..3dfec8c8b7 100644
--- a/src/lib/libssl/crypto/arch/alpha/opensslconf.h
+++ b/src/lib/libssl/crypto/arch/alpha/opensslconf.h
@@ -37,6 +37,9 @@
37#ifndef OPENSSL_NO_SEED 37#ifndef OPENSSL_NO_SEED
38# define OPENSSL_NO_SEED 38# define OPENSSL_NO_SEED
39#endif 39#endif
40#ifndef OPENSSL_NO_SSL2
41# define OPENSSL_NO_SSL2
42#endif
40#ifndef OPENSSL_NO_STORE 43#ifndef OPENSSL_NO_STORE
41# define OPENSSL_NO_STORE 44# define OPENSSL_NO_STORE
42#endif 45#endif
@@ -87,6 +90,9 @@
87# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED) 90# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED)
88# define NO_SEED 91# define NO_SEED
89# endif 92# endif
93# if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2)
94# define NO_SSL2
95# endif
90# if defined(OPENSSL_NO_STORE) && !defined(NO_STORE) 96# if defined(OPENSSL_NO_STORE) && !defined(NO_STORE)
91# define NO_STORE 97# define NO_STORE
92# endif 98# endif
diff --git a/src/lib/libssl/crypto/arch/amd64/opensslconf.h b/src/lib/libssl/crypto/arch/amd64/opensslconf.h
index 16314dbc1e..6a6029013f 100644
--- a/src/lib/libssl/crypto/arch/amd64/opensslconf.h
+++ b/src/lib/libssl/crypto/arch/amd64/opensslconf.h
@@ -37,6 +37,9 @@
37#ifndef OPENSSL_NO_SEED 37#ifndef OPENSSL_NO_SEED
38# define OPENSSL_NO_SEED 38# define OPENSSL_NO_SEED
39#endif 39#endif
40#ifndef OPENSSL_NO_SSL2
41# define OPENSSL_NO_SSL2
42#endif
40#ifndef OPENSSL_NO_STORE 43#ifndef OPENSSL_NO_STORE
41# define OPENSSL_NO_STORE 44# define OPENSSL_NO_STORE
42#endif 45#endif
@@ -87,6 +90,9 @@
87# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED) 90# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED)
88# define NO_SEED 91# define NO_SEED
89# endif 92# endif
93# if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2)
94# define NO_SSL2
95# endif
90# if defined(OPENSSL_NO_STORE) && !defined(NO_STORE) 96# if defined(OPENSSL_NO_STORE) && !defined(NO_STORE)
91# define NO_STORE 97# define NO_STORE
92# endif 98# endif
diff --git a/src/lib/libssl/crypto/arch/arm/opensslconf.h b/src/lib/libssl/crypto/arch/arm/opensslconf.h
index c1fc4e5d11..7c7015c9b7 100644
--- a/src/lib/libssl/crypto/arch/arm/opensslconf.h
+++ b/src/lib/libssl/crypto/arch/arm/opensslconf.h
@@ -37,6 +37,9 @@
37#ifndef OPENSSL_NO_SEED 37#ifndef OPENSSL_NO_SEED
38# define OPENSSL_NO_SEED 38# define OPENSSL_NO_SEED
39#endif 39#endif
40#ifndef OPENSSL_NO_SSL2
41# define OPENSSL_NO_SSL2
42#endif
40#ifndef OPENSSL_NO_STORE 43#ifndef OPENSSL_NO_STORE
41# define OPENSSL_NO_STORE 44# define OPENSSL_NO_STORE
42#endif 45#endif
@@ -87,6 +90,9 @@
87# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED) 90# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED)
88# define NO_SEED 91# define NO_SEED
89# endif 92# endif
93# if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2)
94# define NO_SSL2
95# endif
90# if defined(OPENSSL_NO_STORE) && !defined(NO_STORE) 96# if defined(OPENSSL_NO_STORE) && !defined(NO_STORE)
91# define NO_STORE 97# define NO_STORE
92# endif 98# endif
diff --git a/src/lib/libssl/crypto/arch/hppa/opensslconf.h b/src/lib/libssl/crypto/arch/hppa/opensslconf.h
index c1fc4e5d11..7c7015c9b7 100644
--- a/src/lib/libssl/crypto/arch/hppa/opensslconf.h
+++ b/src/lib/libssl/crypto/arch/hppa/opensslconf.h
@@ -37,6 +37,9 @@
37#ifndef OPENSSL_NO_SEED 37#ifndef OPENSSL_NO_SEED
38# define OPENSSL_NO_SEED 38# define OPENSSL_NO_SEED
39#endif 39#endif
40#ifndef OPENSSL_NO_SSL2
41# define OPENSSL_NO_SSL2
42#endif
40#ifndef OPENSSL_NO_STORE 43#ifndef OPENSSL_NO_STORE
41# define OPENSSL_NO_STORE 44# define OPENSSL_NO_STORE
42#endif 45#endif
@@ -87,6 +90,9 @@
87# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED) 90# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED)
88# define NO_SEED 91# define NO_SEED
89# endif 92# endif
93# if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2)
94# define NO_SSL2
95# endif
90# if defined(OPENSSL_NO_STORE) && !defined(NO_STORE) 96# if defined(OPENSSL_NO_STORE) && !defined(NO_STORE)
91# define NO_STORE 97# define NO_STORE
92# endif 98# endif
diff --git a/src/lib/libssl/crypto/arch/hppa64/opensslconf.h b/src/lib/libssl/crypto/arch/hppa64/opensslconf.h
index 38a4f1ca9f..7199268572 100644
--- a/src/lib/libssl/crypto/arch/hppa64/opensslconf.h
+++ b/src/lib/libssl/crypto/arch/hppa64/opensslconf.h
@@ -37,6 +37,9 @@
37#ifndef OPENSSL_NO_SEED 37#ifndef OPENSSL_NO_SEED
38# define OPENSSL_NO_SEED 38# define OPENSSL_NO_SEED
39#endif 39#endif
40#ifndef OPENSSL_NO_SSL2
41# define OPENSSL_NO_SSL2
42#endif
40#ifndef OPENSSL_NO_STORE 43#ifndef OPENSSL_NO_STORE
41# define OPENSSL_NO_STORE 44# define OPENSSL_NO_STORE
42#endif 45#endif
@@ -87,6 +90,9 @@
87# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED) 90# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED)
88# define NO_SEED 91# define NO_SEED
89# endif 92# endif
93# if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2)
94# define NO_SSL2
95# endif
90# if defined(OPENSSL_NO_STORE) && !defined(NO_STORE) 96# if defined(OPENSSL_NO_STORE) && !defined(NO_STORE)
91# define NO_STORE 97# define NO_STORE
92# endif 98# endif
diff --git a/src/lib/libssl/crypto/arch/i386/opensslconf.h b/src/lib/libssl/crypto/arch/i386/opensslconf.h
index 91993d7a3f..b9e4249fed 100644
--- a/src/lib/libssl/crypto/arch/i386/opensslconf.h
+++ b/src/lib/libssl/crypto/arch/i386/opensslconf.h
@@ -37,6 +37,9 @@
37#ifndef OPENSSL_NO_SEED 37#ifndef OPENSSL_NO_SEED
38# define OPENSSL_NO_SEED 38# define OPENSSL_NO_SEED
39#endif 39#endif
40#ifndef OPENSSL_NO_SSL2
41# define OPENSSL_NO_SSL2
42#endif
40#ifndef OPENSSL_NO_STORE 43#ifndef OPENSSL_NO_STORE
41# define OPENSSL_NO_STORE 44# define OPENSSL_NO_STORE
42#endif 45#endif
@@ -87,6 +90,9 @@
87# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED) 90# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED)
88# define NO_SEED 91# define NO_SEED
89# endif 92# endif
93# if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2)
94# define NO_SSL2
95# endif
90# if defined(OPENSSL_NO_STORE) && !defined(NO_STORE) 96# if defined(OPENSSL_NO_STORE) && !defined(NO_STORE)
91# define NO_STORE 97# define NO_STORE
92# endif 98# endif
diff --git a/src/lib/libssl/crypto/arch/m68k/opensslconf.h b/src/lib/libssl/crypto/arch/m68k/opensslconf.h
index c1fc4e5d11..7c7015c9b7 100644
--- a/src/lib/libssl/crypto/arch/m68k/opensslconf.h
+++ b/src/lib/libssl/crypto/arch/m68k/opensslconf.h
@@ -37,6 +37,9 @@
37#ifndef OPENSSL_NO_SEED 37#ifndef OPENSSL_NO_SEED
38# define OPENSSL_NO_SEED 38# define OPENSSL_NO_SEED
39#endif 39#endif
40#ifndef OPENSSL_NO_SSL2
41# define OPENSSL_NO_SSL2
42#endif
40#ifndef OPENSSL_NO_STORE 43#ifndef OPENSSL_NO_STORE
41# define OPENSSL_NO_STORE 44# define OPENSSL_NO_STORE
42#endif 45#endif
@@ -87,6 +90,9 @@
87# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED) 90# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED)
88# define NO_SEED 91# define NO_SEED
89# endif 92# endif
93# if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2)
94# define NO_SSL2
95# endif
90# if defined(OPENSSL_NO_STORE) && !defined(NO_STORE) 96# if defined(OPENSSL_NO_STORE) && !defined(NO_STORE)
91# define NO_STORE 97# define NO_STORE
92# endif 98# endif
diff --git a/src/lib/libssl/crypto/arch/m88k/opensslconf.h b/src/lib/libssl/crypto/arch/m88k/opensslconf.h
index c1fc4e5d11..7c7015c9b7 100644
--- a/src/lib/libssl/crypto/arch/m88k/opensslconf.h
+++ b/src/lib/libssl/crypto/arch/m88k/opensslconf.h
@@ -37,6 +37,9 @@
37#ifndef OPENSSL_NO_SEED 37#ifndef OPENSSL_NO_SEED
38# define OPENSSL_NO_SEED 38# define OPENSSL_NO_SEED
39#endif 39#endif
40#ifndef OPENSSL_NO_SSL2
41# define OPENSSL_NO_SSL2
42#endif
40#ifndef OPENSSL_NO_STORE 43#ifndef OPENSSL_NO_STORE
41# define OPENSSL_NO_STORE 44# define OPENSSL_NO_STORE
42#endif 45#endif
@@ -87,6 +90,9 @@
87# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED) 90# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED)
88# define NO_SEED 91# define NO_SEED
89# endif 92# endif
93# if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2)
94# define NO_SSL2
95# endif
90# if defined(OPENSSL_NO_STORE) && !defined(NO_STORE) 96# if defined(OPENSSL_NO_STORE) && !defined(NO_STORE)
91# define NO_STORE 97# define NO_STORE
92# endif 98# endif
diff --git a/src/lib/libssl/crypto/arch/mips64/opensslconf.h b/src/lib/libssl/crypto/arch/mips64/opensslconf.h
index 10cb4e721d..e481da68bf 100644
--- a/src/lib/libssl/crypto/arch/mips64/opensslconf.h
+++ b/src/lib/libssl/crypto/arch/mips64/opensslconf.h
@@ -37,6 +37,9 @@
37#ifndef OPENSSL_NO_SEED 37#ifndef OPENSSL_NO_SEED
38# define OPENSSL_NO_SEED 38# define OPENSSL_NO_SEED
39#endif 39#endif
40#ifndef OPENSSL_NO_SSL2
41# define OPENSSL_NO_SSL2
42#endif
40#ifndef OPENSSL_NO_STORE 43#ifndef OPENSSL_NO_STORE
41# define OPENSSL_NO_STORE 44# define OPENSSL_NO_STORE
42#endif 45#endif
@@ -87,6 +90,9 @@
87# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED) 90# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED)
88# define NO_SEED 91# define NO_SEED
89# endif 92# endif
93# if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2)
94# define NO_SSL2
95# endif
90# if defined(OPENSSL_NO_STORE) && !defined(NO_STORE) 96# if defined(OPENSSL_NO_STORE) && !defined(NO_STORE)
91# define NO_STORE 97# define NO_STORE
92# endif 98# endif
diff --git a/src/lib/libssl/crypto/arch/powerpc/opensslconf.h b/src/lib/libssl/crypto/arch/powerpc/opensslconf.h
index c1fc4e5d11..7c7015c9b7 100644
--- a/src/lib/libssl/crypto/arch/powerpc/opensslconf.h
+++ b/src/lib/libssl/crypto/arch/powerpc/opensslconf.h
@@ -37,6 +37,9 @@
37#ifndef OPENSSL_NO_SEED 37#ifndef OPENSSL_NO_SEED
38# define OPENSSL_NO_SEED 38# define OPENSSL_NO_SEED
39#endif 39#endif
40#ifndef OPENSSL_NO_SSL2
41# define OPENSSL_NO_SSL2
42#endif
40#ifndef OPENSSL_NO_STORE 43#ifndef OPENSSL_NO_STORE
41# define OPENSSL_NO_STORE 44# define OPENSSL_NO_STORE
42#endif 45#endif
@@ -87,6 +90,9 @@
87# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED) 90# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED)
88# define NO_SEED 91# define NO_SEED
89# endif 92# endif
93# if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2)
94# define NO_SSL2
95# endif
90# if defined(OPENSSL_NO_STORE) && !defined(NO_STORE) 96# if defined(OPENSSL_NO_STORE) && !defined(NO_STORE)
91# define NO_STORE 97# define NO_STORE
92# endif 98# endif
diff --git a/src/lib/libssl/crypto/arch/sh/opensslconf.h b/src/lib/libssl/crypto/arch/sh/opensslconf.h
index c1fc4e5d11..7c7015c9b7 100644
--- a/src/lib/libssl/crypto/arch/sh/opensslconf.h
+++ b/src/lib/libssl/crypto/arch/sh/opensslconf.h
@@ -37,6 +37,9 @@
37#ifndef OPENSSL_NO_SEED 37#ifndef OPENSSL_NO_SEED
38# define OPENSSL_NO_SEED 38# define OPENSSL_NO_SEED
39#endif 39#endif
40#ifndef OPENSSL_NO_SSL2
41# define OPENSSL_NO_SSL2
42#endif
40#ifndef OPENSSL_NO_STORE 43#ifndef OPENSSL_NO_STORE
41# define OPENSSL_NO_STORE 44# define OPENSSL_NO_STORE
42#endif 45#endif
@@ -87,6 +90,9 @@
87# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED) 90# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED)
88# define NO_SEED 91# define NO_SEED
89# endif 92# endif
93# if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2)
94# define NO_SSL2
95# endif
90# if defined(OPENSSL_NO_STORE) && !defined(NO_STORE) 96# if defined(OPENSSL_NO_STORE) && !defined(NO_STORE)
91# define NO_STORE 97# define NO_STORE
92# endif 98# endif
diff --git a/src/lib/libssl/crypto/arch/sparc/opensslconf.h b/src/lib/libssl/crypto/arch/sparc/opensslconf.h
index c1fc4e5d11..7c7015c9b7 100644
--- a/src/lib/libssl/crypto/arch/sparc/opensslconf.h
+++ b/src/lib/libssl/crypto/arch/sparc/opensslconf.h
@@ -37,6 +37,9 @@
37#ifndef OPENSSL_NO_SEED 37#ifndef OPENSSL_NO_SEED
38# define OPENSSL_NO_SEED 38# define OPENSSL_NO_SEED
39#endif 39#endif
40#ifndef OPENSSL_NO_SSL2
41# define OPENSSL_NO_SSL2
42#endif
40#ifndef OPENSSL_NO_STORE 43#ifndef OPENSSL_NO_STORE
41# define OPENSSL_NO_STORE 44# define OPENSSL_NO_STORE
42#endif 45#endif
@@ -87,6 +90,9 @@
87# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED) 90# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED)
88# define NO_SEED 91# define NO_SEED
89# endif 92# endif
93# if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2)
94# define NO_SSL2
95# endif
90# if defined(OPENSSL_NO_STORE) && !defined(NO_STORE) 96# if defined(OPENSSL_NO_STORE) && !defined(NO_STORE)
91# define NO_STORE 97# define NO_STORE
92# endif 98# endif
diff --git a/src/lib/libssl/crypto/arch/sparc64/opensslconf.h b/src/lib/libssl/crypto/arch/sparc64/opensslconf.h
index 10cb4e721d..e481da68bf 100644
--- a/src/lib/libssl/crypto/arch/sparc64/opensslconf.h
+++ b/src/lib/libssl/crypto/arch/sparc64/opensslconf.h
@@ -37,6 +37,9 @@
37#ifndef OPENSSL_NO_SEED 37#ifndef OPENSSL_NO_SEED
38# define OPENSSL_NO_SEED 38# define OPENSSL_NO_SEED
39#endif 39#endif
40#ifndef OPENSSL_NO_SSL2
41# define OPENSSL_NO_SSL2
42#endif
40#ifndef OPENSSL_NO_STORE 43#ifndef OPENSSL_NO_STORE
41# define OPENSSL_NO_STORE 44# define OPENSSL_NO_STORE
42#endif 45#endif
@@ -87,6 +90,9 @@
87# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED) 90# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED)
88# define NO_SEED 91# define NO_SEED
89# endif 92# endif
93# if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2)
94# define NO_SSL2
95# endif
90# if defined(OPENSSL_NO_STORE) && !defined(NO_STORE) 96# if defined(OPENSSL_NO_STORE) && !defined(NO_STORE)
91# define NO_STORE 97# define NO_STORE
92# endif 98# endif
diff --git a/src/lib/libssl/crypto/arch/vax/opensslconf.h b/src/lib/libssl/crypto/arch/vax/opensslconf.h
index c1fc4e5d11..7c7015c9b7 100644
--- a/src/lib/libssl/crypto/arch/vax/opensslconf.h
+++ b/src/lib/libssl/crypto/arch/vax/opensslconf.h
@@ -37,6 +37,9 @@
37#ifndef OPENSSL_NO_SEED 37#ifndef OPENSSL_NO_SEED
38# define OPENSSL_NO_SEED 38# define OPENSSL_NO_SEED
39#endif 39#endif
40#ifndef OPENSSL_NO_SSL2
41# define OPENSSL_NO_SSL2
42#endif
40#ifndef OPENSSL_NO_STORE 43#ifndef OPENSSL_NO_STORE
41# define OPENSSL_NO_STORE 44# define OPENSSL_NO_STORE
42#endif 45#endif
@@ -87,6 +90,9 @@
87# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED) 90# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED)
88# define NO_SEED 91# define NO_SEED
89# endif 92# endif
93# if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2)
94# define NO_SSL2
95# endif
90# if defined(OPENSSL_NO_STORE) && !defined(NO_STORE) 96# if defined(OPENSSL_NO_STORE) && !defined(NO_STORE)
91# define NO_STORE 97# define NO_STORE
92# endif 98# endif
diff --git a/src/lib/libssl/shlib_version b/src/lib/libssl/shlib_version
index 730231c38d..94727e17b3 100644
--- a/src/lib/libssl/shlib_version
+++ b/src/lib/libssl/shlib_version
@@ -1,2 +1,2 @@
1major=17 1major=18
2minor=1 2minor=0
diff --git a/src/lib/libssl/src/Makefile b/src/lib/libssl/src/Makefile
index 8fe888587e..aef28bea2c 100644
--- a/src/lib/libssl/src/Makefile
+++ b/src/lib/libssl/src/Makefile
@@ -13,7 +13,7 @@ SHLIB_MAJOR=1
13SHLIB_MINOR=0.0 13SHLIB_MINOR=0.0
14SHLIB_EXT= 14SHLIB_EXT=
15PLATFORM=dist 15PLATFORM=dist
16OPTIONS= no-gmp no-jpake no-krb5 no-md2 no-rc5 no-rfc3779 no-shared no-store no-zlib no-zlib-dynamic static-engine 16OPTIONS= no-gmp no-jpake no-krb5 no-md2 no-rc5 no-rfc3779 no-shared no-ssl2 no-store no-zlib no-zlib-dynamic static-engine
17CONFIGURE_ARGS=dist 17CONFIGURE_ARGS=dist
18SHLIB_TARGET= 18SHLIB_TARGET=
19 19
@@ -61,7 +61,7 @@ OPENSSLDIR=/usr/local/ssl
61 61
62CC= cc 62CC= cc
63CFLAG= -O 63CFLAG= -O
64DEPFLAG= -DOPENSSL_NO_GMP -DOPENSSL_NO_JPAKE -DOPENSSL_NO_MD2 -DOPENSSL_NO_RC5 -DOPENSSL_NO_RFC3779 -DOPENSSL_NO_STORE 64DEPFLAG= -DOPENSSL_NO_GMP -DOPENSSL_NO_JPAKE -DOPENSSL_NO_MD2 -DOPENSSL_NO_RC5 -DOPENSSL_NO_RFC3779 -DOPENSSL_NO_STORE -DOPENSSL_NO_SSL2
65PEX_LIBS= 65PEX_LIBS=
66EX_LIBS= 66EX_LIBS=
67EXE_EXT= 67EXE_EXT=
diff --git a/src/lib/libssl/src/apps/s_client.c b/src/lib/libssl/src/apps/s_client.c
index b0af5190d8..d9d060696f 100644
--- a/src/lib/libssl/src/apps/s_client.c
+++ b/src/lib/libssl/src/apps/s_client.c
@@ -320,7 +320,9 @@ static void sc_usage(void)
320 BIO_printf(bio_err," -jpake arg - JPAKE secret to use\n"); 320 BIO_printf(bio_err," -jpake arg - JPAKE secret to use\n");
321# endif 321# endif
322#endif 322#endif
323#ifndef OPENSSL_NO_SSL2
323 BIO_printf(bio_err," -ssl2 - just use SSLv2\n"); 324 BIO_printf(bio_err," -ssl2 - just use SSLv2\n");
325#endif
324 BIO_printf(bio_err," -ssl3 - just use SSLv3\n"); 326 BIO_printf(bio_err," -ssl3 - just use SSLv3\n");
325 BIO_printf(bio_err," -tls1 - just use TLSv1\n"); 327 BIO_printf(bio_err," -tls1 - just use TLSv1\n");
326 BIO_printf(bio_err," -dtls1 - just use DTLSv1\n"); 328 BIO_printf(bio_err," -dtls1 - just use DTLSv1\n");
diff --git a/src/lib/libssl/ssl/Makefile b/src/lib/libssl/ssl/Makefile
index 8926ce5423..3215b33574 100644
--- a/src/lib/libssl/ssl/Makefile
+++ b/src/lib/libssl/ssl/Makefile
@@ -1,4 +1,4 @@
1# $OpenBSD: Makefile,v 1.23 2010/10/01 23:02:02 djm Exp $ 1# $OpenBSD: Makefile,v 1.24 2012/07/11 11:02:48 sthen Exp $
2 2
3LIB= ssl 3LIB= ssl
4WANTLINT= 4WANTLINT=
@@ -10,6 +10,7 @@ LSSL_SRC= ${.CURDIR}/../${SSLEAYDIST}/ssl
10CFLAGS+= -DOPENSSL_NO_IDEA -DTERMIOS -DANSI_SOURCE 10CFLAGS+= -DOPENSSL_NO_IDEA -DTERMIOS -DANSI_SOURCE
11CFLAGS+= -DOPENSSL_NO_MDC2 11CFLAGS+= -DOPENSSL_NO_MDC2
12CFLAGS+= -DOPENSSL_NO_RC5 -DOPENSSL_NO_KRB5 12CFLAGS+= -DOPENSSL_NO_RC5 -DOPENSSL_NO_KRB5
13CFLAGS+= -DOPENSSL_NO_SSL2
13CFLAGS+= -I${.CURDIR}/../${SSLEAYDIST} -I${.CURDIR}/../${SSLEAYDIST}/crypto 14CFLAGS+= -I${.CURDIR}/../${SSLEAYDIST} -I${.CURDIR}/../${SSLEAYDIST}/crypto
14 15
15SRCS=\ 16SRCS=\
diff --git a/src/lib/libssl/ssl/shlib_version b/src/lib/libssl/ssl/shlib_version
index 730231c38d..94727e17b3 100644
--- a/src/lib/libssl/ssl/shlib_version
+++ b/src/lib/libssl/ssl/shlib_version
@@ -1,2 +1,2 @@
1major=17 1major=18
2minor=1 2minor=0
diff --git a/src/usr.sbin/openssl/Makefile b/src/usr.sbin/openssl/Makefile
index 20307fcbfc..a3948a7ae0 100644
--- a/src/usr.sbin/openssl/Makefile
+++ b/src/usr.sbin/openssl/Makefile
@@ -1,4 +1,4 @@
1# $OpenBSD: Makefile,v 1.19 2010/10/01 23:04:33 djm Exp $ 1# $OpenBSD: Makefile,v 1.20 2012/07/11 11:02:48 sthen Exp $
2 2
3PROG= openssl 3PROG= openssl
4LDADD= -lssl -lcrypto 4LDADD= -lssl -lcrypto
@@ -11,6 +11,7 @@ SSLEAY_SRC_TOP= ${.CURDIR}/../../${SSLEAYDIST}
11 11
12CFLAGS+= -DMONOLITH -DOPENSSL_NO_IDEA -DTERMIOS -DANSI_SOURCE -DOPENSSL_NO_RC5 12CFLAGS+= -DMONOLITH -DOPENSSL_NO_IDEA -DTERMIOS -DANSI_SOURCE -DOPENSSL_NO_RC5
13CFLAGS+= -DOPENSSL_NO_MDC2 13CFLAGS+= -DOPENSSL_NO_MDC2
14CFLAGS+= -DOPENSSL_NO_SSL2
14CFLAGS+= -I${SSLEAY_SRC_TOP} 15CFLAGS+= -I${SSLEAY_SRC_TOP}
15 16
16SRCS= verify.c asn1pars.c req.c dgst.c dh.c enc.c passwd.c gendh.c errstr.c \ 17SRCS= verify.c asn1pars.c req.c dgst.c dh.c enc.c passwd.c gendh.c errstr.c \
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-10-24 04:21:09 +0000