Revert "Merge branch 'upstream' into tizen"

[platform/upstream/nettle.git] / dsa-sha1-sign.c

diff --git a/dsa-sha1-sign.c b/dsa-sha1-sign.c
index ada81c1..1e79cef 100644 (file)
--- a/dsa-sha1-sign.c
+++ b/dsa-sha1-sign.c
@@ -1,41 +1,33 @@
 /* dsa-sha1-sign.c
-
-   The original DSA publickey algorithm, using SHA-1.
-
-   Copyright (C) 2010 Niels Möller
-
-   This file is part of GNU Nettle.
-
-   GNU Nettle is free software: you can redistribute it and/or
-   modify it under the terms of either:
-
-     * the GNU Lesser General Public License as published by the Free
-       Software Foundation; either version 3 of the License, or (at your
-       option) any later version.
-
-   or
-
-     * the GNU General Public License as published by the Free
-       Software Foundation; either version 2 of the License, or (at your
-       option) any later version.
-
-   or both in parallel, as here.
-
-   GNU Nettle is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received copies of the GNU General Public License and
-   the GNU Lesser General Public License along with this program.  If
-   not, see http://www.gnu.org/licenses/.
-*/
+ *
+ * The original DSA publickey algorithm, using SHA-1.
+ */
+
+/* nettle, low-level cryptographics library
+ *
+ * Copyright (C) 2010 Niels Möller
+ *  
+ * The nettle library is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or (at your
+ * option) any later version.
+ * 
+ * The nettle library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+ * License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with the nettle library; see the file COPYING.LIB.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02111-1301, USA.
+ */
 
 #if HAVE_CONFIG_H
 # include "config.h"
 #endif
 
-#include "dsa-compat.h"
+#include "dsa.h"
 
 int
 dsa_sha1_sign_digest(const struct dsa_public_key *pub,
@@ -44,9 +36,8 @@ dsa_sha1_sign_digest(const struct dsa_public_key *pub,
                     const uint8_t *digest,
                     struct dsa_signature *signature)
 {
-  return dsa_sign((const struct dsa_params *) pub, key->x,
-                 random_ctx, random,
-                 SHA1_DIGEST_SIZE, digest, signature);
+  return _dsa_sign(pub, key, random_ctx, random,
+                  SHA1_DIGEST_SIZE, digest, signature);
 }
 
 
@@ -59,8 +50,7 @@ dsa_sha1_sign(const struct dsa_public_key *pub,
 {
   uint8_t digest[SHA1_DIGEST_SIZE];
   sha1_digest(hash, sizeof(digest), digest);
-  
-  return dsa_sign((const struct dsa_params *) pub, key->x,
-                 random_ctx, random,
-                 sizeof(digest), digest, signature);
+
+  return _dsa_sign(pub, key, random_ctx, random,
+                  sizeof(digest), digest, signature);
 }