Merge branch 'rsa_privkey_import' into 'master'

Fix optional arguments handling in gnutls_privkey_import_rsa_raw()

See merge request gnutls/gnutls!1318

3 files changed, 46 insertions, 13 deletions

diff --git a/lib/nettle/pk.c b/lib/nettle/pk.c
index 588e9df502..e9a380857c 100644
--- a/lib/nettle/pk.c
+++ b/lib/nettle/pk.c
@@ -3275,22 +3275,22 @@ static int calc_rsa_exp(gnutls_pk_params_st * params)
 		return GNUTLS_E_INTERNAL_ERROR;
 	}
 
-	params->params[6] = params->params[7] = NULL;
+	params->params[RSA_E1] = params->params[RSA_E2] = NULL;
 
-	ret = _gnutls_mpi_init_multi(&tmp, &params->params[6], &params->params[7], NULL);
+	ret = _gnutls_mpi_init_multi(&tmp, &params->params[RSA_E1], &params->params[RSA_E2], NULL);
 	if (ret < 0)
 		return gnutls_assert_val(ret);
 
 	/* [6] = d % p-1, [7] = d % q-1 */
-	_gnutls_mpi_sub_ui(tmp, params->params[3], 1);
+	_gnutls_mpi_sub_ui(tmp, params->params[RSA_PRIME1], 1);
 	ret =
-	    _gnutls_mpi_modm(params->params[6], params->params[2] /*d */ , tmp);
+	    _gnutls_mpi_modm(params->params[RSA_E1], params->params[RSA_PRIV] /*d */ , tmp);
 	if (ret < 0)
 		goto fail;
 
-	_gnutls_mpi_sub_ui(tmp, params->params[4], 1);
+	_gnutls_mpi_sub_ui(tmp, params->params[RSA_PRIME2], 1);
 	ret =
-	    _gnutls_mpi_modm(params->params[7], params->params[2] /*d */ , tmp);
+	    _gnutls_mpi_modm(params->params[RSA_E2], params->params[RSA_PRIV] /*d */ , tmp);
 	if (ret < 0)
 		goto fail;
 
@@ -3300,8 +3300,8 @@ static int calc_rsa_exp(gnutls_pk_params_st * params)
 
 fail:
 	zrelease_mpi_key(&tmp);
-	zrelease_mpi_key(&params->params[6]);
-	zrelease_mpi_key(&params->params[7]);
+	zrelease_mpi_key(&params->params[RSA_E1]);
+	zrelease_mpi_key(&params->params[RSA_E2]);
 
 	return ret;
 }
@@ -3346,6 +3346,8 @@ wrap_nettle_pk_fixup(gnutls_pk_algorithm_t algo,
 		zrelease_mpi_key(&params->params[RSA_E1]);
 		zrelease_mpi_key(&params->params[RSA_E2]);
 
+		/* marks RSA_COEF as present */
+		params->params_nr = RSA_PRIVATE_PARAMS - 2;
 		ret = calc_rsa_exp(params);
 		if (ret < 0)
 			return gnutls_assert_val(ret);
diff --git a/lib/x509/privkey.c b/lib/x509/privkey.c
index b26295e51b..3852064648 100644
--- a/lib/x509/privkey.c
+++ b/lib/x509/privkey.c
@@ -885,7 +885,7 @@ gnutls_x509_privkey_import_rsa_raw2(gnutls_x509_privkey_t key,
 	gnutls_pk_params_init(&key->params);
 
 	siz = m->size;
-	if (_gnutls_mpi_init_scan_nz(&key->params.params[0], m->data, siz)) {
+	if (_gnutls_mpi_init_scan_nz(&key->params.params[RSA_MODULUS], m->data, siz)) {
 		gnutls_assert();
 		ret = GNUTLS_E_MPI_SCAN_FAILED;
 		goto cleanup;
@@ -893,7 +893,7 @@ gnutls_x509_privkey_import_rsa_raw2(gnutls_x509_privkey_t key,
 	key->params.params_nr++;
 
 	siz = e->size;
-	if (_gnutls_mpi_init_scan_nz(&key->params.params[1], e->data, siz)) {
+	if (_gnutls_mpi_init_scan_nz(&key->params.params[RSA_PUB], e->data, siz)) {
 		gnutls_assert();
 		ret = GNUTLS_E_MPI_SCAN_FAILED;
 		goto cleanup;
@@ -901,7 +901,7 @@ gnutls_x509_privkey_import_rsa_raw2(gnutls_x509_privkey_t key,
 	key->params.params_nr++;
 
 	siz = d->size;
-	if (_gnutls_mpi_init_scan_nz(&key->params.params[2], d->data, siz)) {
+	if (_gnutls_mpi_init_scan_nz(&key->params.params[RSA_PRIV], d->data, siz)) {
 		gnutls_assert();
 		ret = GNUTLS_E_MPI_SCAN_FAILED;
 		goto cleanup;
@@ -909,7 +909,7 @@ gnutls_x509_privkey_import_rsa_raw2(gnutls_x509_privkey_t key,
 	key->params.params_nr++;
 
 	siz = p->size;
-	if (_gnutls_mpi_init_scan_nz(&key->params.params[3], p->data, siz)) {
+	if (_gnutls_mpi_init_scan_nz(&key->params.params[RSA_PRIME1], p->data, siz)) {
 		gnutls_assert();
 		ret = GNUTLS_E_MPI_SCAN_FAILED;
 		goto cleanup;
@@ -917,7 +917,7 @@ gnutls_x509_privkey_import_rsa_raw2(gnutls_x509_privkey_t key,
 	key->params.params_nr++;
 
 	siz = q->size;
-	if (_gnutls_mpi_init_scan_nz(&key->params.params[4], q->data, siz)) {
+	if (_gnutls_mpi_init_scan_nz(&key->params.params[RSA_PRIME2], q->data, siz)) {
 		gnutls_assert();
 		ret = GNUTLS_E_MPI_SCAN_FAILED;
 		goto cleanup;
diff --git a/tests/key-import-export.c b/tests/key-import-export.c
index 45434eeb2d..e28b21a4f2 100644
--- a/tests/key-import-export.c
+++ b/tests/key-import-export.c
@@ -285,6 +285,20 @@ int check_x509_privkey(void)
 static
 int check_privkey_import_export(void)
 {
+	static const struct rsa_privkey_opt_args
+	{
+		gnutls_datum_t *_u, *_e1, *_e2;
+	}
+	rsa_opt_args[] =
+	{
+		{ NULL, NULL, NULL },
+		{ NULL, &_rsa_e1, &_rsa_e2 },
+		{ NULL, &_rsa_e1, NULL },
+		{ NULL, NULL, &_rsa_e2 },
+		{ &_rsa_u, NULL, NULL },
+		{ &_rsa_u, &_rsa_e1, NULL },
+		{ &_rsa_u, NULL, &_rsa_e2 },
+	};
 	gnutls_privkey_t key;
 	gnutls_datum_t p, q, g, y, x;
 	gnutls_datum_t m, e, u, e1, e2, d;
@@ -293,6 +307,7 @@ int check_privkey_import_export(void)
 	gnutls_digest_algorithm_t digest;
 	gnutls_gost_paramset_t paramset;
 #endif
+	unsigned i;
 	int ret;
 
 	global_init();
@@ -337,10 +352,26 @@ int check_privkey_import_export(void)
 	gnutls_privkey_deinit(key);
 
 	/* RSA */
+
+	/* Optional arguments */
+	for (i = 0; i < sizeof(rsa_opt_args) / sizeof(rsa_opt_args[0]); i++)
+	{
+		ret = gnutls_privkey_init(&key);
+		if (ret < 0)
+			fail("error\n");
+
+		ret = gnutls_privkey_import_rsa_raw(key, &_rsa_m, &_rsa_e, &_rsa_d, &_rsa_p, &_rsa_q, rsa_opt_args[i]._u, rsa_opt_args[i]._e1, rsa_opt_args[i]._e2);
+		if (ret < 0)
+			fail("error\n");
+
+		gnutls_privkey_deinit(key);
+	}
+
 	ret = gnutls_privkey_init(&key);
 	if (ret < 0)
 		fail("error\n");
 
+	/* Import/export */
 	ret = gnutls_privkey_import_rsa_raw(key, &_rsa_m, &_rsa_e, &_rsa_d, &_rsa_p, &_rsa_q, &_rsa_u, &_rsa_e1, &_rsa_e2);
 	if (ret < 0)
 		fail("error\n");