Changeset 5385

Timestamp:

03/14/08 11:10:54 (4 months ago)

Author:

morris

Message:

Add wi_x509_t, simple class to load X509 certificates

Files:

• libwired/trunk/libwired/misc/wi-crypto.c (modified) (4 diffs)
• libwired/trunk/libwired/misc/wi-crypto.h (modified) (3 diffs)

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

@@ -65 +65 @@
-
-
+struct _wi_x509 {
+        wi_runtime_base_t                                       base;
+        
+        X509                                                            *x509;
+};
+
+static void                                                             _wi_x509_dealloc(wi_runtime_instance_t *);
+static wi_string_t *                                    _wi_x509_description(wi_runtime_instance_t *);
+
+static wi_runtime_id_t                                  _wi_x509_runtime_id = WI_RUNTIME_ID_NULL;
+static wi_runtime_class_t                               _wi_x509_runtime_class = {
+        "wi_x509_t",
+        _wi_x509_dealloc,
+        NULL,
+        NULL,
+        _wi_x509_description,
+        NULL
+};
+
+
+
-struct _wi_cipher {
-        wi_runtime_base_t                                       base;
@@ -96 +117 @@
-void wi_crypto_register(void) {
-        _wi_rsa_runtime_id = wi_runtime_register_class(&_wi_rsa_runtime_class);
+        _wi_x509_runtime_id = wi_runtime_register_class(&_wi_x509_runtime_class);
-        _wi_cipher_runtime_id = wi_runtime_register_class(&_wi_cipher_runtime_class);
-}
@@ -239 +261 @@
-#pragma mark -
-
+void * wi_rsa_rsa(wi_rsa_t *rsa) {
+        return rsa->rsa;
+}
+
+
+
-wi_data_t * wi_rsa_public_key(wi_rsa_t *rsa) {
-        unsigned char   *buffer;
@@ -369 +397 @@
-
-        return true;
+}
+
+
+
+#pragma mark -
+
+wi_runtime_id_t wi_x509_runtime_id(void) {
+        return _wi_x509_runtime_id;
+}
+
+
+
+#pragma mark -
+
+wi_x509_t * wi_x509_alloc(void) {
+        return wi_runtime_create_instance(_wi_x509_runtime_id, sizeof(wi_x509_t));
+}
+
+
+
+wi_x509_t * wi_x509_init_with_pem_file(wi_x509_t *x509, wi_string_t *path) {
+        FILE            *fp;
+        
+        fp = fopen(wi_string_cstring(path), "r");
+        
+        if(!fp) {
+                wi_error_set_errno(errno);
+                
+                wi_release(x509);
+                
+                return NULL;
+        }
+        
+        x509->x509 = PEM_read_X509(fp, NULL, NULL, NULL);
+        
+        fclose(fp);
+        
+        if(!x509->x509) {
+                wi_error_set_openssl_error();
+                
+                wi_release(x509);
+                
+                return NULL;
+        }
+        
+        return x509;
+}
+
+
+
+static void _wi_x509_dealloc(wi_runtime_instance_t *instance) {
+        wi_x509_t               *x509 = instance;
+        
+        X509_free(x509->x509);
+}
+
+
+
+static wi_string_t * _wi_x509_description(wi_runtime_instance_t *instance) {
+        wi_x509_t               *x509 = instance;
+        
+        return wi_string_with_format(WI_STR("<%@ %p>{x509 = %p}"),
+        wi_runtime_class_name(x509),
+                x509,
+                x509->x509);
+}
+
+
+
+#pragma mark -
+
+void * wi_x509_x509(wi_x509_t *x509) {
+        return x509->x509;
-}
-

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

@@ -45 +45 @@
-
-typedef struct _wi_rsa                                  wi_rsa_t;
+typedef struct _wi_x509                                 wi_x509_t;
-typedef struct _wi_cipher                               wi_cipher_t;
-
@@ -56 +57 @@
-WI_EXPORT wi_rsa_t *                                    wi_rsa_init_with_public_key(wi_rsa_t *, wi_data_t *);
-
+WI_EXPORT void *                                                wi_rsa_rsa(wi_rsa_t *);
-WI_EXPORT wi_data_t *                                   wi_rsa_public_key(wi_rsa_t *);
-WI_EXPORT wi_data_t *                                   wi_rsa_private_key(wi_rsa_t *);
@@ -64 +66 @@
-WI_EXPORT wi_data_t *                                   wi_rsa_decrypt(wi_rsa_t *, wi_data_t *);
-WI_EXPORT wi_boolean_t                                  wi_rsa_decrypt_bytes(wi_rsa_t *, const void *, wi_uinteger_t, void **, wi_uinteger_t *);
+
+
+WI_EXPORT wi_runtime_id_t                               wi_x509_runtime_id(void);
+
+WI_EXPORT wi_x509_t *                                   wi_x509_alloc(void);
+WI_EXPORT wi_x509_t *                                   wi_x509_init_with_pem_file(wi_x509_t *, wi_string_t *);
+
+WI_EXPORT void *                                                wi_x509_x509(wi_x509_t *);
-
-