diff options
| -rw-r--r-- | g10/build-packet.c | 10 | ||||
| -rw-r--r-- | g10/keygen.c | 1 | ||||
| -rw-r--r-- | g10/keyid.c | 2 | ||||
| -rw-r--r-- | g10/packet.h | 10 |
4 files changed, 14 insertions, 9 deletions
diff --git a/g10/build-packet.c b/g10/build-packet.c index e6b09fb11..9a00c1284 100644 --- a/g10/build-packet.c +++ b/g10/build-packet.c @@ -309,15 +309,7 @@ gpg_mpi_write (iobuf_t out, gcry_mpi_t a, unsigned int *r_nwritten) /* Strip leading zero bits. */ for (; nbits >= 8 && !*p; p++, nbits -= 8) ; - if (nbits >= 8 && !(*p & 0x80)) - if (--nbits >= 7 && !(*p & 0x40)) - if (--nbits >= 6 && !(*p & 0x20)) - if (--nbits >= 5 && !(*p & 0x10)) - if (--nbits >= 4 && !(*p & 0x08)) - if (--nbits >= 3 && !(*p & 0x04)) - if (--nbits >= 2 && !(*p & 0x02)) - if (--nbits >= 1 && !(*p & 0x01)) - --nbits; + CALC_NBITS (nbits, p); } /* gcry_log_debug (" [%u bit]\n", nbits); */ /* gcry_log_debughex (" ", p, (nbits+7)/8); */ diff --git a/g10/keygen.c b/g10/keygen.c index 63e2f9cff..56bb388b7 100644 --- a/g10/keygen.c +++ b/g10/keygen.c @@ -1336,6 +1336,7 @@ ecckey_from_sexp (gcry_mpi_t *array, gcry_sexp_t sexp, int algo) goto leave; } array[1] = gcry_sexp_nth_mpi (l2, 1, GCRYMPI_FMT_OPAQUE); + gcry_mpi_set_flag (array[1], GCRYMPI_FLAG_USER2); gcry_sexp_release (l2); if (!array[1]) { diff --git a/g10/keyid.c b/g10/keyid.c index d3fc29a98..bfa81a591 100644 --- a/g10/keyid.c +++ b/g10/keyid.c @@ -194,6 +194,8 @@ hash_public_key (gcry_md_hd_t md, PKT_public_key *pk) pp[i] = NULL; if (is_sos) { + const unsigned char *p0 = p; + CALC_NBITS (nbits, p0); pp[i][0] = (nbits >> 8); pp[i][1] = nbits; } diff --git a/g10/packet.h b/g10/packet.h index ed0749cb8..7bf379af5 100644 --- a/g10/packet.h +++ b/g10/packet.h @@ -63,6 +63,16 @@ #define is_ELGAMAL(a) ((a)==PUBKEY_ALGO_ELGAMAL_E) #define is_DSA(a) ((a)==PUBKEY_ALGO_DSA) +#define CALC_NBITS(nbits,p) if (nbits >= 8 && !(*p & 0x80)) \ + if (--nbits >= 7 && !(*p & 0x40)) \ + if (--nbits >= 6 && !(*p & 0x20)) \ + if (--nbits >= 5 && !(*p & 0x10)) \ + if (--nbits >= 4 && !(*p & 0x08)) \ + if (--nbits >= 3 && !(*p & 0x04)) \ + if (--nbits >= 2 && !(*p & 0x02)) \ + if (--nbits >= 1 && !(*p & 0x01)) \ + --nbits + /* A pointer to the packet object. */ typedef struct packet_struct PACKET; |