Begin to abstract RSA operations.

src/hostkey.c

@@ -61,7 +61,7 @@ libssh2_hostkey_method_ssh_rsa_init(LIBSSH2_SESSION *session,
 				    unsigned long hostkey_data_len,
 				    void **abstract)
 {
-	RSA *rsactx;
+	libssh2_rsa_ctx *rsactx;
 	unsigned char *s, *e, *n;
 	unsigned long len, e_len, n_len;
 
@@ -88,11 +88,7 @@ libssh2_hostkey_method_ssh_rsa_init(LIBSSH2_SESSION *session,
 	n_len = libssh2_ntohu32(s);					s += 4;
 	n = s;										s += n_len;
 
-	rsactx = RSA_new();
+	_libssh2_rsa_new (&rsactx, e, e_len, n, n_len);
-	rsactx->e = BN_new();
-	BN_bin2bn(e, e_len, rsactx->e);
-	rsactx->n = BN_new();
-	BN_bin2bn(n, n_len, rsactx->n);
 
 	*abstract = rsactx;
 
@@ -169,18 +165,12 @@ static int libssh2_hostkey_method_ssh_rsa_sig_verify(LIBSSH2_SESSION *session,
 						     unsigned long m_len,
 						     void **abstract)
 {
-	RSA *rsactx = (RSA*)(*abstract);
+	libssh2_rsa_ctx *rsactx = (libssh2_rsa_ctx*)(*abstract);
-	unsigned char hash[SHA_DIGEST_LENGTH];
-	int ret;
 	(void)session;
 
 	/* Skip past keyname_len(4) + keyname(7){"ssh-rsa"} + signature_len(4) */
 	sig += 15; sig_len -= 15;
-	SHA1(m, m_len, hash);
+	return _libssh2_rsa_sha1_verify (rsactx, sig, sig_len, m, m_len);
-	ret = RSA_verify(NID_sha1, hash, SHA_DIGEST_LENGTH,
-			 (unsigned char *)sig, sig_len, rsactx);
-
-	return (ret == 1) ? 0 : -1;
 }
 /* }}} */
 
@@ -269,10 +259,10 @@ static int libssh2_hostkey_method_ssh_rsa_signv(LIBSSH2_SESSION *session, unsign
 static int libssh2_hostkey_method_ssh_rsa_dtor(LIBSSH2_SESSION *session,
 					       void **abstract)
 {
-	RSA *rsactx = (RSA*)(*abstract);
+	libssh2_rsa_ctx *rsactx = (libssh2_rsa_ctx*)(*abstract);
 	(void)session;
 
-	RSA_free(rsactx);
+	_libssh2_rsa_free(rsactx);
 
 	*abstract = NULL;
 

src/libgcrypt.h

@@ -77,3 +77,18 @@
 #define libssh2_hmac_cleanup(ctx) gcry_md_close (*ctx);
 
 #define libssh2_crypto_init() gcry_control (GCRYCTL_DISABLE_SECMEM)
+
+#define libssh2_rsa_ctx struct gcry_sexp
+
+int _libssh2_rsa_new(libssh2_rsa_ctx **rsa,
+		     const unsigned char *edata,
+		     unsigned long elen,
+		     const unsigned char *ndata,
+		     unsigned long nlen);
+int _libssh2_rsa_sha1_verify(libssh2_rsa_ctx *rsa,
+			     const unsigned char *sig,
+			     unsigned long sig_len,
+			     const unsigned char *m,
+			     unsigned long m_len);
+
+#define _libssh2_rsa_free(rsactx)  gcry_sexp_release (rsactx)

src/openssl.h

@@ -43,6 +43,8 @@
 #endif
 #include <openssl/evp.h>
 #include <openssl/hmac.h>
+#include <openssl/bn.h>
+#include <openssl/pem.h>
 
 #define libssh2_random(buf, len)		\
   RAND_bytes ((buf), (len))
@@ -72,3 +74,18 @@
 #define libssh2_hmac_cleanup(ctx) HMAC_cleanup(ctx)
 
 #define libssh2_crypto_init() 1
+
+#define libssh2_rsa_ctx RSA
+
+void _libssh2_rsa_new(libssh2_rsa_ctx **rsa,
+		      const unsigned char *edata,
+		      unsigned long elen,
+		      const unsigned char *ndata,
+		      unsigned long nlen);
+int _libssh2_rsa_sha1_verify(libssh2_rsa_ctx *rsa,
+			     const unsigned char *sig,
+			     unsigned long sig_len,
+			     const unsigned char *m,
+			     unsigned long m_len);
+
+#define _libssh2_rsa_free(rsactx) RSA_free(rsactx)