diff options
| author | NIIBE Yutaka <[email protected]> | 2020-05-14 05:10:23 +0000 |
|---|---|---|
| committer | NIIBE Yutaka <[email protected]> | 2020-05-14 05:10:23 +0000 |
| commit | 58ad686bfe7f5f111ced0c8e1b393240a423f441 (patch) | |
| tree | a595daab7a1ae4c7de3e020cb80ce32d683a0a93 | |
| parent | ecc-sos: Clean up use of mpi_get_opaque. (diff) | |
| download | gnupg-58ad686bfe7f5f111ced0c8e1b393240a423f441.tar.gz gnupg-58ad686bfe7f5f111ced0c8e1b393240a423f441.zip | |
ecc-sos: No need to expose sos_write.
* g10/build-packet.c (sos_write): Rename from gpg_sos_write.
* g10/packet.h (gpg_sos_write): Remove.
Signed-off-by: NIIBE Yutaka <[email protected]>
| -rw-r--r-- | g10/build-packet.c | 19 | ||||
| -rw-r--r-- | g10/packet.h | 1 |
2 files changed, 8 insertions, 12 deletions
diff --git a/g10/build-packet.c b/g10/build-packet.c index e0570806e..7636407b3 100644 --- a/g10/build-packet.c +++ b/g10/build-packet.c @@ -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 * written, NULL may be passed for OUT. */ -gpg_error_t -gpg_sos_write (iobuf_t out, gcry_mpi_t a, unsigned int *r_nwritten) +static gpg_error_t +sos_write (iobuf_t out, gcry_mpi_t a, unsigned int *r_nwritten) { gpg_error_t err; 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))) err = gpg_mpi_write_nohdr (a, pk->pkey[i]); 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 err = gpg_mpi_write (a, pk->pkey[i], NULL); if (err) @@ -729,7 +729,7 @@ do_key (iobuf_t out, int ctb, PKT_public_key *pk) if (pk->pubkey_algo == PUBKEY_ALGO_EDDSA || 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; } else @@ -747,7 +747,7 @@ do_key (iobuf_t out, int ctb, PKT_public_key *pk) if (pk->pubkey_algo == PUBKEY_ALGO_EDDSA || 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; } 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) rc = gpg_mpi_write_nohdr (a, enc->data[i]); 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 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] ); if (sig->pubkey_algo == PUBKEY_ALGO_EDDSA) 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 for (i=0; i < n && !rc ; i++ ) - if (sig->pubkey_algo == PUBKEY_ALGO_EDDSA) - rc = gpg_sos_write (a, sig->data[i], NULL); - else - rc = gpg_mpi_write (a, sig->data[i], NULL); + rc = gpg_mpi_write (a, sig->data[i], NULL); if (!rc) { diff --git a/g10/packet.h b/g10/packet.h index ed0749cb8..5c0de577c 100644 --- a/g10/packet.h +++ b/g10/packet.h @@ -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); 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_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); u32 calc_packet_length( PACKET *pkt ); void build_sig_subpkt( PKT_signature *sig, sigsubpkttype_t type, |