From 5a3de636a34d4a9762be3bd53457eb8d380f57eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20M=C3=B6ller?= <nisse@lysator.liu.se>
Date: Mon, 12 May 2003 23:42:04 +0200
Subject: [PATCH] (rsa_keypair_to_openpgp): Some bugfixes.
Rev: src/nettle/rsa.h:1.23
Rev: src/nettle/rsa2openpgp.c:1.3
---
rsa.h | 2 +-
rsa2openpgp.c | 11 +++++------
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/rsa.h b/rsa.h
index a924fb2b..39b83b11 100644
--- a/rsa.h
+++ b/rsa.h
@@ -289,7 +289,7 @@ rsa_keypair_to_openpgp(struct nettle_buffer *buffer,
const struct rsa_public_key *pub,
const struct rsa_private_key *priv,
/* A single user id. NUL-terminated utf8. */
- const char userid);
+ const char *userid);
/* Internal functions. */
int
diff --git a/rsa2openpgp.c b/rsa2openpgp.c
index f3f01f07..580cd333 100644
--- a/rsa2openpgp.c
+++ b/rsa2openpgp.c
@@ -29,6 +29,7 @@
#if WITH_PUBLIC_KEY
+#include <string.h>
#include <time.h>
#include "rsa.h"
@@ -54,13 +55,13 @@
*
* Currently, we generate a public key packet, a single user id, and a
* signature. */
- */
+
int
rsa_keypair_to_openpgp(struct nettle_buffer *buffer,
const struct rsa_public_key *pub,
const struct rsa_private_key *priv,
/* A single user id. NUL-terminated utf8. */
- const char userid)
+ const char *userid)
{
time_t now = time(NULL);
@@ -72,8 +73,6 @@ rsa_keypair_to_openpgp(struct nettle_buffer *buffer,
struct sha1_ctx signature_hash;
uint8_t fingerprint[SHA1_DIGEST_SIZE];
- mpz_t s;
-
key_start = buffer->size;
if (!pgp_put_public_rsa_key(buffer, pub, now))
@@ -91,7 +90,7 @@ rsa_keypair_to_openpgp(struct nettle_buffer *buffer,
buffer->contents + key_start);
signature_hash = key_hash;
- sha1_digest(&key_hash, fingerprint, sizeof(fingerprint));
+ sha1_digest(&key_hash, sizeof(fingerprint), fingerprint);
sha1_update(&signature_hash,
buffer->size - userid_start,
@@ -101,6 +100,6 @@ rsa_keypair_to_openpgp(struct nettle_buffer *buffer,
priv,
fingerprint + SHA1_DIGEST_SIZE - 8,
PGP_SIGN_CERTIFICATION,
- signature_hash);
+ &signature_hash);
}
#endif /* WITH_PUBLIC_KEY */
--
GitLab