added gnutls_x509_crq_set_key_rsa_raw() which will set a raw key to a certificate...

diff --git a/includes/gnutls/x509.h b/includes/gnutls/x509.h
index 98d54c756afa6a31c61b470d465f5f5cb83cbe6b..6a632a31e2086ad92c06670ce2dd38315fdc1e37 100644 (file)
--- a/includes/gnutls/x509.h
+++ b/includes/gnutls/x509.h
@@ -664,6 +664,9 @@ extern "C"
 
   int gnutls_x509_crt_set_crq (gnutls_x509_crt_t crt, gnutls_x509_crq_t crq);
 
+  int gnutls_x509_crq_set_key_rsa_raw (gnutls_x509_crq_t crq, 
+                                   const gnutls_datum_t * m,
+                                   const gnutls_datum_t * e);
 
 
 #ifdef __cplusplus

diff --git a/lib/x509/crq.c b/lib/x509/crq.c
index ff73c401b25cf28e57be99a0b2846a5857338893..2eac706ad2a299501e8d9309886c03535f757d1e 100644 (file)
--- a/lib/x509/crq.c
+++ b/lib/x509/crq.c
@@ -677,6 +677,74 @@ gnutls_x509_crq_set_key (gnutls_x509_crq_t crq, gnutls_x509_privkey_t key)
   return 0;
 }
 
+/**
+  * gnutls_x509_crq_set_key_rsa_raw - This function will associate the Certificate request with a key
+  * @crq: should contain a gnutls_x509_crq_t structure
+  * @m: holds the modulus
+  * @e: holds the public exponent
+  *
+  * This function will set the public parameters from the given private key to the
+  * request. Only RSA keys are currently supported.
+  *
+  * Returns: On success, %GNUTLS_E_SUCCESS is returned, otherwise a
+  *   negative error value.
+  *
+  **/
+int
+gnutls_x509_crq_set_key_rsa_raw (gnutls_x509_crq_t crq, 
+                                   const gnutls_datum_t * m,
+                                   const gnutls_datum_t * e)
+{
+  int result, ret;
+  size_t siz = 0;
+  bigint_t temp_params[RSA_PUBLIC_PARAMS];
+  
+
+  if (crq == NULL)
+    {
+      gnutls_assert ();
+      return GNUTLS_E_INVALID_REQUEST;
+    }
+
+  memset(temp_params, 0, sizeof(temp_params));
+
+  siz = m->size;
+  if (_gnutls_mpi_scan_nz (&temp_params[0], m->data, siz))
+    {
+      gnutls_assert ();
+      ret = GNUTLS_E_MPI_SCAN_FAILED;
+      goto error;
+    }
+
+  siz = e->size;
+  if (_gnutls_mpi_scan_nz (&temp_params[1], e->data, siz))
+    {
+      gnutls_assert ();
+      ret = GNUTLS_E_MPI_SCAN_FAILED;
+      goto error;
+    }
+
+  result = _gnutls_x509_encode_and_copy_PKI_params (crq->crq,
+                                                   "certificationRequestInfo.subjectPKInfo",
+                                                   GNUTLS_PK_RSA,
+                                                   temp_params,
+                                                   RSA_PUBLIC_PARAMS);
+
+  if (result < 0)
+    {
+      gnutls_assert ();
+      ret = result;
+      goto error;
+    }
+
+  ret = 0;
+
+error:
+    _gnutls_mpi_release (&temp_params[0]);
+    _gnutls_mpi_release (&temp_params[1]);
+    return ret;
+}
+
 /**
   * gnutls_x509_crq_set_challenge_password - This function will set a challenge password 
   * @crq: should contain a gnutls_x509_crq_t structure