* transition from rb_raise to OSSL_Raise (where possible)

	* some mem checks
	* preliminary DH key support

1 files changed, 7 insertions, 18 deletions

diff --git a/ossl_x509name.c b/ossl_x509name.c
index 2fa5665..ada54d6 100644
--- a/ossl_x509name.c
+++ b/ossl_x509name.c
@@ -47,32 +47,21 @@ ossl_x509name_free(ossl_x509name *namep)
  * Public
  */
 VALUE 
-ossl_x509name_new_null(void)
-{
-	ossl_x509name *namep = NULL;
-	VALUE obj;
-
-	MakeX509Name(obj, namep);
-
-	if (!(namep->name = X509_NAME_new()))
-		OSSL_Raise(eX509NameError, "");
-
-	return obj;
-}
-
-VALUE 
 ossl_x509name_new(X509_NAME *name)
 {
 	ossl_x509name *namep = NULL;
+	X509_NAME *new = NULL;
 	VALUE obj;
 
 	if (!name)
-		return ossl_x509name_new_null();
+		new = X509_NAME_new();
+	else new = X509_NAME_dup(name);
 	
-	MakeX509Name(obj, namep);
-
-	if (!(namep->name = X509_NAME_dup(name)))
+	if (!new)
 		OSSL_Raise(eX509NameError, "");
+	
+	MakeX509Name(obj, namep);
+	namep->name = new;
 
 	return obj;
 }