X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fstream-ssl.h;h=6bea577d32eb69126dc3aa21f21ab8bf9c511c55;hb=d295e8e97acae13552a5b220d3fbcff8201064a2;hp=3c2a8986a5215b26e0f1038a364f6d299bd71810;hpb=9467fe624698a9b72f81bb1ddfce33a5fc85281c;p=openvswitch

diff --git a/lib/stream-ssl.h b/lib/stream-ssl.h
index 3c2a8986..6bea577d 100644
--- a/lib/stream-ssl.h
+++ b/lib/stream-ssl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009 Nicira Networks.
+ * Copyright (c) 2008, 2009, 2010 Nicira Networks.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,12 +20,23 @@
 
 #ifdef HAVE_OPENSSL
 bool stream_ssl_is_configured(void);
+
 void stream_ssl_set_private_key_file(const char *file_name);
 void stream_ssl_set_certificate_file(const char *file_name);
 void stream_ssl_set_ca_cert_file(const char *file_name, bool bootstrap);
+
+void stream_ssl_set_key_and_cert(const char *private_key_file,
+                                 const char *certificate_file);
+
+
 void stream_ssl_set_peer_ca_cert_file(const char *file_name);
 
-#define STREAM_SSL_LONG_OPTIONS                     \
+/* Define the long options for SSL support.
+ *
+ * Note that the definition includes a final comma, and therefore a comma
+ * must not be supplied when using the definition.  This is done so that
+ * compilation succeeds whether or not HAVE_OPENSSL is defined. */
+#define STREAM_SSL_LONG_OPTIONS                      \
         {"private-key", required_argument, 0, 'p'}, \
         {"certificate", required_argument, 0, 'c'}, \
         {"ca-cert",     required_argument, 0, 'C'},
@@ -43,7 +54,7 @@ void stream_ssl_set_peer_ca_cert_file(const char *file_name);
             stream_ssl_set_ca_cert_file(optarg, false); \
             break;
 #else /* !HAVE_OPENSSL */
-static inline bool stream_ssl_is_configured(void) 
+static inline bool stream_ssl_is_configured(void)
 {
     return false;
 }