Rename, _dsa_sign --> dsa_sign, _dsa_verify --> dsa_verify.

diff --git a/ChangeLog b/ChangeLog
index f7e6eb226545c67b268785eaf439d1a188b38957..71f2d94dfce96e9b23e27c78aea953f07946feb7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-11-25  Niels Möller  <nisse@lysator.liu.se>
+
+       * dsa-verify.c (dsa_verify): Renamed, from _dsa_verify.
+       * dsa-sign.c (dsa_sign): Renamed, from _dsa_sign.
+
 2013-11-24  Niels Möller  <nisse@lysator.liu.se>
 
        * testsuite/dsa-keygen-test.c (test_main): Test generating a

diff --git a/dsa-sha1-sign.c b/dsa-sha1-sign.c
index 1e79cefbcf22b56486eb30c0fbf4c51e88d217a7..db820576725859b83393e70b7a530972d439f6d6 100644 (file)
--- a/dsa-sha1-sign.c
+++ b/dsa-sha1-sign.c
@@ -36,8 +36,8 @@ dsa_sha1_sign_digest(const struct dsa_public_key *pub,
                     const uint8_t *digest,
                     struct dsa_signature *signature)
 {
-  return _dsa_sign(pub, key, random_ctx, random,
-                  SHA1_DIGEST_SIZE, digest, signature);
+  return dsa_sign(pub, key, random_ctx, random,
+                 SHA1_DIGEST_SIZE, digest, signature);
 }
 
 
@@ -51,6 +51,6 @@ dsa_sha1_sign(const struct dsa_public_key *pub,
   uint8_t digest[SHA1_DIGEST_SIZE];
   sha1_digest(hash, sizeof(digest), digest);
 
-  return _dsa_sign(pub, key, random_ctx, random,
-                  sizeof(digest), digest, signature);
+  return dsa_sign(pub, key, random_ctx, random,
+                 sizeof(digest), digest, signature);
 }

diff --git a/dsa-sha1-verify.c b/dsa-sha1-verify.c
index 883df93da05b324dd33cb5a6bba15550749a0ac4..76de58208e58cfe2db88d76bbc68e9608d2704bd 100644 (file)
--- a/dsa-sha1-verify.c
+++ b/dsa-sha1-verify.c
@@ -36,7 +36,7 @@ dsa_sha1_verify_digest(const struct dsa_public_key *key,
                       const uint8_t *digest,
                       const struct dsa_signature *signature)
 {
-  return _dsa_verify(key, SHA1_DIGEST_SIZE, digest, signature);
+  return dsa_verify(key, SHA1_DIGEST_SIZE, digest, signature);
 }
 
 int
@@ -47,5 +47,5 @@ dsa_sha1_verify(const struct dsa_public_key *key,
   uint8_t digest[SHA1_DIGEST_SIZE];
   sha1_digest(hash, sizeof(digest), digest);
 
-  return _dsa_verify(key, sizeof(digest), digest, signature);
+  return dsa_verify(key, sizeof(digest), digest, signature);
 }

diff --git a/dsa-sha256-sign.c b/dsa-sha256-sign.c
index 577450675748f856276c48b159e14eb93e7c355d..68f66d0195b2046ad4cd41f300bb8b6b13e103cf 100644 (file)
--- a/dsa-sha256-sign.c
+++ b/dsa-sha256-sign.c
@@ -36,8 +36,8 @@ dsa_sha256_sign_digest(const struct dsa_public_key *pub,
                       const uint8_t *digest,
                       struct dsa_signature *signature)
 {
-  return _dsa_sign(pub, key, random_ctx, random,
-                  SHA256_DIGEST_SIZE, digest, signature);
+  return dsa_sign(pub, key, random_ctx, random,
+                 SHA256_DIGEST_SIZE, digest, signature);
 }
 
 int
@@ -50,6 +50,6 @@ dsa_sha256_sign(const struct dsa_public_key *pub,
   uint8_t digest[SHA256_DIGEST_SIZE];
   sha256_digest(hash, sizeof(digest), digest);
 
-  return _dsa_sign(pub, key, random_ctx, random,
-                  sizeof(digest), digest, signature);
+  return dsa_sign(pub, key, random_ctx, random,
+                 sizeof(digest), digest, signature);
 }

diff --git a/dsa-sha256-verify.c b/dsa-sha256-verify.c
index 975a4a5188a552e7196fcce886047f88f5c8e5a2..d7d7aff6cc9b6083814b7e6b63abb89b13e7ab46 100644 (file)
--- a/dsa-sha256-verify.c
+++ b/dsa-sha256-verify.c
@@ -36,7 +36,7 @@ dsa_sha256_verify_digest(const struct dsa_public_key *key,
                         const uint8_t *digest,
                         const struct dsa_signature *signature)
 {
-  return _dsa_verify(key, SHA256_DIGEST_SIZE, digest, signature);
+  return dsa_verify(key, SHA256_DIGEST_SIZE, digest, signature);
 }
 
 int
@@ -47,5 +47,5 @@ dsa_sha256_verify(const struct dsa_public_key *key,
   uint8_t digest[SHA256_DIGEST_SIZE];
   sha256_digest(hash, sizeof(digest), digest);
 
-  return _dsa_verify(key, sizeof(digest), digest, signature);
+  return dsa_verify(key, sizeof(digest), digest, signature);
 }

diff --git a/dsa-sign.c b/dsa-sign.c
index 2165ace7e163c4517a77c3853e9487215eba7864..4902babab0a431faa674099c4074786f94b83026 100644 (file)
--- a/dsa-sign.c
+++ b/dsa-sign.c
@@ -36,12 +36,12 @@
 
 
 int
-_dsa_sign(const struct dsa_public_key *pub,
-         const struct dsa_private_key *key,
-         void *random_ctx, nettle_random_func *random,
-         size_t digest_size,
-         const uint8_t *digest,
-         struct dsa_signature *signature)
+dsa_sign(const struct dsa_public_key *pub,
+        const struct dsa_private_key *key,
+        void *random_ctx, nettle_random_func *random,
+        size_t digest_size,
+        const uint8_t *digest,
+        struct dsa_signature *signature)
 {
   mpz_t k;
   mpz_t h;

diff --git a/dsa-verify.c b/dsa-verify.c
index 89232e8feb66381a46bda41f64108301f8527008..b6d5a7ae96bc56187b02ee288ad2792219fda6cb 100644 (file)
--- a/dsa-verify.c
+++ b/dsa-verify.c
@@ -34,10 +34,10 @@
 #include "bignum.h"
 
 int
-_dsa_verify(const struct dsa_public_key *key,
-           size_t digest_size,
-           const uint8_t *digest,
-           const struct dsa_signature *signature)
+dsa_verify(const struct dsa_public_key *key,
+          size_t digest_size,
+          const uint8_t *digest,
+          const struct dsa_signature *signature)
 {
   mpz_t w;
   mpz_t tmp;

diff --git a/dsa.h b/dsa.h
index 59ddbec24b70aaba168d94d4d7da5ba09a834641..bcd0774168a660cd4dda4b837dc1181af2246be7 100644 (file)
--- a/dsa.h
+++ b/dsa.h
@@ -48,6 +48,8 @@ extern "C" {
 #define dsa_sha1_verify nettle_dsa_sha1_verify
 #define dsa_sha256_sign nettle_dsa_sha256_sign
 #define dsa_sha256_verify nettle_dsa_sha256_verify
+#define dsa_sign nettle_dsa_sign
+#define dsa_verify nettle_dsa_verify
 #define dsa_sha1_sign_digest nettle_dsa_sha1_sign_digest
 #define dsa_sha1_verify_digest nettle_dsa_sha1_verify_digest
 #define dsa_sha256_sign_digest nettle_dsa_sha256_sign_digest
@@ -63,8 +65,6 @@ extern "C" {
 #define dsa_openssl_private_key_from_der_iterator nettle_dsa_openssl_private_key_from_der_iterator 
 #define dsa_openssl_private_key_from_der nettle_openssl_provate_key_from_der
 #define _dsa_hash _nettle_dsa_hash
-#define _dsa_sign _nettle_dsa_sign
-#define _dsa_verify _nettle_dsa_verify
 
 #define DSA_SHA1_MIN_P_BITS 512
 #define DSA_SHA1_Q_OCTETS 20
@@ -173,6 +173,22 @@ dsa_sha256_verify(const struct dsa_public_key *key,
                  const struct dsa_signature *signature);
 
 int
+dsa_sign(const struct dsa_public_key *pub,
+        const struct dsa_private_key *key,
+        void *random_ctx, nettle_random_func *random,
+        size_t digest_size,
+        const uint8_t *digest,
+        struct dsa_signature *signature);
+
+int
+dsa_verify(const struct dsa_public_key *key,
+          size_t digest_size,
+          const uint8_t *digest,
+          const struct dsa_signature *signature);
+
+/* Maybe obsolete these functions? One can just as well call dsa_sign
+   and dsa_verify directly, all that matters is the digest size. */
+int
 dsa_sha1_sign_digest(const struct dsa_public_key *pub,
                     const struct dsa_private_key *key,
                     void *random_ctx, nettle_random_func *random,
@@ -277,20 +293,6 @@ void
 _dsa_hash (mpz_t h, unsigned bit_size,
           size_t length, const uint8_t *digest);
 
-int
-_dsa_sign(const struct dsa_public_key *pub,
-         const struct dsa_private_key *key,
-         void *random_ctx, nettle_random_func *random,
-         size_t digest_size,
-         const uint8_t *digest,
-         struct dsa_signature *signature);
-
-int
-_dsa_verify(const struct dsa_public_key *key,
-           size_t digest_size,
-           const uint8_t *digest,
-           const struct dsa_signature *signature);
-
 #ifdef __cplusplus
 }
 #endif