X509Attr, X509Cert, X509CRL, X509Ext, X509Name, X509Req, X509Revoked, X509Store port to 1.8 and new class creation fixups

1 files changed, 49 insertions, 38 deletions

diff --git a/ossl_x509.h b/ossl_x509.h
index 6f6f272..e23e3ee 100644
--- a/ossl_x509.h
+++ b/ossl_x509.h
@@ -11,82 +11,93 @@
 #if !defined(_OSSL_X509_H_)
 #define _OSSL_X509_H_
 
+/*
+ * X509 main module
+ */
 extern VALUE mX509;
-extern VALUE cX509Certificate;
-extern VALUE eX509CertificateError;
-extern VALUE cX509Attribute;
-extern VALUE eX509AttributeError;
-extern VALUE cX509CRL;
-extern VALUE eX509CRLError;
-extern VALUE cX509Extension;
-extern VALUE cX509ExtensionFactory;
-extern VALUE eX509ExtensionError;
-extern VALUE cX509Name;
-extern VALUE eX509NameError;
-extern VALUE cX509Request;
-extern VALUE eX509RequestError;
-extern VALUE cX509Revoked;
-extern VALUE eX509RevokedError;
-extern VALUE cX509Store;
-extern VALUE eX509StoreError;
 
 void Init_ossl_x509(void);
 
 /*
- * X509
+ * X509Attr
+ */
+extern VALUE cX509Attr;
+extern VALUE eX509AttrError;
+
+VALUE ossl_x509attr_new(X509_ATTRIBUTE *);
+X509_ATTRIBUTE *ossl_x509attr_get_X509_ATTRIBUTE(VALUE);
+void Init_ossl_x509attr(void);
+
+/*
+ * X509Cert
  */
+extern VALUE cX509Cert;
+extern VALUE eX509CertError;
+
 VALUE ossl_x509_new(X509 *);
 VALUE ossl_x509_new_from_file(VALUE);
 X509 *ossl_x509_get_X509(VALUE);
-void Init_ossl_x509cert(VALUE);
+void Init_ossl_x509cert(void);
 
 /*
  * X509CRL
  */
+extern VALUE cX509CRL;
+extern VALUE eX509CRLError;
+
 X509_CRL *ossl_x509crl_get_X509_CRL(VALUE);
-void Init_ossl_x509crl(VALUE);
+void Init_ossl_x509crl(void);
+
+/*
+ * X509Extension
+ */
+extern VALUE cX509Ext;
+extern VALUE cX509ExtFactory;
+extern VALUE eX509ExtError;
+
+VALUE ossl_x509ext_new(X509_EXTENSION *);
+X509_EXTENSION *ossl_x509ext_get_X509_EXTENSION(VALUE);
+void Init_ossl_x509ext(void);
 
 /*
  * X509Name
  */
+extern VALUE cX509Name;
+extern VALUE eX509NameError;
+
 VALUE ossl_x509name_new(X509_NAME *);
 X509_NAME *ossl_x509name_get_X509_NAME(VALUE);
-void Init_ossl_x509name(VALUE);
+void Init_ossl_x509name(void);
 
 /*
  * X509Request
  */
+extern VALUE cX509Req;
+extern VALUE eX509ReqError;
+
 VALUE ossl_x509req_new(X509_REQ *);
 X509_REQ *ossl_x509req_get_X509_REQ(VALUE);
-void Init_ossl_x509req(VALUE);
+void Init_ossl_x509req(void);
 
 /*
  * X509Revoked
  */
+extern VALUE cX509Rev;
+extern VALUE eX509RevError;
+
 VALUE ossl_x509revoked_new(X509_REVOKED *);
 X509_REVOKED *ossl_x509revoked_get_X509_REVOKED(VALUE);
-void Init_ossl_x509revoked(VALUE);
+void Init_ossl_x509revoked(void);
 
 /*
  * X509Store
  */
+extern VALUE cX509Store;
+extern VALUE eX509StoreError;
+
 VALUE ossl_x509store_new(X509_STORE_CTX *);
 X509_STORE *ossl_x509store_get_X509_STORE(VALUE);
-void Init_ossl_x509store(VALUE);
-
-/*
- * X509Extension
- */
-VALUE ossl_x509ext_new(X509_EXTENSION *);
-X509_EXTENSION *ossl_x509ext_get_X509_EXTENSION(VALUE);
-void Init_ossl_x509ext(VALUE);
-
-/*
- * X509Attribute
- */
-VALUE ossl_x509attr_new(X509_ATTRIBUTE *);
-X509_ATTRIBUTE *ossl_x509attr_get_X509_ATTRIBUTE(VALUE);
-void Init_ossl_x509attr(VALUE);
+void Init_ossl_x509store(void);
 
 #endif /* _OSSL_X509_H_ */