Changeset 5400

Timestamp:

03/14/08 18:38:31 (6 months ago)

Author:

morris

Message:

Add wi_x509_init_with_common_name()

Files:

• libwired/trunk/libwired/misc/wi-crypto.c (modified) (1 diff)
• libwired/trunk/libwired/misc/wi-crypto.h (modified) (1 diff)

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

@@ -425 +425 @@
-
-
+
+wi_x509_t * wi_x509_init_with_common_name(wi_x509_t *x509, wi_rsa_t *rsa, wi_string_t *common_name) {
+        X509_REQ                *req;
+        EVP_PKEY                *pkey = NULL;
+        X509_NAME               *name = NULL;
+        BIGNUM                  *bn = NULL;
+        
+        req = X509_REQ_new();
+        
+        if(!req)
+                goto err;
+
+        if(X509_REQ_set_version(req, 0) != 1)
+                goto err;
+        
+        name = X509_NAME_new();
+        
+        if(X509_NAME_add_entry_by_NID(name, NID_commonName, MBSTRING_ASC, wi_string_cstring(common_name), -1, -1, 0) != 1)
+                goto err;
+
+        if(X509_REQ_set_subject_name(req, name) != 1)
+                goto err;
+
+        pkey = EVP_PKEY_new();
+        EVP_PKEY_set1_RSA(pkey, rsa->rsa);
+        
+        if(X509_REQ_set_pubkey(req, pkey) != 1)
+                goto err;
+        
+        x509->x509 = X509_new();
+        
+        if(!x509->x509)
+                goto err;
+        
+        bn = BN_new();
+        
+        if(!bn)
+                goto err;
+        
+        if(BN_pseudo_rand(bn, 64, 0, 0) != 1)
+                goto err;
+        
+        if(!BN_to_ASN1_INTEGER(bn, X509_get_serialNumber(x509->x509)))
+                goto err;
+        
+        if(X509_set_issuer_name(x509->x509, X509_REQ_get_subject_name(req)) != 1)
+                goto err;
+
+        if(!X509_gmtime_adj(X509_get_notBefore(x509->x509), 0))
+                goto err;
+
+        if(!X509_gmtime_adj(X509_get_notAfter(x509->x509), 3600 * 24 * 365))
+                goto err;
+
+        if(X509_set_subject_name(x509->x509, X509_REQ_get_subject_name(req)) != 1)
+                goto end;
+
+        if(X509_set_pubkey(x509->x509, pkey) != 1)
+                goto err;
+        
+        if(X509_sign(x509->x509, pkey, EVP_sha1()) == 0)
+                goto err;
+
+        goto end;
+        
+err:
+        wi_error_set_openssl_error();
+
+        wi_release(x509);
+
+        x509 = NULL;
+        
+end:
+        if(req)
+                X509_REQ_free(req);
+        
+        if(pkey)
+                EVP_PKEY_free(pkey);
+        
+        if(name)
+                X509_NAME_free(name);
+
+        if(bn)
+                BN_free(bn);
+        
+        return x509;
+}
+
+
+
-wi_x509_t * wi_x509_init_with_pem_file(wi_x509_t *x509, wi_string_t *path) {
-        FILE            *fp;

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

@@ -72 +72 @@
-
-WI_EXPORT wi_x509_t *                                   wi_x509_alloc(void);
+WI_EXPORT wi_x509_t *                                   wi_x509_init_with_common_name(wi_x509_t *, wi_rsa_t *, wi_string_t *);
-WI_EXPORT wi_x509_t *                                   wi_x509_init_with_pem_file(wi_x509_t *, wi_string_t *);
-