Changeset 4629

Timestamp:

02/14/07 23:17:09 (2 years ago)

Author:

morris

Message:

More p7 fixes:

* Handle * ? + in reply count field
* When checking compatibility, only do commutative check on reply order, not full reply compatibility
* Add WI_INTEGER_MIN/MAX
* Add name/bits accessors to cipher

Files:

• libwired/trunk/libwired/base/wi-base.h (modified) (3 diffs)
• libwired/trunk/libwired/file/wi-file.c (modified) (1 diff)
• libwired/trunk/libwired/p7/wi-p7-base.h (modified) (1 diff)
• libwired/trunk/libwired/p7/wi-p7-crypto.c (modified) (9 diffs)
• libwired/trunk/libwired/p7/wi-p7-crypto.h (modified) (3 diffs)
• libwired/trunk/libwired/p7/wi-p7-message.h (modified) (1 diff)
• libwired/trunk/libwired/p7/wi-p7-private.h (modified) (1 diff)
• libwired/trunk/libwired/p7/wi-p7-socket.c (modified) (16 diffs)
• libwired/trunk/libwired/p7/wi-p7-socket.h (modified) (2 diffs)
• libwired/trunk/libwired/p7/wi-p7-spec.c (modified) (13 diffs)
• libwired/trunk/libwired/p7/wi-p7-spec.h (modified) (1 diff)

libwired/trunk/libwired/base/wi-base.h

@@ -60 +60 @@
-#endif
-
-#define _WI_STRINGIFY(s)                        #s
-#define WI_STRINGIFY(s)                         _WI_STRINGIFY(s)
-
-#if __LP64__
-#define WI_64                                           1
@@ -68 +65 @@
-typedef int64_t                                         wi_integer_t;
-typedef uint64_t                                        wi_uinteger_t;
+
+#define WI_INTEGER_MIN                          INT64_MIN
+#define WI_INTEGER_MAX                          INT64_MAX
+#define WI_UINTEGER_MAX                         UINT64_MAX
-#else
-#define WI_32                                           1
@@ -73 +74 @@
-typedef int32_t                                         wi_integer_t;
-typedef uint32_t                                        wi_uinteger_t;
+
+#define WI_INTEGER_MIN                          INT32_MIN
+#define WI_INTEGER_MAX                          INT32_MAX
+#define WI_UINTEGER_MAX                         UINT32_MAX
-#endif
-
-
-enum {
-
-
-
-
-
+
-};
-

libwired/trunk/libwired/file/wi-file.c

@@ -72 +72 @@
-#include <wired/wi-string.h>
-
-#ifndef UINT_MAX
-#define UINT_MAX 4294967295U
-#endif
-
-#define _WI_FILE_ASSERT_OPEN(file) \
-        WI_ASSERT((file)->fd >= 0, "%@ is not open", (file))

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

@@ -34 +34 @@
-typedef struct _wi_p7_spec                      wi_p7_spec_t;
-
-ARRAY
+P7_BASE

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

@@ -51 +51 @@
-static wi_string_t *                                    _wi_p7_rsa_description(wi_runtime_instance_t *);
-
+static wi_data_t *                                              _wi_p7_rsa_public_key_data(wi_p7_rsa_t *);
+
-static wi_runtime_id_t                                  _wi_p7_rsa_runtime_id = WI_RUNTIME_ID_NULL;
-static wi_runtime_class_t                               _wi_p7_rsa_runtime_class = {
@@ -119 +121 @@
-
-
-size
+bits
-        p7_rsa->rsa = RSA_generate_key(size, RSA_F4, NULL, NULL);
-        
@@ -128 +130 @@
-        }
-        
+        p7_rsa->public_key_data = wi_retain(_wi_p7_rsa_public_key_data(p7_rsa));
+        
+        if(!p7_rsa->public_key_data) {
+                wi_release(p7_rsa);
+
+                return NULL;
+        }
+        
-        return p7_rsa;
-}
@@ -134 +144 @@
-
-wi_p7_rsa_t * wi_p7_rsa_init_with_pem_file(wi_p7_rsa_t *p7_rsa, wi_string_t *path) {
-
-
-
+
-        
-        fp = fopen(wi_string_cstring(path), "r");
@@ -150 +158 @@
-        p7_rsa->rsa = PEM_read_RSAPrivateKey(fp, NULL, NULL, NULL);
-        
+        fclose(fp);
+        
-        if(!p7_rsa->rsa) {
-                wi_error_set_openssl_error();
@@ -158 +168 @@
-        }
-        
-
-
-
-
-
-
+
+
+
-                wi_release(p7_rsa);
-
-                return NULL;
-        }
-        
-        p7_rsa->public_key_data = wi_data_init_with_bytes(wi_data_alloc(), buffer, length);
-
-        OPENSSL_free(buffer);
-        
-        return p7_rsa;
@@ -225 +228 @@
-#pragma mark -
-
+static wi_data_t * _wi_p7_rsa_public_key_data(wi_p7_rsa_t *p7_rsa) {
+        wi_data_t               *data;
+        unsigned char   *buffer;
+        int                             length;
+
+        buffer = NULL;
+        length = i2d_RSA_PUBKEY(p7_rsa->rsa, &buffer);
+        
+        if(length <= 0) {
+                wi_error_set_openssl_error();
+                
+                return NULL;
+        }
+        
+        data = wi_data_with_bytes(buffer, length);
+
+        OPENSSL_free(buffer);
+        
+        return data;
+}
+
+
+
+#pragma mark -
-
-wi_data_t * wi_p7_rsa_public_key_data(wi_p7_rsa_t *p7_rsa) {
@@ -429 +456 @@
-        wi_p7_cipher_t          *p7_cipher = instance;
-        
-
+name = %@, 
-        wi_runtime_class_name(p7_cipher),
-                p7_cipher,
-
+
+
-}
-
@@ -474 +502 @@
-#pragma mark -
-
+wi_string_t * wi_p7_cipher_name(wi_p7_cipher_t *p7_cipher) {
+        return wi_string_with_cstring(EVP_CIPHER_name(p7_cipher->cipher));
+}
+
+
+
+wi_uinteger_t wi_p7_cipher_bits(wi_p7_cipher_t *p7_cipher) {
+        return EVP_CIPHER_key_length(&p7_cipher->cipher_ctx) * 8;
+}
+
+
+
+#pragma mark -
+
-wi_boolean_t wi_p7_cipher_encrypt_bytes(wi_p7_cipher_t *p7_cipher, const void *decrypted_buffer, wi_uinteger_t decrypted_length, void **out_buffer, wi_uinteger_t *out_length) {
-        void                    *encrypted_buffer;

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

@@ -49 +49 @@
-
-WI_EXPORT wi_p7_rsa_t *                                 wi_p7_rsa_alloc(void);
-size
+bits
-WI_EXPORT wi_p7_rsa_t *                                 wi_p7_rsa_init_with_pem_file(wi_p7_rsa_t *, wi_string_t *);
-WI_EXPORT wi_p7_rsa_t *                                 wi_p7_rsa_init_with_public_key_data(wi_p7_rsa_t *, wi_data_t *);
@@ -70 +70 @@
-WI_EXPORT wi_data_t *                                   wi_p7_cipher_iv_data(wi_p7_cipher_t *);
-
+WI_EXPORT wi_string_t *                                 wi_p7_cipher_name(wi_p7_cipher_t *);
+WI_EXPORT wi_uinteger_t                                 wi_p7_cipher_bits(wi_p7_cipher_t *);
+
-WI_EXPORT wi_boolean_t                                  wi_p7_cipher_encrypt_bytes(wi_p7_cipher_t *, const void *, wi_uinteger_t, void **, wi_uinteger_t *);
-WI_EXPORT wi_data_t *                                   wi_p7_cipher_encrypt_data(wi_p7_cipher_t *, wi_data_t *);
@@ -75 +78 @@
-WI_EXPORT wi_data_t *                                   wi_p7_cipher_decrypt_data(wi_p7_cipher_t *, wi_data_t *);
-
-ARRAY
+P7_CRYPTO

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

@@ -110 +110 @@
-WI_EXPORT wi_date_t *                           wi_p7_message_date_for_name(wi_p7_message_t *, wi_string_t *);
-
-ARRAY
+P7_MESSAGE

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

@@ -66 +66 @@
-WI_EXPORT wi_integer_t                          wi_p7_xml_integer_for_attribute(xmlNodePtr, wi_string_t *);
-
-ARRAY
+P7_PRIVATE

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

@@ -218 +218 @@
-
-
+wi_p7_cipher_t * wi_p7_socket_cipher(wi_p7_socket_t *p7_socket) {
+        return p7_socket->cipher;
+}
+
+
+
-wi_p7_options_t wi_p7_socket_options(wi_p7_socket_t *p7_socket) {
-        return p7_socket->options;
@@ -240 +246 @@
-        p7_message = wi_p7_message_with_name(WI_STR("p7.handshake"), p7_socket);
-        
-
-
+
+
+
+
+
-
-        wi_p7_message_set_uint32_for_name(p7_message, WI_P7_VERSION, WI_STR("p7.handshake.version"));
@@ -308 +317 @@
-        p7_message = wi_p7_message_with_name(WI_STR("p7.handshake.acknowledge"), p7_socket);
-        
-
-
+
+
+
+
+
-        
-        if(p7_socket->local_compatibility_check)
@@ -378 +390 @@
-        p7_message = wi_p7_message_with_name(WI_STR("p7.handshake.reply"), p7_socket);
-
-
-
+
+
+
+
+
-        
-        wi_p7_message_set_uint32_for_name(p7_message, WI_P7_VERSION, WI_STR("p7.handshake.version"));
@@ -430 +445 @@
-        p7_message = wi_p7_socket_read_message(p7_socket, timeout);
-        
-
-
+
+
+
+
+
-        
-        if(!wi_is_equal(p7_message->name, WI_STR("p7.encryption"))) {
@@ -467 +485 @@
-        p7_message = wi_p7_message_with_name(WI_STR("p7.encryption.reply"), p7_socket);
-
-
-
+
+
+
+
+
-        
-        wi_p7_message_set_data_for_name(p7_message, wi_p7_cipher_key_data(p7_socket->cipher), WI_STR("p7.encryption.cipher_key"));
@@ -496 +517 @@
-        wi_p7_message_set_data_for_name(p7_message, data, WI_STR("p7.encryption.client_password"));
-        
-
-
+
+
+
+
+
-
-        p7_message = wi_p7_socket_read_message(p7_socket, timeout);
-        
-
-
+
+
+
+
+
-        
-        if(!wi_is_equal(p7_message->name, WI_STR("p7.encryption.acknowledge"))) {
@@ -554 +581 @@
-        rsa_data = wi_p7_rsa_public_key_data(p7_socket->rsa);
-        
-
-
+
-
-        p7_message = wi_p7_message_with_name(WI_STR("p7.encryption"), p7_socket);
-
-
-
+
+
+
+
+
-        
-        wi_p7_message_set_data_for_name(p7_message, rsa_data, WI_STR("p7.encryption.envelope_key"));
-        
-
-
+
+
+
+
+
-        
-        p7_message = wi_p7_socket_read_message(p7_socket, timeout);
-        
-
-
+
+
+
+
+
-        
-        if(!wi_is_equal(p7_message->name, WI_STR("p7.encryption.reply"))) {
@@ -593 +628 @@
-                                                                                                                   iv_data);
-
-
-
+
+
+
+
+
-        
-        data = wi_p7_message_data_for_name(p7_message, WI_STR("p7.encryption.username"));
@@ -606 +644 @@
-        data = wi_p7_rsa_private_decrypt_data(p7_socket->rsa, data);
-        
-
-
+
+
+
+
+
-        
-        username = wi_string_with_data(data);
@@ -621 +662 @@
-        data = wi_p7_rsa_private_decrypt_data(p7_socket->rsa, data);
-        
-
-
+
+
+
+
+
-
-        client_password = wi_string_with_data(data);
@@ -649 +693 @@
-        p7_message = wi_p7_message_with_name(WI_STR("p7.encryption.acknowledge"), p7_socket);
-        
-
-
+
+
+
+
+
-        
-        data = wi_p7_cipher_encrypt_data(p7_socket->cipher, wi_string_data(server_password2));
-        
-
-
-
-
+
+
+
+
+
-
-        wi_p7_message_set_data_for_name(p7_message, data, WI_STR("p7.encryption.server_password"));
-
-
-
+
+
+
+
+
-
-        p7_socket->encryption_enabled = true;
@@ -677 +728 @@
-        p7_message = wi_p7_message_with_name(WI_STR("p7.compatibility_check.specification"), p7_socket);
-        
-
-
+
+
+
+
+
-        
-        wi_p7_message_set_string_for_name(p7_message, wi_p7_spec_xml(p7_socket->spec), WI_STR("p7.compatibility_check.specification"));
@@ -754 +808 @@
-        p7_message = wi_p7_message_with_name(WI_STR("p7.compatibility_check.status"), p7_socket);
-        
-
-
+
+
+
+
+
-        
-        wi_p7_message_set_bool_for_name(p7_message, compatible, WI_STR("p7.compatibility_check.status"));
@@ -1121 +1178 @@
-                                prefix = WI_STR("<?xm");
-                        }
-=
+<
-                                p7_socket->serialization = WI_P7_BINARY;
-                        }
@@ -1131 +1188 @@
-        else if(p7_socket->serialization == WI_P7_XML)
-                p7_message = _wi_p7_socket_read_xml_message(p7_socket, timeout, prefix);
-
-
-
-
+
+
+
-                return NULL;
+        }
+
+        if(!p7_message) {
+                wi_log_info(WI_STR("unable to extract message"));
+                
+                return NULL;
+        }
-        
-        wi_p7_message_deserialize(p7_message);

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

@@ -65 +65 @@
-WI_EXPORT wi_socket_t *                                                         wi_p7_socket_socket(wi_p7_socket_t *);
-WI_EXPORT wi_p7_spec_t *                                                        wi_p7_socket_spec(wi_p7_socket_t *);
+WI_EXPORT wi_p7_cipher_t *                                                      wi_p7_socket_cipher(wi_p7_socket_t *);
-WI_EXPORT wi_p7_options_t                                                       wi_p7_socket_options(wi_p7_socket_t *);
-WI_EXPORT wi_p7_serialization_t                                         wi_p7_socket_serialization(wi_p7_socket_t *);
@@ -78 +79 @@
-WI_EXPORT wi_p7_socket_password_provider_func_t         *wi_p7_socket_password_provider;
-
-ARRAY
+P7_SOCKET

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

@@ -217 +217 @@
-
-
+#define _WI_P7_SPEC_REPLY_ONE_OR_ZERO           -1
+#define _WI_P7_SPEC_REPLY_ZERO_OR_MORE          -2
+#define _WI_P7_SPEC_REPLY_ONE_OR_MORE           -3
+
-struct _wi_p7_spec_reply {
-        wi_runtime_base_t                                               base;
@@ -226 +230 @@
-
-static _wi_p7_spec_reply_t *                            _wi_p7_spec_reply_with_node(wi_p7_spec_t *, xmlNodePtr, _wi_p7_spec_transaction_t *);
+static wi_string_t *                                            _wi_p7_spec_reply_count(_wi_p7_spec_reply_t *);
-static void                                                                     _wi_p7_spec_reply_dealloc(wi_runtime_instance_t *);
-static wi_string_t *                                            _wi_p7_spec_reply_description(wi_runtime_instance_t *);
@@ -273 +278 @@
-static wi_boolean_t                                                     _wi_p7_spec_transaction_is_compatible(wi_p7_spec_t *, _wi_p7_spec_transaction_t *, _wi_p7_spec_transaction_t *);
-static wi_boolean_t                                                     _wi_p7_spec_andor_is_compatible(wi_p7_spec_t *, _wi_p7_spec_transaction_t *, _wi_p7_spec_andor_t *, _wi_p7_spec_andor_t *);
-
+
+
-static wi_boolean_t                                                     _wi_p7_spec_message_is_compatible(wi_p7_spec_t *, _wi_p7_spec_transaction_t *, _wi_p7_spec_message_t *, _wi_p7_spec_message_t *);
-
@@ -868 +874 @@
-        wi_boolean_t    compatible;
-        
-(_wi_p7_spec_is_compatible(p7_spec, other_p7_spec) && _wi_p7_spec_is_compatible(other_p7_spec, p7_spec)
+_wi_p7_spec_is_compatible(p7_spec, other_p7_spec
-        
-        if(compatible)
@@ -914 +920 @@
-        
-        if(other_transaction) {
-                if(!_wi_p7_spec_message_is_compatible(p7_spec, transaction, transaction->message, other_transaction->message))
-                        return false;
-                
-                if(transaction->originator != other_transaction->originator) {
-                        _wi_p7_spec_log_debug(p7_spec, WI_STR("Transaction \"%@\" should be sent by %@, but peer sends it by %@"),
@@ -926 +929 @@
-                }
-                
+                if(!_wi_p7_spec_message_is_compatible(p7_spec, transaction, transaction->message, other_transaction->message))
+                        return false;
+                
-                if(!_wi_p7_spec_andor_is_compatible(p7_spec, transaction, transaction->andor, other_transaction->andor))
-                        return false;
@@ -936 +942 @@
-
-static wi_boolean_t _wi_p7_spec_andor_is_compatible(wi_p7_spec_t *p7_spec, _wi_p7_spec_transaction_t *transaction, _wi_p7_spec_andor_t *andor, _wi_p7_spec_andor_t *other_andor) {
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        
-        if(andor->type != other_andor->type)
@@ -963 +1004 @@
-                        index = i + 1;
-                        
-other_reply && !_wi_p7_spec_reply_is_compatible(p7_spec, transaction, reply, other_repl
+!_wi_p7_spec_reply_is_compatible(p7_spec, transaction, reply, other_reply, commutativit
-                                return false;
-                } else {
-                        other_reply = wi_hash_data_for_key(other_andor->replies_hash, reply->message->name);
-                        
-
+, commutativity
-                                return false;
-                }
-        }
-        
-        count = wi_array_count(andor->children);
-        other_count = wi_array_count(other_andor->children);
-        
-        if(count != other_count) {
-                _wi_p7_spec_log_debug(p7_spec, WI_STR("Transaction \"%@\" should have %u %@, but peer has %u"),
-                        transaction->message->name,
-                        count,
-                        count == 1
-                                ? WI_STR("child")
-                                : WI_STR("children"),
-                        other_count);
-                
-                return false;
-        }
-        
-        for(i = 0; i < count; i++) {
-                if(!_wi_p7_spec_andor_is_compatible(p7_spec, transaction, WI_ARRAY(andor->children, i), WI_ARRAY(other_andor->children, i)))
-                        return false;
-        }
-        
-        return true;
-}
@@ -998 +1019 @@
-
-
-
+
+
+
-        if(reply->required) {
-                if(!other_reply || !other_reply->required) {
@@ -1013 +1036 @@
-        }
-        
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-        
@@ -1043 +1072 @@
-        _wi_p7_spec_parameter_t *parameter, *other_parameter;
-        _wi_p7_spec_field_t             *field, *other_field;
+        
+        if(!wi_is_equal(message->name, other_message->name)) {
+                _wi_p7_spec_log_debug(p7_spec,
+                        WI_STR("Reply in transaction \"%@\" should be \"%@\", but peer has \"%@\""),
+                                transaction->message->name, message->name, other_message->name);
+                
+                return false;
+        }
-        
-        if(message->id != other_message->id) {
@@ -1789 +1826 @@
-static _wi_p7_spec_reply_t * _wi_p7_spec_reply_with_node(wi_p7_spec_t *p7_spec, xmlNodePtr node, _wi_p7_spec_transaction_t *transaction) {
-        _wi_p7_spec_reply_t             *reply;
-
+, *count
-
-    reply = wi_autorelease(wi_runtime_create_instance(_wi_p7_spec_reply_runtime_id, sizeof(_wi_p7_spec_reply_t)));
@@ -1828 +1865 @@
-                reply->required = (wi_string_case_insensitive_compare(use, WI_STR("required")) == 0);
-        }
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        return reply;
+}
+
+
+
+static wi_string_t * _wi_p7_spec_reply_count(_wi_p7_spec_reply_t *reply) {
+        if(reply->count == _WI_P7_SPEC_REPLY_ONE_OR_ZERO)
+                return WI_STR("one or zero times");
+        if(reply->count == _WI_P7_SPEC_REPLY_ZERO_OR_MORE)
+                return WI_STR("zero or more times");
+        else if(reply->count == _WI_P7_SPEC_REPLY_ONE_OR_MORE)
+                return WI_STR("one or more times");
+
+        return wi_string_with_format(WI_STR("%u %@"), reply->count, (reply->count == 1) ? WI_STR("time") : WI_STR("times"));
-}
-

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

@@ -62 +62 @@
-WI_EXPORT wi_p7_enum_t                                  wi_p7_spec_enum_value(wi_p7_spec_t *, wi_integer_t, wi_string_t *);
-
-ARRAY
+P7_SPEC