Added gnutls_pubkey_encrypt_data().

6 files changed, 236 insertions, 4 deletions

diff --git a/NEWS b/NEWS
index 80a51a2978..5ff929a5e8 100644
--- a/NEWS
+++ b/NEWS
@@ -11,7 +11,7 @@ and public keys as well.
 generation.
 
 ** API and ABI modifications:
-No changes since last version.
+gnutls_pubkey_encrypt_data: Added
 
 
 * Version 3.0.11 (released 2012-01-06)
diff --git a/lib/gnutls_pubkey.c b/lib/gnutls_pubkey.c
index 3e93306e37..0a8a4c4b3c 100644
--- a/lib/gnutls_pubkey.c
+++ b/lib/gnutls_pubkey.c
@@ -1373,13 +1373,13 @@ gnutls_pubkey_verify_data2 (gnutls_pubkey_t pubkey,
 
 /**
  * gnutls_pubkey_verify_hash:
- * @key: Holds the certificate
+ * @key: Holds the public key
  * @flags: should be 0 for now
  * @hash: holds the hash digest to be verified
  * @signature: contains the signature
  *
  * This function will verify the given signed digest, using the
- * parameters from the certificate.
+ * parameters from the public key.
  *
  * Returns: On success, %GNUTLS_E_SUCCESS (0) is returned, otherwise a
  *   negative error value (%GNUTLS_E_PK_SIG_VERIFY_FAILED in verification failure).
@@ -1407,6 +1407,37 @@ gnutls_pubkey_verify_hash (gnutls_pubkey_t key, unsigned int flags,
 }
 
 /**
+ * gnutls_pubkey_encrypt_data:
+ * @key: Holds the public key
+ * @flags: should be 0 for now
+ * @plaintext: The data to be encrypted
+ * @ciphertext: contains the encrypted data
+ *
+ * This function will encrypt the given data, using the public
+ * key.
+ *
+ * Returns: On success, %GNUTLS_E_SUCCESS (0) is returned, otherwise a
+ *   negative error value.
+ *
+ * Since: 3.0.0
+ **/
+int
+gnutls_pubkey_encrypt_data (gnutls_pubkey_t key, unsigned int flags,
+                           const gnutls_datum_t * plaintext,
+                           gnutls_datum_t * ciphertext)
+{
+  if (key == NULL || key->pk_algorithm != GNUTLS_PK_RSA)
+    {
+      gnutls_assert ();
+      return GNUTLS_E_INVALID_REQUEST;
+    }
+
+  return _gnutls_pkcs1_rsa_encrypt (ciphertext, plaintext,
+                                    &key->params,
+                                    2);
+}
+
+/**
  * gnutls_pubkey_get_verify_algorithm:
  * @key: Holds the certificate
  * @signature: contains the signature
diff --git a/lib/includes/gnutls/abstract.h b/lib/includes/gnutls/abstract.h
index 84bac692fc..ce043c1c94 100644
--- a/lib/includes/gnutls/abstract.h
+++ b/lib/includes/gnutls/abstract.h
@@ -126,6 +126,11 @@ gnutls_pubkey_import_ecc_raw (gnutls_pubkey_t key,
                               const gnutls_datum_t * x,
                               const gnutls_datum_t * y);
 
+int
+gnutls_pubkey_encrypt_data (gnutls_pubkey_t key, unsigned int flags,
+                           const gnutls_datum_t * plaintext,
+                           gnutls_datum_t * ciphertext);
+
 int gnutls_x509_crt_set_pubkey (gnutls_x509_crt_t crt, gnutls_pubkey_t key);
 
 int gnutls_x509_crq_set_pubkey (gnutls_x509_crq_t crq, gnutls_pubkey_t key);
diff --git a/lib/libgnutls.map b/lib/libgnutls.map
index 04772105db..81b0cef289 100644
--- a/lib/libgnutls.map
+++ b/lib/libgnutls.map
@@ -727,6 +727,7 @@ GNUTLS_3_0_0 {
 	gnutls_x509_privkey_verify_params;
 	gnutls_priority_get_cipher_suite_index;
 	gnutls_random_art;
+	gnutls_pubkey_encrypt_data;
 } GNUTLS_2_12;
 
 GNUTLS_PRIVATE {
diff --git a/tests/Makefile.am b/tests/Makefile.am
index b00adfc2a7..005f503640 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -66,7 +66,7 @@ ctests = mini-deflate simple gc set_pkcs12_cred certder certuniqueid	\
 	 crq_apis init_roundtrip pkcs12_s2k_pem dn2 mini-eagain		\
 	 nul-in-x509-names x509_altname pkcs12_encode mini-x509		\
 	 mini-x509-rehandshake rng-fork mini-eagain-dtls	\
-	 x509cert x509cert-tl infoaccess
+	 x509cert x509cert-tl infoaccess rsa-encrypt-decrypt
 
 if ENABLE_OPENSSL
 ctests +=  openssl
diff --git a/tests/rsa-encrypt-decrypt.c b/tests/rsa-encrypt-decrypt.c
new file mode 100644
index 0000000000..b17b38ee57
--- /dev/null
+++ b/tests/rsa-encrypt-decrypt.c
@@ -0,0 +1,195 @@
+/*
+ * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+ * Foundation, Inc.
+ *
+ * Author: Nikos Mavrogiannopoulos, Simon Josefsson
+ *
+ * This file is part of GnuTLS.
+ *
+ * GnuTLS is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * GnuTLS is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GnuTLS; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+/* Parts copied from GnuTLS example programs. */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+#include <netinet/in.h>
+#include <sys/socket.h>
+#include <arpa/inet.h>
+#include <unistd.h>
+#include <gnutls/gnutls.h>
+#include <gnutls/x509.h>
+#include <gnutls/abstract.h>
+
+#include "utils.h"
+
+/* sha1 hash of "hello" string */
+const gnutls_datum_t hash_data = {
+  (void *)
+    "\xaa\xf4\xc6\x1d\xdc\xc5\xe8\xa2\xda\xbe"
+    "\xde\x0f\x3b\x48\x2c\xd9\xae\xa9\x43\x4d",
+  20
+};
+
+const gnutls_datum_t raw_data = {
+  (void *) "hello there",
+  11
+};
+
+static char pem1_cert[] =
+  "-----BEGIN CERTIFICATE-----\n"
+  "MIICHjCCAYmgAwIBAgIERiYdNzALBgkqhkiG9w0BAQUwGTEXMBUGA1UEAxMOR251\n"
+  "VExTIHRlc3QgQ0EwHhcNMDcwNDE4MTMyOTI3WhcNMDgwNDE3MTMyOTI3WjAdMRsw\n"
+  "GQYDVQQDExJHbnVUTFMgdGVzdCBjbGllbnQwgZwwCwYJKoZIhvcNAQEBA4GMADCB\n"
+  "iAKBgLtmQ/Xyxde2jMzF3/WIO7HJS2oOoa0gUEAIgKFPXKPQ+GzP5jz37AR2ExeL\n"
+  "ZIkiW8DdU3w77XwEu4C5KL6Om8aOoKUSy/VXHqLnu7czSZ/ju0quak1o/8kR4jKN\n"
+  "zj2AC41179gAgY8oBAOgIo1hBAf6tjd9IQdJ0glhaZiQo1ipAgMBAAGjdjB0MAwG\n"
+  "A1UdEwEB/wQCMAAwEwYDVR0lBAwwCgYIKwYBBQUHAwIwDwYDVR0PAQH/BAUDAweg\n"
+  "ADAdBgNVHQ4EFgQUTLkKm/odNON+3svSBxX+odrLaJEwHwYDVR0jBBgwFoAU6Twc\n"
+  "+62SbuYGpFYsouHAUyfI8pUwCwYJKoZIhvcNAQEFA4GBALujmBJVZnvaTXr9cFRJ\n"
+  "jpfc/3X7sLUsMvumcDE01ls/cG5mIatmiyEU9qI3jbgUf82z23ON/acwJf875D3/\n"
+  "U7jyOsBJ44SEQITbin2yUeJMIm1tievvdNXBDfW95AM507ShzP12sfiJkJfjjdhy\n"
+  "dc8Siq5JojruiMizAf0pA7in\n" "-----END CERTIFICATE-----\n";
+
+static char pem1_key[] =
+  "-----BEGIN RSA PRIVATE KEY-----\n"
+  "MIICXAIBAAKBgQC7ZkP18sXXtozMxd/1iDuxyUtqDqGtIFBACIChT1yj0Phsz+Y8\n"
+  "9+wEdhMXi2SJIlvA3VN8O+18BLuAuSi+jpvGjqClEsv1Vx6i57u3M0mf47tKrmpN\n"
+  "aP/JEeIyjc49gAuNde/YAIGPKAQDoCKNYQQH+rY3fSEHSdIJYWmYkKNYqQIDAQAB\n"
+  "AoGADpmARG5CQxS+AesNkGmpauepiCz1JBF/JwnyiX6vEzUh0Ypd39SZztwrDxvF\n"
+  "PJjQaKVljml1zkJpIDVsqvHdyVdse8M+Qn6hw4x2p5rogdvhhIL1mdWo7jWeVJTF\n"
+  "RKB7zLdMPs3ySdtcIQaF9nUAQ2KJEvldkO3m/bRJFEp54k0CQQDYy+RlTmwRD6hy\n"
+  "7UtMjR0H3CSZJeQ8svMCxHLmOluG9H1UKk55ZBYfRTsXniqUkJBZ5wuV1L+pR9EK\n"
+  "ca89a+1VAkEA3UmBelwEv2u9cAU1QjKjmwju1JgXbrjEohK+3B5y0ESEXPAwNQT9\n"
+  "TrDM1m9AyxYTWLxX93dI5QwNFJtmbtjeBQJARSCWXhsoaDRG8QZrCSjBxfzTCqZD\n"
+  "ZXtl807ymCipgJm60LiAt0JLr4LiucAsMZz6+j+quQbSakbFCACB8SLV1QJBAKZQ\n"
+  "YKf+EPNtnmta/rRKKvySsi3GQZZN+Dt3q0r094XgeTsAqrqujVNfPhTMeP4qEVBX\n"
+  "/iVX2cmMTSh3w3z8MaECQEp0XJWDVKOwcTW6Ajp9SowtmiZ3YDYo1LF9igb4iaLv\n"
+  "sWZGfbnU3ryjvkb6YuFjgtzbZDZHWQCo8/cOtOBmPdk=\n"
+  "-----END RSA PRIVATE KEY-----\n";
+
+const gnutls_datum_t cert_dat[] = {
+  {pem1_cert, sizeof (pem1_cert)}
+};
+
+const gnutls_datum_t key_dat[] = {
+  {pem1_key, sizeof (pem1_key)}
+};
+
+void
+doit (void)
+{
+  gnutls_x509_privkey_t key;
+  gnutls_x509_crt_t crt;
+  gnutls_pubkey_t pubkey;
+  gnutls_privkey_t privkey;
+  gnutls_datum_t out, out2;
+  int ret;
+  size_t i;
+
+  gnutls_global_init ();
+
+  for (i = 0; i < sizeof (key_dat) / sizeof (key_dat[0]); i++)
+    {
+      if (debug)
+        success ("loop %d\n", (int) i);
+
+      ret = gnutls_x509_privkey_init (&key);
+      if (ret < 0)
+        fail ("gnutls_x509_privkey_init\n");
+
+      ret =
+        gnutls_x509_privkey_import (key, &key_dat[i], GNUTLS_X509_FMT_PEM);
+      if (ret < 0)
+        fail ("gnutls_x509_privkey_import\n");
+
+      ret = gnutls_pubkey_init (&pubkey);
+      if (ret < 0)
+        fail ("gnutls_privkey_init\n");
+
+      ret = gnutls_privkey_init (&privkey);
+      if (ret < 0)
+        fail ("gnutls_pubkey_init\n");
+
+      ret = gnutls_privkey_import_x509 (privkey, key, 0);
+      if (ret < 0)
+        fail ("gnutls_privkey_import_x509\n");
+
+      ret = gnutls_x509_crt_init (&crt);
+      if (ret < 0)
+        fail ("gnutls_x509_crt_init\n");
+
+      ret = gnutls_x509_crt_import (crt, &cert_dat[i], GNUTLS_X509_FMT_PEM);
+      if (ret < 0)
+        fail ("gnutls_x509_crt_import\n");
+
+      ret =
+        gnutls_pubkey_import_x509 (pubkey, crt, 0);
+      if (ret < 0)
+        fail ("gnutls_x509_pubkey_import\n");
+
+
+      ret = gnutls_pubkey_encrypt_data(pubkey, 0, &hash_data, &out);
+      if (ret < 0)
+        fail ("gnutls_pubkey_encrypt_data\n");
+
+
+      ret = gnutls_privkey_decrypt_data (privkey, 0,
+				      &out, &out2);
+      if (ret < 0)
+        fail ("gnutls_privkey_decrypt_data\n");
+
+      if (out2.size != hash_data.size)
+        fail ("Decrypted data don't match original (1)\n");
+
+      if (memcmp(out2.data, hash_data.data, hash_data.size) != 0)
+        fail ("Decrypted data don't match original (2)\n");
+
+      gnutls_free(out.data);
+      gnutls_free(out2.data);
+
+      ret = gnutls_pubkey_encrypt_data(pubkey, 0, &raw_data, &out);
+      if (ret < 0)
+        fail ("gnutls_pubkey_encrypt_data\n");
+
+      ret = gnutls_privkey_decrypt_data (privkey, 0,
+				      &out, &out2);
+      if (ret < 0)
+        fail ("gnutls_privkey_decrypt_data\n");
+
+      if (out2.size != raw_data.size)
+        fail ("Decrypted data don't match original (3)\n");
+
+      if (memcmp(out2.data, raw_data.data, raw_data.size) != 0)
+        fail ("Decrypted data don't match original (4)\n");
+
+      if (debug) success("ok\n");
+
+      gnutls_free(out.data);
+      gnutls_free(out2.data);
+      gnutls_x509_privkey_deinit (key);
+      gnutls_x509_crt_deinit (crt);
+      gnutls_privkey_deinit (privkey);
+      gnutls_pubkey_deinit (pubkey);
+    }
+
+  gnutls_global_deinit ();
+}