move c defs

vlib/crypto/rsa/rsa.c.v

@@ -1,12 +1,6 @@
 module rsa
 
-import crypto.rand
+import net.openssl
-
-#pkgconfig openssl
-
-#include <openssl/rsa.h>
-#include <openssl/pem.h>
-#include <openssl/err.h>
 
 pub struct RSAInstance {
 	pair &C.RSA
@@ -15,51 +9,8 @@ pub:
 	private_key []byte
 }
 
-[typedef]
-struct C.RSA {
-	engine voidptr
-	n      &C.BIGNUM
-	e      &C.BIGNUM
-	d      &C.BIGNUM
-	p      &C.BIGNUM
-	q      &C.BIGNUM
-}
-
-[typedef]
-struct C.BIGNUM {}
-
-[typedef]
-struct C.BIO {}
-
-fn C.RSA_generate_key_ex(&C.RSA, int, &C.BIGNUM, voidptr) int
-fn C.RSA_generate_key(int, u64, voidptr, voidptr) &C.RSA
-fn C.RSA_new() &C.RSA
-fn C.RSA_size(&C.RSA) int
-
-fn C.RSA_public_encrypt(int, voidptr, voidptr, &C.RSA, int) int
-fn C.RSA_private_decrypt(int, voidptr, voidptr, &C.RSA, int) int
-
-fn C.BN_new() &C.BIGNUM
-fn C.BN_free(&C.BIGNUM)
-fn C.BN_set_word(&C.BIGNUM, int)
-
-fn C.BIO_new(voidptr) &C.BIO
-fn C.BIO_s_mem()
-fn C.BIO_pending(&C.BIO) int
-fn C.BIO_read(&C.BIO, byteptr, int)
-
-fn C.ENGINE_set_default(voidptr, u32)
-
-fn C.RAND_seed(voidptr, int)
-fn C.RAND_status() int
-
-fn C.ERR_get_error() u64
-fn C.ERR_error_string(u64, charptr) charptr
-
-fn C.PEM_write_bio_RSAPrivateKey(&C.BIO, &C.RSA, voidptr, voidptr, int, voidptr, voidptr)
-fn C.PEM_write_bio_RSAPublicKey(&C.BIO, &C.RSA)
-
 pub fn gen_key_pair(len int, exp int) ?RSAInstance {
+	assert openssl.is_used == 1
 	rsa := C.RSA_new()
 	bn := C.BN_new()
 

vlib/net/openssl/c.v

@@ -26,6 +26,8 @@ $if $pkgconfig('openssl') {
 //
 #include <openssl/rand.h> # Please install OpenSSL development headers
 #include <openssl/ssl.h>
+#include <openssl/rsa.h>
+#include <openssl/pem.h>
 #include <openssl/err.h>
 
 [typedef]
@@ -44,6 +46,20 @@ pub struct SSL_METHOD {
 pub struct OPENSSL_INIT_SETTINGS {
 }
 
+
+[typedef]
+struct C.RSA {
+	engine voidptr
+	n      &C.BIGNUM
+	e      &C.BIGNUM
+	d      &C.BIGNUM
+	p      &C.BIGNUM
+	q      &C.BIGNUM
+}
+
+[typedef]
+struct C.BIGNUM {}
+
 fn C.BIO_new_ssl_connect(ctx &C.SSL_CTX) &C.BIO
 
 fn C.BIO_set_conn_hostname(b &C.BIO, name &char) int
@@ -63,6 +79,12 @@ fn C.BIO_read(b &C.BIO, buf voidptr, len int) int
 
 fn C.BIO_free_all(a &C.BIO)
 
+fn C.BIO_new(voidptr) &C.BIO
+
+fn C.BIO_s_mem()
+
+fn C.BIO_pending(&C.BIO) int
+
 fn C.SSL_CTX_new(method &C.SSL_METHOD) &C.SSL_CTX
 
 fn C.SSL_CTX_set_options(ctx &C.SSL_CTX, options int)
@@ -117,6 +139,31 @@ fn C.TLSv1_2_method() voidptr
 
 fn C.OPENSSL_init_ssl(opts u64, settings &OPENSSL_INIT_SETTINGS) int
 
+/* RSA */
+fn C.RSA_generate_key_ex(&C.RSA, int, &C.BIGNUM, voidptr) int
+fn C.RSA_generate_key(int, u64, voidptr, voidptr) &C.RSA
+fn C.RSA_new() &C.RSA
+fn C.RSA_size(&C.RSA) int
+
+fn C.RSA_public_encrypt(int, voidptr, voidptr, &C.RSA, int) int
+fn C.RSA_private_decrypt(int, voidptr, voidptr, &C.RSA, int) int
+
+fn C.BN_new() &C.BIGNUM
+fn C.BN_free(&C.BIGNUM)
+fn C.BN_set_word(&C.BIGNUM, int)
+
+fn C.ENGINE_set_default(voidptr, u32)
+
+fn C.RAND_seed(voidptr, int)
+
+fn C.RAND_status() int
+
+fn C.ERR_get_error() u64
+fn C.ERR_error_string(u64, charptr) charptr
+
+fn C.PEM_write_bio_RSAPrivateKey(&C.BIO, &C.RSA, voidptr, voidptr, int, voidptr, voidptr)
+fn C.PEM_write_bio_RSAPublicKey(&C.BIO, &C.RSA)
+
 fn init() {
 	$if ssl_pre_1_1_version ? {
 		// OPENSSL_VERSION_NUMBER < 0x10100000L