stream: Really enable SSL streams.

SSL streams were supposed to work, but they didn't.  Oops.

diff --git a/lib/stream.c b/lib/stream.c
index 8d97afe98e5c0ff606cc59f76c2a4895a05750fb..dcd8da5856245520f8fec44031c1d0ac2abf810a 100644 (file)
--- a/lib/stream.c
+++ b/lib/stream.c
@@ -48,11 +48,17 @@ enum stream_state {
 static struct stream_class *stream_classes[] = {
     &tcp_stream_class,
     &unix_stream_class,
+#ifdef HAVE_OPENSSL
+    &ssl_stream_class,
+#endif
 };
 
 static struct pstream_class *pstream_classes[] = {
     &ptcp_pstream_class,
     &punix_pstream_class,
+#ifdef HAVE_OPENSSL
+    &pssl_pstream_class,
+#endif
 };
 
 /* Check the validity of the stream class structures. */

diff --git a/tests/automake.mk b/tests/automake.mk
index f964d3486642c4a67f15c431d391967101b1d6da..9bc3f8c5fb290095cb26359930fedd2ac1e55634 100644 (file)
--- a/tests/automake.mk
+++ b/tests/automake.mk
@@ -109,7 +109,7 @@ tests_test_lockfile_LDADD = lib/libopenvswitch.a
 
 noinst_PROGRAMS += tests/test-ovsdb
 tests_test_ovsdb_SOURCES = tests/test-ovsdb.c tests/idltest.c tests/idltest.h
-tests_test_ovsdb_LDADD = ovsdb/libovsdb.a lib/libopenvswitch.a
+tests_test_ovsdb_LDADD = ovsdb/libovsdb.a lib/libopenvswitch.a $(SSL_LIBS)
 EXTRA_DIST += tests/uuidfilt.pl tests/idltest.ovsidl
 BUILT_SOURCES += tests/idltest.c tests/idltest.h
 noinst_DATA += tests/idltest.ovsschema

diff --git a/utilities/automake.mk b/utilities/automake.mk
index 1ae50bf5332e38345ac811a45d4b8c215965995f..b3d784188b7bc9c6fbae21bc95dda3489680afc7 100644 (file)
--- a/utilities/automake.mk
+++ b/utilities/automake.mk
@@ -76,7 +76,7 @@ utilities_ovs_openflowd_LDADD = \
        $(SSL_LIBS)
 
 utilities_ovs_vsctl_SOURCES = utilities/ovs-vsctl.c vswitchd/vswitch-idl.c
-utilities_ovs_vsctl_LDADD = lib/libopenvswitch.a
+utilities_ovs_vsctl_LDADD = lib/libopenvswitch.a $(SSL_LIBS)
 
 utilities_ovs_wdt_SOURCES = utilities/ovs-wdt.c
 

diff --git a/vswitchd/automake.mk b/vswitchd/automake.mk
index 694c308a7ea06fba272fbebbab6205fc6e4b473c..f39a032542db85c78853044790bd09d5ff1c05a8 100644 (file)
--- a/vswitchd/automake.mk
+++ b/vswitchd/automake.mk
@@ -26,7 +26,7 @@ vswitchd_ovs_brcompatd_SOURCES = \
        vswitchd/vswitch-idl.c \
        vswitchd/vswitch-idl.h
 
-vswitchd_ovs_brcompatd_LDADD = lib/libopenvswitch.a
+vswitchd_ovs_brcompatd_LDADD = lib/libopenvswitch.a $(SSL_LIBS)
 
 EXTRA_DIST += \
        vswitchd/ovs-vswitchd.8.in \