summaryrefslogtreecommitdiffstats
path: root/src/lib/crypto/des
diff options
context:
space:
mode:
authorRichard Basch <probe@mit.edu>1997-02-06 02:31:41 +0000
committerRichard Basch <probe@mit.edu>1997-02-06 02:31:41 +0000
commita0b9ce4bee60136363cfff7a93c4e42eab972c02 (patch)
tree400984337fe3766653ff4cc2cb6b7d3d7f87f3f4 /src/lib/crypto/des
parenta9266b1dec31de9f33b0d032b885edd377a23ee5 (diff)
Windows/NT integration (V1_0_WIN32_BRANCH merge)
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@9788 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/crypto/des')
-rw-r--r--src/lib/crypto/des/ChangeLog9
-rw-r--r--src/lib/crypto/des/Makefile.in16
-rw-r--r--src/lib/crypto/des/cbc_cksum.c31
3 files changed, 39 insertions, 17 deletions
diff --git a/src/lib/crypto/des/ChangeLog b/src/lib/crypto/des/ChangeLog
index 6edc924c9..76ea95156 100644
--- a/src/lib/crypto/des/ChangeLog
+++ b/src/lib/crypto/des/ChangeLog
@@ -1,3 +1,12 @@
+Thu Jan 30 21:43:19 1997 Richard Basch <basch@lehman.com>
+
+ * cbc_cksum.c
+ Change functions to take const args where possible
+
+Thu Nov 21 00:58:04 EST 1996 Richard Basch <basch@lehman.com>
+
+ * Makefile.in: Win32 build
+
Sat Jun 15 03:51:19 1996 Ezra Peisach <epeisach@kangaroo.mit.edu>
* Makefile.in (clean): Add space before \
diff --git a/src/lib/crypto/des/Makefile.in b/src/lib/crypto/des/Makefile.in
index ad665617f..403cca650 100644
--- a/src/lib/crypto/des/Makefile.in
+++ b/src/lib/crypto/des/Makefile.in
@@ -1,7 +1,9 @@
CFLAGS = $(CCOPTS) $(DEFS)
##DOSBUILDTOP = ..\..\..
-##DOSLIBNAME=..\crypto.lib
+##DOSMYNAME=des
+##DOSOBJFILE=..\des.lst
+##WIN16##LIBNAME=..\crypto.lib
COMERRLIB=$(BUILDTOP)/util/et/libcom_err.$(LIBEXT)
@@ -62,11 +64,14 @@ SRCS= $(srcdir)/afsstring2key.c \
$(srcdir)/u_rn_key.c
-all:: $(OBJS)
+all-unix:: $(OBJS) shared
+all-mac:: $(OBJS) shared
+all-windows:: $(OBJFILE)
-all-unix:: shared
-all-mac:: shared
-all-windows::
+##DOS$(OBJFILE): $(OBJS)
+##DOS $(RM) $(OBJFILE)
+##WIN16## $(CP) nul: $(OBJFILE)
+##WIN32## $(LIBECHO) -p $(MYNAME)\ *.obj > $(OBJFILE)
shared:
mkdir shared
@@ -109,3 +114,4 @@ clean-unix::
clean-mac::
$(RM) shared/*
clean-windows::
+ $(RM) $(OBJFILE)
diff --git a/src/lib/crypto/des/cbc_cksum.c b/src/lib/crypto/des/cbc_cksum.c
index c4fb8c086..29a38a0a5 100644
--- a/src/lib/crypto/des/cbc_cksum.c
+++ b/src/lib/crypto/des/cbc_cksum.c
@@ -44,18 +44,25 @@
*/
static krb5_error_code mit_des_cbc_checksum
- PROTOTYPE((krb5_pointer, size_t,krb5_pointer,size_t, krb5_checksum FAR * ));
+ PROTOTYPE((krb5_const krb5_pointer,
+ krb5_const size_t,
+ krb5_const krb5_pointer,
+ krb5_const size_t,
+ krb5_checksum FAR * ));
static krb5_error_code mit_des_cbc_verf_cksum
- PROTOTYPE ((krb5_checksum FAR *, krb5_pointer, size_t, krb5_pointer,
- size_t ));
+ PROTOTYPE ((krb5_const krb5_checksum FAR *,
+ krb5_const krb5_pointer,
+ krb5_const size_t,
+ krb5_const krb5_pointer,
+ krb5_const size_t ));
static krb5_error_code
mit_des_cbc_checksum(in, in_length, key, key_size, cksum)
- krb5_pointer in;
- size_t in_length;
- krb5_pointer key;
- size_t key_size;
+ krb5_const krb5_pointer in;
+ krb5_const size_t in_length;
+ krb5_const krb5_pointer key;
+ krb5_const size_t key_size;
krb5_checksum FAR * cksum;
{
struct mit_des_ks_struct *schedule; /* pointer to key schedules */
@@ -95,11 +102,11 @@ mit_des_cbc_checksum(in, in_length, key, key_size, cksum)
static krb5_error_code
mit_des_cbc_verf_cksum(cksum, in, in_length, key, key_size)
- krb5_checksum FAR * cksum;
- krb5_pointer in;
- size_t in_length;
- krb5_pointer key;
- size_t key_size;
+ krb5_const krb5_checksum FAR * cksum;
+ krb5_const krb5_pointer in;
+ krb5_const size_t in_length;
+ krb5_const krb5_pointer key;
+ krb5_const size_t key_size;
{
struct mit_des_ks_struct *schedule; /* pointer to key schedules */
mit_des_cblock contents;