From 9724eaee82efba8b40b96ac963f460da10304626 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20M=C3=B6ller?= <nisse@lysator.liu.se>
Date: Mon, 10 Feb 2003 18:35:39 +0100
Subject: [PATCH] * rsa2sexp.c (rsa_keypair_to_sexp): New argument
ALGORITHM_NAME.
* rsa2sexp.c (rsa_keypair_to_sexp): Use literals with sexp_format.
Rev: src/nettle/rsa.h:1.21
Rev: src/nettle/rsa2sexp.c:1.6
---
rsa.h | 1 +
rsa2sexp.c | 8 ++++++--
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/rsa.h b/rsa.h
index 14a4c44b..dd500557 100644
--- a/rsa.h
+++ b/rsa.h
@@ -235,6 +235,7 @@ struct nettle_buffer;
/* Generates a public-key expression if PRIV is NULL .*/
int
rsa_keypair_to_sexp(struct nettle_buffer *buffer,
+ const char *algorithm_name, /* NULL means "rsa" */
const struct rsa_public_key *pub,
const struct rsa_private_key *priv);
diff --git a/rsa2sexp.c b/rsa2sexp.c
index 8957570d..75f5645c 100644
--- a/rsa2sexp.c
+++ b/rsa2sexp.c
@@ -34,19 +34,23 @@
int
rsa_keypair_to_sexp(struct nettle_buffer *buffer,
+ const char *algorithm_name,
const struct rsa_public_key *pub,
const struct rsa_private_key *priv)
{
+ if (!algorithm_name)
+ algorithm_name = "rsa";
+
if (priv)
return sexp_format(buffer,
"(private-key(%0s(n%b)(e%b)"
"(d%b)(p%b)(q%b)(a%b)(b%b)(c%b)))",
- "rsa", pub->n, pub->e,
+ algorithm_name, pub->n, pub->e,
priv->d, priv->p, priv->q,
priv->a, priv->b, priv->c);
else
return sexp_format(buffer, "(public-key(%0s(n%b)(e%b)))",
- "rsa", pub->n, pub->e);
+ algorithm_name, pub->n, pub->e);
}
#endif /* WITH_PUBLIC_KEY */
--
GitLab