security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-02-23 20:08:04 +01:00
Code Activity

ecc-sos: No need to expose sos_write.

Browse Source 
* g10/build-packet.c (sos_write): Rename from gpg_sos_write.
* g10/packet.h (gpg_sos_write): Remove.

Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2020-05-14 14:10:23 +09:00
parent e02347b2ab
commit 58ad686bfe
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
g10/build-packet.c
View File

@ -354,8 +354,8 @@ gpg_mpi_write (iobuf_t out, gcry_mpi_t a, unsigned int *r_nwritten)
* stored there. To only get the number of bytes which would be * stored there. To only get the number of bytes which would be
* written, NULL may be passed for OUT. * written, NULL may be passed for OUT.
*/ */
gpg_error_t static gpg_error_t
gpg_sos_write (iobuf_t out, gcry_mpi_t a, unsigned int *r_nwritten) sos_write (iobuf_t out, gcry_mpi_t a, unsigned int *r_nwritten)
{ {
gpg_error_t err; gpg_error_t err;
unsigned int nwritten = 0; unsigned int nwritten = 0;
@ -609,7 +609,7 @@ do_key (iobuf_t out, int ctb, PKT_public_key *pk)
|| (pk->pubkey_algo == PUBKEY_ALGO_ECDH && (i == 0 || i == 2))) || (pk->pubkey_algo == PUBKEY_ALGO_ECDH && (i == 0 || i == 2)))
err = gpg_mpi_write_nohdr (a, pk->pkey[i]); err = gpg_mpi_write_nohdr (a, pk->pkey[i]);
else if (pk->pubkey_algo == PUBKEY_ALGO_ECDH) else if (pk->pubkey_algo == PUBKEY_ALGO_ECDH)
err = gpg_sos_write (a, pk->pkey[i], NULL); err = sos_write (a, pk->pkey[i], NULL);
else else
err = gpg_mpi_write (a, pk->pkey[i], NULL); err = gpg_mpi_write (a, pk->pkey[i], NULL);
if (err) if (err)
@ -729,7 +729,7 @@ do_key (iobuf_t out, int ctb, PKT_public_key *pk)
if (pk->pubkey_algo == PUBKEY_ALGO_EDDSA if (pk->pubkey_algo == PUBKEY_ALGO_EDDSA
|| pk->pubkey_algo == PUBKEY_ALGO_ECDH) || pk->pubkey_algo == PUBKEY_ALGO_ECDH)
{ {
if ((err = gpg_sos_write (NULL, pk->pkey[j], &n))) if ((err = sos_write (NULL, pk->pkey[j], &n)))
goto leave; goto leave;
} }
else else
@ -747,7 +747,7 @@ do_key (iobuf_t out, int ctb, PKT_public_key *pk)
if (pk->pubkey_algo == PUBKEY_ALGO_EDDSA if (pk->pubkey_algo == PUBKEY_ALGO_EDDSA
|| pk->pubkey_algo == PUBKEY_ALGO_ECDH) || pk->pubkey_algo == PUBKEY_ALGO_ECDH)
{ {
if ( (err = gpg_sos_write (a, pk->pkey[i], NULL))) if ( (err = sos_write (a, pk->pkey[i], NULL)))
goto leave; goto leave;
} }
else else
@ -869,7 +869,7 @@ do_pubkey_enc( IOBUF out, int ctb, PKT_pubkey_enc *enc )
if (enc->pubkey_algo == PUBKEY_ALGO_ECDH && i == 1) if (enc->pubkey_algo == PUBKEY_ALGO_ECDH && i == 1)
rc = gpg_mpi_write_nohdr (a, enc->data[i]); rc = gpg_mpi_write_nohdr (a, enc->data[i]);
else if (enc->pubkey_algo == PUBKEY_ALGO_ECDH) else if (enc->pubkey_algo == PUBKEY_ALGO_ECDH)
rc = gpg_sos_write (a, enc->data[i], NULL); rc = sos_write (a, enc->data[i], NULL);
else else
rc = gpg_mpi_write (a, enc->data[i], NULL); rc = gpg_mpi_write (a, enc->data[i], NULL);
} }
@ -1751,13 +1751,10 @@ do_signature( IOBUF out, int ctb, PKT_signature *sig )
write_fake_data( a, sig->data[0] ); write_fake_data( a, sig->data[0] );
if (sig->pubkey_algo == PUBKEY_ALGO_EDDSA) if (sig->pubkey_algo == PUBKEY_ALGO_EDDSA)
for (i=0; i < n && !rc ; i++ ) for (i=0; i < n && !rc ; i++ )
rc = gpg_sos_write (a, sig->data[i], NULL); rc = sos_write (a, sig->data[i], NULL);
else else
for (i=0; i < n && !rc ; i++ ) for (i=0; i < n && !rc ; i++ )
if (sig->pubkey_algo == PUBKEY_ALGO_EDDSA) rc = gpg_mpi_write (a, sig->data[i], NULL);
rc = gpg_sos_write (a, sig->data[i], NULL);
else
rc = gpg_mpi_write (a, sig->data[i], NULL);
if (!rc) if (!rc)
{ {

1
g10/packet.h
View File

@ -867,7 +867,6 @@ gpg_error_t build_keyblock_image (kbnode_t keyblock, iobuf_t *r_iobuf);
int build_packet (iobuf_t out, PACKET *pkt); int build_packet (iobuf_t out, PACKET *pkt);
gpg_error_t build_packet_and_meta (iobuf_t out, PACKET *pkt); gpg_error_t build_packet_and_meta (iobuf_t out, PACKET *pkt);
gpg_error_t gpg_mpi_write (iobuf_t out, gcry_mpi_t a, unsigned int *t_nwritten); gpg_error_t gpg_mpi_write (iobuf_t out, gcry_mpi_t a, unsigned int *t_nwritten);
gpg_error_t gpg_sos_write (iobuf_t out, gcry_mpi_t a, unsigned int *t_nwritten);
gpg_error_t gpg_mpi_write_nohdr (iobuf_t out, gcry_mpi_t a); gpg_error_t gpg_mpi_write_nohdr (iobuf_t out, gcry_mpi_t a);
u32 calc_packet_length( PACKET *pkt ); u32 calc_packet_length( PACKET *pkt );
void build_sig_subpkt( PKT_signature *sig, sigsubpkttype_t type, void build_sig_subpkt( PKT_signature *sig, sigsubpkttype_t type,