Changeset 5406

Timestamp:

03/15/08 09:31:25 (4 months ago)

Author:

morris

Message:

Add WI_P7_TLS socket options, allows tunneling P7 over a TLS connection

Files:

• libwired/trunk/config.m4 (modified) (1 diff)
• libwired/trunk/configure (modified) (2 diffs)
• libwired/trunk/configure.in (modified) (1 diff)
• libwired/trunk/libwired/p7/wi-p7-socket.c (modified) (18 diffs)
• libwired/trunk/libwired/p7/wi-p7-socket.h (modified) (3 diffs)
• libwired/trunk/libwired/p7/wi-p7-spec.c (modified) (6 diffs)

libwired/trunk/config.m4

@@ -97 +97 @@
-AC_DEFUN([WI_INCLUDE_P7_LIBRARIES], [
-        WI_INCLUDE_CRYPTO_LIBRARY
+        WI_INCLUDE_SSL_LIBRARY
-        WI_INCLUDE_LIBXML2_LIBRARY
-        WI_INCLUDE_ZLIB_LIBRARY

libwired/trunk/configure

@@ -3706 +3706 @@
-
-if test -n "$enable_p7"; then
-
+SSL -DWI_
-fi
-
@@ -7254 +7254 @@
-
-                        LIBS="$LIBS -lcrypto"
+
+else
+
+
+        { { echo "$as_me:$LINENO: error: could not locate OpenSSL
+
+If you installed OpenSSL into a non-standard directory, please run:
+
+    env CPPFLAGS=\"-I/path/to/include\" LDFLAGS=\"-L/path/to/lib\" ./configure" >&5
+echo "$as_me: error: could not locate OpenSSL
+
+If you installed OpenSSL into a non-standard directory, please run:
+
+    env CPPFLAGS=\"-I/path/to/include\" LDFLAGS=\"-L/path/to/lib\" ./configure" >&2;}
+   { (exit 1); exit 1; }; }
+
+
+fi
+
+
+else
+
+
+        { { echo "$as_me:$LINENO: error: could not locate OpenSSL
+
+If you installed OpenSSL into a non-standard directory, please run:
+
+    env CPPFLAGS=\"-I/path/to/include\" LDFLAGS=\"-L/path/to/lib\" ./configure" >&5
+echo "$as_me: error: could not locate OpenSSL
+
+If you installed OpenSSL into a non-standard directory, please run:
+
+    env CPPFLAGS=\"-I/path/to/include\" LDFLAGS=\"-L/path/to/lib\" ./configure" >&2;}
+   { (exit 1); exit 1; }; }
+
+
+fi
+
+done
+
+
+
+
+        if test "$_wi_ssl_paths_added" != yes ; then
+                if test -d /usr/local/ssl/include; then
+                        CPPFLAGS="$CPPFLAGS -I/usr/local/ssl/include"
+                fi
+
+                if test -d /usr/kerberos/include; then
+                        CPPFLAGS="$CPPFLAGS -I/usr/kerberos/include"
+                fi
+
+                if test -d /usr/local/ssl/lib; then
+                        LDFLAGS="$LDFLAGS -L/usr/local/ssl/lib"
+                fi
+        fi
+
+        _wi_ssl_paths_added=yes
+
+
+
+for ac_header in openssl/ssl.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  { echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+ac_res=`eval echo '${'$as_ac_Header'}'`
+               { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+else
+  # Is the header compilable?
+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+         test -z "$ac_c_werror_flag" ||
+         test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+        ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <$ac_header>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+         test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+         test ! -s conftest.err
+       }; then
+  ac_header_preproc=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    ( cat <<\_ASBOX
+## ------------------------------------- ##
+## Report this to axel@zankasoftware.com ##
+## ------------------------------------- ##
+_ASBOX
+     ) | sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  eval "$as_ac_Header=\$ac_header_preproc"
+fi
+ac_res=`eval echo '${'$as_ac_Header'}'`
+               { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+
+fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+                { echo "$as_me:$LINENO: checking for SSL_library_init in -lssl" >&5
+echo $ECHO_N "checking for SSL_library_init in -lssl... $ECHO_C" >&6; }
+if test "${ac_cv_lib_ssl_SSL_library_init+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lssl  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char SSL_library_init ();
+int
+main ()
+{
+return SSL_library_init ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+         test -z "$ac_c_werror_flag" ||
+         test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  ac_cv_lib_ssl_SSL_library_init=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+        ac_cv_lib_ssl_SSL_library_init=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_ssl_SSL_library_init" >&5
+echo "${ECHO_T}$ac_cv_lib_ssl_SSL_library_init" >&6; }
+if test $ac_cv_lib_ssl_SSL_library_init = yes; then
+
+                        LIBS="$LIBS -lssl"
-
-else

libwired/trunk/configure.in

@@ -89 +89 @@
-
-if test -n "$enable_p7"; then
-
+SSL -DWI_
-fi
-

libwired/trunk/libwired/p7/wi-p7-socket.c

@@ -138 +138 @@
-        wi_p7_options_t                                                 options;
-        
+        wi_boolean_t                                                    tls_enabled;
+        wi_socket_tls_t                                                 *tls;
+        
-        wi_boolean_t                                                    encryption_enabled;
-        wi_rsa_t                                                                *rsa;
@@ -178 +181 @@
-static wi_boolean_t                                                     _wi_p7_socket_connect_handshake(wi_p7_socket_t *, wi_time_interval_t, wi_p7_options_t);
-static wi_boolean_t                                                     _wi_p7_socket_accept_handshake(wi_p7_socket_t *, wi_time_interval_t, wi_p7_options_t);
+static wi_boolean_t                                                     _wi_p7_socket_connect_tls(wi_p7_socket_t *, wi_time_interval_t);
+static wi_boolean_t                                                     _wi_p7_socket_accept_tls(wi_p7_socket_t *, wi_time_interval_t);
-static wi_boolean_t                                                     _wi_p7_socket_connect_key_exchange(wi_p7_socket_t *, wi_time_interval_t, wi_string_t *, wi_string_t *);
-static wi_boolean_t                                                     _wi_p7_socket_accept_key_exchange(wi_p7_socket_t *, wi_time_interval_t);
@@ -313 +318 @@
-
-
+void wi_p7_socket_set_tls(wi_p7_socket_t *p7_socket, wi_socket_tls_t *tls) {
+        wi_retain(tls);
+        wi_release(p7_socket->tls);
+        
+        p7_socket->tls = tls;
+}
+
+
+
+wi_socket_tls_t * wi_p7_socket_tls(wi_p7_socket_t *p7_socket) {
+        return p7_socket->tls;
+}
+
+
+
-#pragma mark -
-
@@ -357 +377 @@
-        wi_string_t                     *version;
-        wi_p7_message_t         *p7_message;
-
+
+
-        
-        p7_message = wi_p7_message_with_name(WI_STR("p7.handshake.client_handshake"), wi_p7_socket_spec(p7_socket));
@@ -367 +388 @@
-                return false;
-        
-_
-
-
-_
+.
+
+
+.
-                return false;
-        
-        if(p7_socket->serialization == WI_P7_BINARY) {
+                if(WI_P7_TLS_ENABLED(options)) {
+                        if(!wi_p7_message_set_bool_for_name(p7_message, true, WI_STR("p7.handshake.tls")))
+                                return false;
+                }
+
-                if(WI_P7_COMPRESSION_ENABLED(options)) {
-                        if(!wi_p7_message_set_enum_for_name(p7_message,
@@ -432 +458 @@
-        }
-        
-_
+.
-        
-        if(!p7_socket->name) {
-                wi_error_set_libwired_p7_error(WI_ERROR_P7_HANDSHAKEFAILED,
-_
-
-
-
-
-_
+.
+
+
+
+
+.
-
-        if(!p7_socket->version) {
-                wi_error_set_libwired_p7_error(WI_ERROR_P7_HANDSHAKEFAILED,
-_
+.
-                
-                return false;
@@ -453 +479 @@
-
-        if(p7_socket->serialization == WI_P7_BINARY) {
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-        }
-        
@@ -487 +516 @@
-        wi_string_t                     *version;
-        wi_p7_message_t         *p7_message;
-
+
+
-        wi_p7_options_t         client_options;
-        
@@ -520 +550 @@
-        }
-        
-_
+.
-        
-        if(!p7_socket->name) {
-                wi_error_set_libwired_p7_error(WI_ERROR_P7_HANDSHAKEFAILED,
-_
-
-
-
-
-_
+.
+
+
+
+
+.
-
-        if(!p7_socket->version) {
-                wi_error_set_libwired_p7_error(WI_ERROR_P7_HANDSHAKEFAILED,
-_
+.
-                
-                return false;
@@ -541 +571 @@
-
-        if(p7_socket->serialization == WI_P7_BINARY) {
-enum_for_name(p7_message, &flag, WI_STR("p7.handshake.compression"))
-_WI_P7_COMPRESSION_ENUM_TO_OPTIONS(flag)
+bool_for_name(p7_message, &bflag, WI_STR("p7.handshake.tls")) && bflag
+WI_P7_TLS
-                        
-                        if(options & client_options)
@@ -548 +578 @@
-                }
-                
-flag, WI_STR("p7.handshake.encrypt
-ENCRYPTION_ENUM_TO_OPTIONS(
-
+eflag, WI_STR("p7.handshake.compress
+COMPRESSION_ENUM_TO_OPTIONS(e
+
-                        if(options & client_options)
-                                p7_socket->options |= client_options;
-                }
-                
-flag, WI_STR("p7.handshake.checksum
-CHECKSUM_ENUM_TO_OPTIONS(
+eflag, WI_STR("p7.handshake.encryption
+ENCRYPTION_ENUM_TO_OPTIONS(e
-
-                        if(options & client_options)
-                                p7_socket->options |= client_options;
-                }
+                
+                if(wi_p7_message_get_enum_for_name(p7_message, &eflag, WI_STR("p7.handshake.checksum"))) {
+                        client_options = _WI_P7_CHECKSUM_ENUM_TO_OPTIONS(eflag);
+
+                        if(options & client_options)
+                                p7_socket->options |= client_options;
+                }
-        }
-        
@@ -571 +608 @@
-                return false;
-        
-_
-
-
-_
+.
+
+
+.
-                return false;
-        
-        if(p7_socket->serialization == WI_P7_BINARY) {
+                if(WI_P7_TLS_ENABLED(p7_socket->options)) {
+                        if(!wi_p7_message_set_bool_for_name(p7_message, true, WI_STR("p7.handshake.tls")))
+                                return false;
+                }
+
-                if(WI_P7_COMPRESSION_ENABLED(p7_socket->options)) {
-                        if(!wi_p7_message_set_enum_for_name(p7_message,
@@ -632 +674 @@
-
-
+static wi_boolean_t _wi_p7_socket_connect_tls(wi_p7_socket_t *p7_socket, wi_time_interval_t timeout) {
+        return wi_socket_connect_tls(p7_socket->socket, p7_socket->tls, timeout);
+}
+
+
+
+static wi_boolean_t _wi_p7_socket_accept_tls(wi_p7_socket_t *p7_socket, wi_time_interval_t timeout) {
+        return wi_socket_accept_tls(p7_socket->socket, p7_socket->tls, timeout);
+}
+
+
+
-static wi_boolean_t _wi_p7_socket_connect_key_exchange(wi_p7_socket_t *p7_socket, wi_time_interval_t timeout, wi_string_t *username, wi_string_t *password) {
-        wi_p7_message_t         *p7_message;
@@ -676 +730 @@
-        data = wi_rsa_encrypt(p7_socket->rsa, wi_cipher_key(p7_socket->cipher));
-        
-_
+.
-                return false;
-
@@ -684 +738 @@
-                data = wi_rsa_encrypt(p7_socket->rsa, data);
-                
-_
+.
-                        return false;
-        }
@@ -802 +856 @@
-        }
-
-_
-_
+.
+.
-        
-        if(!key) {
-                wi_error_set_libwired_p7_error(WI_ERROR_P7_HANDSHAKEFAILED,
-_
+.
-                
-                return false;
@@ -1395 +1449 @@
-                _wi_p7_socket_configure_checksum(p7_socket);
-        
+        if(WI_P7_TLS_ENABLED(p7_socket->options)) {
+                if(!_wi_p7_socket_connect_tls(p7_socket, timeout))
+                        return false;
+        }
+        
-        if(WI_P7_ENCRYPTION_ENABLED(p7_socket->options)) {
-                if(!_wi_p7_socket_connect_key_exchange(p7_socket, timeout, username, password))
@@ -1426 +1485 @@
-        if(WI_P7_CHECKSUM_ENABLED(p7_socket->options))
-                _wi_p7_socket_configure_checksum(p7_socket);
+        
+        if(WI_P7_TLS_ENABLED(p7_socket->options)) {
+                if(!_wi_p7_socket_accept_tls(p7_socket, timeout))
+                        return false;
+        }
-        
-        if(WI_P7_ENCRYPTION_ENABLED(p7_socket->options)) {

libwired/trunk/libwired/p7/wi-p7-socket.h

@@ -35 +35 @@
-#include <wired/wi-socket.h>
-
+#define WI_P7_TLS_ENABLED(options)                                                      \
+        (((options) & WI_P7_TLS))
+
-#define WI_P7_COMPRESSION_ENABLED(options)                                      \
-        (((options) & WI_P7_COMPRESSION_DEFLATE))
@@ -50 +53 @@
-
-enum _wi_p7_options {
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-                                                                                                           WI_P7_ENCRYPTION_RSA_AES128_SHA1 |
-                                                                                                           WI_P7_ENCRYPTION_RSA_AES192_SHA1 |
@@ -79 +84 @@
-WI_EXPORT void                                                                          wi_p7_socket_set_private_rsa(wi_p7_socket_t *, wi_rsa_t *);
-WI_EXPORT wi_rsa_t *                                                            wi_p7_socket_private_rsa(wi_p7_socket_t *);
+WI_EXPORT void                                                                          wi_p7_socket_set_tls(wi_p7_socket_t *, wi_socket_tls_t *);
+WI_EXPORT wi_socket_tls_t *                                                     wi_p7_socket_tls(wi_p7_socket_t *);
-
-WI_EXPORT wi_socket_t *                                                         wi_p7_socket_socket(wi_p7_socket_t *);

libwired/trunk/libwired/p7/wi-p7-spec.c

@@ -368 +368 @@
-        "       <p7:fields>"
-        "               <p7:field name=\"p7.handshake.version\" type=\"string\" id=\"1\" />"
-
-
-
+
+
+
+
-        "                       <p7:enum name=\"p7.handshake.compression.deflate\" value=\"0\" />"
-        "               </p7:field>"
-5
+6
-        "                       <p7:enum name=\"p7.handshake.encryption.rsa_aes128_sha1\" value=\"0\" />"
-        "                       <p7:enum name=\"p7.handshake.encryption.rsa_aes192_sha1\" value=\"1\" />"
@@ -380 +381 @@
-        "                       <p7:enum name=\"p7.handshake.encryption.rsa_3des192_sha1\" value=\"4\" />"
-        "               </p7:field>"
-6
+7
-        "                       <p7:enum name=\"p7.handshake.checksum.sha1\" value=\"0\" />"
-        "               </p7:field>"
-7
+8
-        ""
-8
-_key\" id=\"9
-_iv\" id=\"10
-1
-2
-3
+9
+.key\" id=\"10
+.iv\" id=\"11
+2
+3
+4
-        ""
-4
-5
+5
+6
-        "       </p7:fields>"
-        ""
@@ -399 +400 @@
-        "               <p7:message name=\"p7.handshake.client_handshake\" id=\"1\">"
-        "                       <p7:parameter field=\"p7.handshake.version\" use=\"required\" />"
-
-
+
+
+
-        "                       <p7:parameter field=\"p7.handshake.encryption\" />"
-        "                       <p7:parameter field=\"p7.handshake.compression\" />"
@@ -408 +410 @@
-        "               <p7:message name=\"p7.handshake.server_handshake\" id=\"2\">"
-        "                       <p7:parameter field=\"p7.handshake.version\" use=\"required\" />"
-
-
+
+
+
-        "                       <p7:parameter field=\"p7.handshake.encryption\" />"
-        "                       <p7:parameter field=\"p7.handshake.compression\" />"
@@ -425 +428 @@
-        ""
-        "               <p7:message name=\"p7.encryption.client_key\" id=\"5\">"
-_
-_
+.
+.
-        "                       <p7:parameter field=\"p7.encryption.username\" use=\"required\" />"
-        "                       <p7:parameter field=\"p7.encryption.client_password\" use=\"required\" />"
@@ -516 +519 @@
-
-wi_p7_spec_t * wi_p7_spec_builtin_spec(void) {
-
+ {
-                _wi_p7_spec_builtin_spec = _wi_p7_spec_init_builtin_spec(wi_p7_spec_alloc());
+                
+                if(!_wi_p7_spec_builtin_spec)
+                        wi_log_info(WI_STR("Could not load builtin P7 spec: %m"));
+        }
-        
-        return _wi_p7_spec_builtin_spec;