Delete old and deprecated file sha.h.

diff --git a/ChangeLog b/ChangeLog
index 5a660fab49444559b0f1e1df169c8f60a5139e14..a2d1bce40fb1e0536719dea6025603a51c5783b2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2025-04-28  Niels Möller  <nisse@lysator.liu.se>
 
+       * sha.h: Deleted file.
+       * nettle.texinfo: Delete all mention of sha.h.
+       * Makefile.in (HEADERS): Delete sha.h.
+
        * ghosthash94.h, md*.h, ripemd160.h, sha*.h, umac.h: Delete all
        _DATA_SIZE constant, they were backwards compatibility aliases for
        _BLOCK_SIZE, from 2014 renaming.

diff --git a/Makefile.in b/Makefile.in
index 012f6f2ea85f5d3dafceafea09385b2aa41d5f51..98249d254d0238c2ee7e432d0c1a51769fd8c582 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -251,7 +251,7 @@ HEADERS = aes.h arcfour.h arctwo.h asn1.h blowfish.h balloon.h \
          ocb.h pbkdf2.h \
          pkcs1.h pss.h pss-mgf1.h realloc.h ripemd160.h rsa.h \
          salsa20.h sexp.h serpent.h \
-         sha.h sha1.h sha2.h sha3.h sm3.h sm4.h streebog.h twofish.h \
+         sha1.h sha2.h sha3.h sm3.h sm4.h streebog.h twofish.h \
          umac.h yarrow.h xts.h poly1305.h nist-keywrap.h \
          drbg-ctr.h
 

diff --git a/nettle.texinfo b/nettle.texinfo
index 77451803dfa3ada1a9a01102382b987f3c461f5d..fb82477482434c4c42e05d95d44292786160d5e3 100644 (file)
--- a/nettle.texinfo
+++ b/nettle.texinfo
@@ -449,16 +449,11 @@ for the rare applications that need that (e.g., using different IV from
 standard SHA256).
 @end deftypefun
 
-Earlier versions of nettle defined SHA256 in the header file
-@file{<nettle/sha.h>}, which is now deprecated, but kept for
-compatibility.
-
 @subsubsection @acronym{SHA224}
 
 SHA224 is a variant of SHA256, with a different initial state, and with
 the output truncated to 224 bits, or 28 octets. Nettle defines SHA224 in
-@file{<nettle/sha2.h>} (and in @file{<nettle/sha.h>}, for backwards
-compatibility).
+@file{<nettle/sha2.h>}.
 
 @deftp {Context struct} {struct sha224_ctx}
 @end deftp
@@ -494,8 +489,7 @@ SHA512 is a larger sibling to SHA256, with a very similar structure but
 with both the output and the internal variables of twice the size. The
 internal variables are 64 bits rather than 32, making it significantly
 slower on 32-bit computers. It outputs hash values of 512 bits, or 64
-octets. Nettle defines SHA512 in @file{<nettle/sha2.h>} (and in
-@file{<nettle/sha.h>}, for backwards compatibility).
+octets. Nettle defines SHA512 in @file{<nettle/sha2.h>}.
 
 @deftp {Context struct} {struct sha512_ctx}
 @end deftp
@@ -539,8 +533,7 @@ Several variants of SHA512 have been defined, with a different initial
 state, and with the output truncated to shorter length than 512 bits.
 Naming is a bit confused, these algorithms are called SHA512-224,
 SHA512-256 and SHA384, for output sizes of 224, 256 and 384 bits,
-respectively. Nettle defines these in @file{<nettle/sha2.h>} (and in
-@file{<nettle/sha.h>}, for backwards compatibility).
+respectively. Nettle defines these in @file{<nettle/sha2.h>}.
 
 @deftp {Context struct} {struct sha512_224_ctx}
 @deftpx {Context struct} {struct sha512_256_ctx}
@@ -1088,8 +1081,7 @@ This function also resets the context in the same way as
 
 SHA1 is a hash function specified by @dfn{NIST} (The U.S. National
 Institute for Standards and Technology). It outputs hash values of 160
-bits, or 20 octets. Nettle defines SHA1 in @file{<nettle/sha1.h>} (and
-in @file{<nettle/sha.h>}, for backwards compatibility).
+bits, or 20 octets. Nettle defines SHA1 in @file{<nettle/sha1.h>}.
 
 @deftp {Context struct} {struct sha1_ctx}
 @end deftp

diff --git a/sha.h b/sha.h
deleted file mode 100644 (file)
index 7d4afde..0000000
--- a/sha.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* sha.h
-
-   This file is deprecated, and provided only for backwards
-   compatibility with earlier versions of Nettle. Please use sha1.h
-   and/or sha2.h instead.
-
-   Copyright (C) 2001 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/.
-*/
-
-#ifndef NETTLE_SHA_H_INCLUDED
-#define NETTLE_SHA_H_INCLUDED
-
-#include "sha1.h"
-#include "sha2.h"
-
-#endif /* NETTLE_SHA_H_INCLUDED */