mirror of
git://git.gnupg.org/gnupg.git
synced 2024-12-22 10:19:57 +01:00
402aa0f948
* agent/findkey.c (key_parms_from_sexp): Add algo name "ecc". (agent_is_dsa_key): Ditto. (agent_is_eddsa_key): New. Not finished, though. * agent/pksign.c (do_encode_eddsa): New. (agent_pksign_do): Use gcry_log_debug functions. * agent/protect.c (agent_protect): Parse a flags parameter. * g10/keygen.c (gpg_curve_to_oid): Move to ... * common/openpgp-oid.c (openpgp_curve_to_oid): here and rename. (oid_ed25519): New. (openpgp_oid_is_ed25519): New. (openpgp_oid_to_curve): New. * common/t-openpgp-oid.c (test_openpgp_oid_is_ed25519): New. * g10/build-packet.c (gpg_mpi_write): Write the length header also for opaque MPIs. (gpg_mpi_write_nohdr): New. (do_key): Use gpg_mpi_write_nohdr depending on algorithm. (do_pubkey_enc): Ditto. * g10/ecdh.c (pk_ecdh_encrypt_with_shared_point): Use gpg_mpi_write_nohdr. * g10/export.c (transfer_format_to_openpgp): * g10/keygen.c (ecckey_from_sexp): Return the error. (gen_ecc): Repalce arg NBITS by CURVE. (read_parameter_file): Add keywords "Key-Curve" and "Subkey-Curve". (ask_curve): New. (generate_keypair, generate_subkeypair): Use ask_curve. (do_generate_keypair): Also pass curve name. * g10/keylist.c (list_keyblock_print, list_keyblock_colon): Print curve name. * g10/parse-packet.c (mpi_read): Remove workaround for Libcgrypt < 1.5. (parse_key): Fix ECC case. Print the curve name. * g10/pkglue.c (mpi_from_sexp): Rename to get_mpi_from_sexp. (pk_verify, pk_check_secret_key): Add special case for Ed25519. * g10/seskey.c (encode_md_value): Ditto. * g10/sign.c (do_sign, hash_for, sign_file): Ditto. -- Be warned that this code is subject to further changes and that the format will very likely change before a release. There are also known bugs and missing code. Signed-off-by: Werner Koch <wk@gnupg.org>
185 lines
4.2 KiB
C
185 lines
4.2 KiB
C
/* t-openpgp-oid.c - Module test for openpgp-oid.c
|
|
* Copyright (C) 2011 Free Software Foundation, Inc.
|
|
*
|
|
* This file is part of GnuPG.
|
|
*
|
|
* GnuPG 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.
|
|
*
|
|
* GnuPG 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 this program; if not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#include <config.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <assert.h>
|
|
|
|
#include "util.h"
|
|
|
|
#define pass() do { ; } while(0)
|
|
#define fail(a,e) \
|
|
do { fprintf (stderr, "%s:%d: test %d failed (%s)\n", \
|
|
__FILE__,__LINE__, (a), gpg_strerror (e)); \
|
|
exit (1); \
|
|
} while(0)
|
|
|
|
|
|
static void
|
|
test_openpgp_oid_from_str (void)
|
|
{
|
|
static char *sample_oids[] =
|
|
{
|
|
"0.0",
|
|
"1.0",
|
|
"1.2.3",
|
|
"1.2.840.10045.3.1.7",
|
|
"1.3.132.0.34",
|
|
"1.3.132.0.35",
|
|
NULL
|
|
};
|
|
gpg_error_t err;
|
|
gcry_mpi_t a;
|
|
int idx;
|
|
char *string;
|
|
unsigned char *p;
|
|
unsigned int nbits;
|
|
size_t length;
|
|
|
|
err = openpgp_oid_from_str ("", &a);
|
|
if (gpg_err_code (err) != GPG_ERR_INV_VALUE)
|
|
fail (0, err);
|
|
gcry_mpi_release (a);
|
|
|
|
err = openpgp_oid_from_str (".", &a);
|
|
if (gpg_err_code (err) != GPG_ERR_INV_OID_STRING)
|
|
fail (0, err);
|
|
gcry_mpi_release (a);
|
|
|
|
err = openpgp_oid_from_str ("0", &a);
|
|
if (gpg_err_code (err) != GPG_ERR_INV_OID_STRING)
|
|
fail (0, err);
|
|
gcry_mpi_release (a);
|
|
|
|
for (idx=0; sample_oids[idx]; idx++)
|
|
{
|
|
err = openpgp_oid_from_str (sample_oids[idx], &a);
|
|
if (err)
|
|
fail (idx, err);
|
|
|
|
string = openpgp_oid_to_str (a);
|
|
if (!string)
|
|
fail (idx, gpg_error_from_syserror ());
|
|
if (strcmp (string, sample_oids[idx]))
|
|
fail (idx, 0);
|
|
xfree (string);
|
|
|
|
p = gcry_mpi_get_opaque (a, &nbits);
|
|
length = (nbits+7)/8;
|
|
if (!p || !length || p[0] != length - 1)
|
|
fail (idx, 0);
|
|
|
|
gcry_mpi_release (a);
|
|
}
|
|
|
|
}
|
|
|
|
|
|
static void
|
|
test_openpgp_oid_to_str (void)
|
|
{
|
|
static struct {
|
|
const char *string;
|
|
unsigned char der[10];
|
|
} samples[] = {
|
|
{ "1.2.840.10045.3.1.7",
|
|
{8, 0x2A, 0x86, 0x48, 0xCE, 0x3D, 0x03, 0x01, 0x07 }},
|
|
|
|
{ "1.3.132.0.34",
|
|
{5, 0x2B, 0x81, 0x04, 0x00, 0x22 }},
|
|
|
|
{ "1.3.132.0.35",
|
|
{ 5, 0x2B, 0x81, 0x04, 0x00, 0x23 }},
|
|
|
|
{ NULL }};
|
|
gcry_mpi_t a;
|
|
int idx;
|
|
char *string;
|
|
unsigned char *p;
|
|
|
|
for (idx=0; samples[idx].string; idx++)
|
|
{
|
|
p = xmalloc (samples[idx].der[0]+1);
|
|
memcpy (p, samples[idx].der, samples[idx].der[0]+1);
|
|
a = gcry_mpi_set_opaque (NULL, p, (samples[idx].der[0]+1)*8);
|
|
if (!a)
|
|
fail (idx, gpg_error_from_syserror ());
|
|
|
|
string = openpgp_oid_to_str (a);
|
|
if (!string)
|
|
fail (idx, gpg_error_from_syserror ());
|
|
if (strcmp (string, samples[idx].string))
|
|
fail (idx, 0);
|
|
xfree (string);
|
|
gcry_mpi_release (a);
|
|
}
|
|
|
|
}
|
|
|
|
|
|
static void
|
|
test_openpgp_oid_is_ed25519 (void)
|
|
{
|
|
static struct
|
|
{
|
|
int yes;
|
|
const char *oidstr;
|
|
} samples[] = {
|
|
{ 0, "0.0" },
|
|
{ 0, "1.3.132.0.35" },
|
|
{ 0, "1.3.6.1.4.1.3029.1.5.0" },
|
|
{ 1, "1.3.6.1.4.1.3029.1.5.1" },
|
|
{ 0, "1.3.6.1.4.1.3029.1.5.2" },
|
|
{ 0, "1.3.6.1.4.1.3029.1.5.1.0" },
|
|
{ 0, "1.3.6.1.4.1.3029.1.5" },
|
|
{ 0, NULL },
|
|
};
|
|
gpg_error_t err;
|
|
gcry_mpi_t a;
|
|
int idx;
|
|
|
|
for (idx=0; samples[idx].oidstr; idx++)
|
|
{
|
|
err = openpgp_oid_from_str (samples[idx].oidstr, &a);
|
|
if (err)
|
|
fail (idx, err);
|
|
|
|
if (openpgp_oid_is_ed25519 (a) != samples[idx].yes)
|
|
fail (idx, 0);
|
|
|
|
gcry_mpi_release (a);
|
|
}
|
|
|
|
}
|
|
|
|
|
|
int
|
|
main (int argc, char **argv)
|
|
{
|
|
(void)argc;
|
|
(void)argv;
|
|
|
|
test_openpgp_oid_from_str ();
|
|
test_openpgp_oid_to_str ();
|
|
test_openpgp_oid_is_ed25519 ();
|
|
|
|
return 0;
|
|
}
|