Unbreak the OpenSSL and NSS crypto builds in the wake of r24652

(Fortuna as default PRNG), and remove some unnecessary related files.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@24656 dc483132-0cff-0310-8789-dd5450dbe970

4 files changed, 17 insertions, 53 deletions

diff --git a/src/lib/crypto/nss/Makefile.in b/src/lib/crypto/nss/Makefile.in
index 7016e924b..a1d587887 100644
--- a/src/lib/crypto/nss/Makefile.in
+++ b/src/lib/crypto/nss/Makefile.in
@@ -20,15 +20,18 @@ DEFS=
 
 STLIBOBJS=\
 	hmac.o	\
-	pbkdf2.o		
+	pbkdf2.o \
+	stubs.o
 
 OBJS=\
 	$(OUTPRE)hmac.$(OBJEXT)	\
-	$(OUTPRE)pbkdf2.$(OBJEXT)		
+	$(OUTPRE)pbkdf2.$(OBJEXT) \
+	$(OUTPRE)stubs.$(OBJEXT)
 
 SRCS=\
 	$(srcdir)/hmac.c	\
-	$(srcdir)/pbkdf2.c	
+	$(srcdir)/pbkdf2.c	\
+	$(srcdir)/stubs.c
 
 STOBJLISTS= des/OBJS.ST md4/OBJS.ST 	\
 	md5/OBJS.ST sha1/OBJS.ST sha2/OBJS.ST	\
diff --git a/src/lib/crypto/nss/sha2/Makefile.in b/src/lib/crypto/nss/sha2/Makefile.in
index a8edb60d9..1a2bcbb82 100644
--- a/src/lib/crypto/nss/sha2/Makefile.in
+++ b/src/lib/crypto/nss/sha2/Makefile.in
@@ -1,19 +1,23 @@
-mydir=lib$(S)crypto$(S)nss$(S)sha2
+# Nothing here!  But we can't remove this directory as the build
+# system currently assumes that all modules have the same directory
+# structure.
+
+mydir=lib$(S)crypto$(S)nss$(S)aes
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
+LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../../krb/dk  -I$(srcdir)/../../../../include
 DEFS=
-CRYPTO_IMPL_CFLAGS=@CRYPTO_IMPL_CFLAGS@
-LOCALINCLUDES = -I$(srcdir)/.. $(CRYPTO_IMPL_CFLAGS)
 
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
 
-STLIBOBJS= sha2.o
+STLIBOBJS=
+
+OBJS=
 
-OBJS= $(OUTPRE)sha2.$(OBJEXT) 
+SRCS=
 
-SRCS= $(srcdir)/sha2.c
 
-all-unix:: all-libobjs
+all-unix:: all-libobjs 
 
 includes:: depend
 
@@ -22,4 +26,3 @@ depend:: $(SRCS)
 clean-unix:: clean-libobjs
 
 @libobj_frag@
-
diff --git a/src/lib/crypto/nss/sha2/sha2.c b/src/lib/crypto/nss/sha2/sha2.c
deleted file mode 100644
index 71f27b4e7..000000000
--- a/src/lib/crypto/nss/sha2/sha2.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
-
-#include "k5-int.h"
-#include "sha2.h"
-
-void sha2Init(SHA2_INFO *shsInfo)
-{
-    return;
-}
-
-void sha2Update(SHA2_INFO *shsInfo, const SHS_BYTE *buffer, unsigned int count)
-{
-    return;
-}
-
-void sha2Final(SHA2_INFO *shsInfo)
-{
-    return;
-}
diff --git a/src/lib/crypto/nss/sha2/sha2.h b/src/lib/crypto/nss/sha2/sha2.h
deleted file mode 100644
index ade8b615a..000000000
--- a/src/lib/crypto/nss/sha2/sha2.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
-#ifndef _SHA2_DEFINED
-
-#include "k5-int.h"
-
-#define _SHA2_DEFINED
-
-typedef krb5_octet      SHS_BYTE;
-#define SHA2_DIGESTSIZE  32
-
-/* The structure for storing SHA2 info */
-
-typedef struct {
-    void *nss_ctxt;
-    unsigned char   digestBuf[SHA2_DIGESTSIZE]; /* output */
-    unsigned int    digestLen; /* output */
-} SHA2_INFO;
-
-void sha2Init(SHA2_INFO *shsInfo);
-void sha2Update(SHA2_INFO *shsInfo, const SHS_BYTE *buffer, unsigned int count);
-void sha2Final(SHA2_INFO *shsInfo);
-
-#endif /* _SHA2_DEFINED */