Add SSL support to "stream" library and OVSDB.

dkarhi · Jan 6, 2010 · 9467fe6 · 9467fe6
1 parent d474bd0
commit 9467fe6
Show file tree

Hide file tree

Showing 21 changed files with 1,272 additions and 58 deletions.
diff --git a/lib/automake.mk b/lib/automake.mk
@@ -122,6 +122,7 @@ lib_libopenvswitch_a_SOURCES = \
 	lib/stream-fd.c \
 	lib/stream-fd.h \
 	lib/stream-provider.h \
+	lib/stream-ssl.h \
 	lib/stream-tcp.c \
 	lib/stream-unix.c \
 	lib/stream.c \
@@ -168,6 +169,7 @@ endif
 
 if HAVE_OPENSSL
 lib_libopenvswitch_a_SOURCES += \
+	lib/stream-ssl.c \
 	lib/vconn-ssl.c 
 nodist_lib_libopenvswitch_a_SOURCES += lib/dhparams.c
 lib/dhparams.c: lib/dh1024.pem lib/dh2048.pem lib/dh4096.pem
@@ -193,8 +195,10 @@ EXTRA_DIST += \
 	lib/dpif.man \
 	lib/leak-checker.man \
 	lib/ssl-bootstrap.man \
+	lib/ssl-bootstrap-syn.man \
 	lib/ssl-peer-ca-cert.man \
 	lib/ssl.man \
+	lib/ssl-syn.man \
 	lib/vconn-active.man \
 	lib/vconn-passive.man \
 	lib/vlog-unixctl.man \

diff --git a/lib/ssl-bootstrap-syn.man b/lib/ssl-bootstrap-syn.man
@@ -0,0 +1,2 @@
+.br
+[\fB\-\-bootstrap\-ca\-cert=\fIcacert.pem]
diff --git a/lib/ssl-syn.man b/lib/ssl-syn.man
@@ -0,0 +1,6 @@
+.IP "Public key infrastructure options:"
+[\fB\-\-private\-key=\fIprivkey.pem\fR]
+.br
+[\fB\-\-certificate=\fIcert.pem\fR]
+.br
+[\fB\-\-ca\-cert=\fIswitch\-cacert.pem\fR]
diff --git a/lib/stream-provider.h b/lib/stream-provider.h
@@ -181,5 +181,9 @@ extern struct stream_class tcp_stream_class;
 extern struct pstream_class ptcp_pstream_class;
 extern struct stream_class unix_stream_class;
 extern struct pstream_class punix_pstream_class;
+#ifdef HAVE_OPENSSL
+extern struct stream_class ssl_stream_class;
+extern struct pstream_class pssl_pstream_class;
+#endif
 
 #endif /* stream-provider.h */
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		.br
		[\fB\-\-bootstrap\-ca\-cert=\fIcacert.pem]