mirror of
git://git.gnupg.org/gnupg.git
synced 2024-10-31 20:08:43 +01:00
97f5159495
* common/openpgpdefs.h (PUBKEY_ALGO_KY768_25519): Remove. (PUBKEY_ALGO_KY1024_448): Remove. (PUBKEY_ALGO_KYBER): New. Use them everywhere instead of the removed. * g10/build-packet.c (gpg_mpi_write_nohdr): Rename to (gpg_mpi_write_opaque_nohdr): this. Change callers. (gpg_mpi_write_opaque_32): New. (do_key): Support Kyber keys using the revised format. * g10/gpg.h (MAX_EXTERN_KEYPARM_BITS): New. * g10/parse-packet.c (read_octet_string): Add arg nbytes so support reading with a length prefix. Adjust callers. (parse_key): Parse Kyber public keys. * g10/misc.c (pubkey_get_npkey): Support Kyber. (pubkey_get_nskey): Ditto. * g10/keyid.c (pubkey_string): Support dual algorithms. (do_hash_public_key): Support Kyber. (nbits_from_pk): Ditto. (keygrip_from_pk): Return the Kyber part for the ECC+Kyber dual algo. * g10/keygen.c (struct common_gen_cb_parm_s): Add genkey_result2. Note that this callback is not yet used. (ecckey_from_sexp): Add optional arg sexp2 and use it for Kyber. Change callers. (ecckey_from_sexp): Do not leak LIST in case of an error. (common_gen): Add arg keyparms2, change callers, and support Kyber. (gen_kyber): New. (get_keysize_range): Support Kyber. (fixup_keysize): Simplify and support Kyber. (do_create): Handle Kyber. (parse_key_parameter_part): Remove algo strings "ky768" and "ky1024" and add a generic "kyber" with default parameters. -- This uses a revised format which is more aligned with the usual OpenPGP structure. A lot of things are still missing. For example support for handling two keygrips and checking both of them in a -K listing. There is also only ky768_bp384 as fixed algorithm for now. No passphrase for the Kyber part of the dual algorithm is on purpose. A test was done using gpg --quick-gen-key pqc1 nistp256 and then running gpg -v --quick-add-key <fingerprint> kyber which creates a v5 subkey on a v4 primary key. A second test using gpg --quick-gen-key pqc2 Ed448 followed by a --quick-add-key created a v5 key with a v5 subkey. GnuPG-bug-id: 6815
130 lines
4.0 KiB
C
130 lines
4.0 KiB
C
/* gpg.h - top level include file for gpg etc.
|
|
* Copyright (C) 2003, 2006, 2010 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 <https://www.gnu.org/licenses/>.
|
|
*/
|
|
#ifndef GNUPG_G10_GPG_H
|
|
#define GNUPG_G10_GPG_H
|
|
|
|
/* Note, that this file should be the first one after the system
|
|
header files. This is required to set the error source to the
|
|
correct value and may be of advantage if we ever have to do
|
|
special things. */
|
|
|
|
#ifdef HAVE_W32_SYSTEM
|
|
# define WIN32_LEAN_AND_MEAN 1
|
|
#endif
|
|
|
|
#ifdef GPG_ERR_SOURCE_DEFAULT
|
|
#error GPG_ERR_SOURCE_DEFAULT already defined
|
|
#endif
|
|
#define GPG_ERR_SOURCE_DEFAULT GPG_ERR_SOURCE_GPG
|
|
#define map_assuan_err(a) \
|
|
map_assuan_err_with_source (GPG_ERR_SOURCE_DEFAULT, (a))
|
|
#include <gpg-error.h>
|
|
#include <gcrypt.h>
|
|
|
|
|
|
/* Number of bits we accept when reading or writing MPIs. */
|
|
#define MAX_EXTERN_MPI_BITS 16384
|
|
|
|
/* Number of bytes we accept when reading four-octet count prefixed
|
|
* key parameters. Needs to fit as a positive number into an int. */
|
|
#define MAX_EXTERN_KEYPARM_BITS (32768*8)
|
|
|
|
/* The maximum length of a binary fingerprints. This is used to
|
|
* provide a static buffer and will be increased if we need to support
|
|
* longer fingerprints. Warning: At some places we have some
|
|
* assumption on a 20 byte fingerprint.
|
|
* Watch out for FIXME(fingerprint) */
|
|
#define MAX_FINGERPRINT_LEN 32
|
|
|
|
/* The maximum length of a formatted fingerprint as returned by
|
|
* format_hexfingerprint(). */
|
|
#define MAX_FORMATTED_FINGERPRINT_LEN 60
|
|
|
|
|
|
/*
|
|
Forward declarations.
|
|
*/
|
|
|
|
/* Object used to keep state locally to server.c . */
|
|
struct server_local_s;
|
|
|
|
/* Object used to keep state locally to call-keyboxd.c . */
|
|
struct keyboxd_local_s;
|
|
typedef struct keyboxd_local_s *keyboxd_local_t;
|
|
|
|
/* Object used to keep state locally to call-dirmngr.c . */
|
|
struct dirmngr_local_s;
|
|
typedef struct dirmngr_local_s *dirmngr_local_t;
|
|
|
|
/* Object used to describe a keyblock node. */
|
|
typedef struct kbnode_struct *KBNODE; /* Deprecated use kbnode_t. */typedef struct kbnode_struct *kbnode_t;
|
|
|
|
/* The handle for keydb operations. */
|
|
typedef struct keydb_handle_s *KEYDB_HANDLE;
|
|
|
|
/* TOFU database meta object. */
|
|
struct tofu_dbs_s;
|
|
typedef struct tofu_dbs_s *tofu_dbs_t;
|
|
|
|
|
|
#if SIZEOF_UNSIGNED_LONG == 8
|
|
# define SERVER_CONTROL_MAGIC 0x53616c696e676572
|
|
#else
|
|
# define SERVER_CONTROL_MAGIC 0x53616c69
|
|
#endif
|
|
|
|
/* Session control object. This object is passed to most functions to
|
|
convey the status of a session. Note that the defaults are set by
|
|
gpg_init_default_ctrl(). */
|
|
struct server_control_s
|
|
{
|
|
/* Always has the value SERVER_CONTROL_MAGIC. */
|
|
unsigned long magic;
|
|
|
|
/* Local data for server.c */
|
|
struct server_local_s *server_local;
|
|
|
|
/* Local data for call-dirmngr.c */
|
|
dirmngr_local_t dirmngr_local;
|
|
|
|
/* Local data for call-keyboxd.c */
|
|
keyboxd_local_t keyboxd_local;
|
|
|
|
/* Local data for tofu.c */
|
|
struct {
|
|
tofu_dbs_t dbs;
|
|
int batch_updated_wanted;
|
|
} tofu;
|
|
|
|
/* This is used to cache a key data base handle. */
|
|
KEYDB_HANDLE cached_getkey_kdb;
|
|
|
|
/* Cached results from HAVEKEY --list. They are used if the pointer
|
|
* is not NULL. The length gives the length in bytes and is a
|
|
* multiple of 20. If the no_more flag is set the list shall not
|
|
* anymore be refreshed even if it has been freed and NULLed. */
|
|
unsigned char *secret_keygrips;
|
|
size_t secret_keygrips_len;
|
|
int no_more_secret_keygrips;
|
|
};
|
|
|
|
|
|
|
|
#endif /*GNUPG_G10_GPG_H*/
|