diff options
| author | Theodore Tso <tytso@mit.edu> | 1995-09-23 00:29:09 +0000 |
|---|---|---|
| committer | Theodore Tso <tytso@mit.edu> | 1995-09-23 00:29:09 +0000 |
| commit | 9608ba2fac7310a100ddb6935b86c1931ae440da (patch) | |
| tree | 9654908a6aaa650f8a175add7ea6e4a4e0baa406 /src | |
| parent | 972c8c674140ed2361ecfaf45250b0d3f7156fc9 (diff) | |
| download | krb5-9608ba2fac7310a100ddb6935b86c1931ae440da.tar.gz krb5-9608ba2fac7310a100ddb6935b86c1931ae440da.tar.xz krb5-9608ba2fac7310a100ddb6935b86c1931ae440da.zip | |
Makefile.in: moved shared rule to all-unix:: target
des_crc.c, des_md5.c, raw_des.c: had a volatile/const mismatch
which needs a cast to resolve.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6822 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/crypto/ChangeLog | 6 | ||||
| -rw-r--r-- | src/lib/crypto/Makefile.in | 4 | ||||
| -rw-r--r-- | src/lib/crypto/des_crc.c | 2 | ||||
| -rw-r--r-- | src/lib/crypto/des_md5.c | 2 | ||||
| -rw-r--r-- | src/lib/crypto/raw_des.c | 2 |
5 files changed, 12 insertions, 4 deletions
diff --git a/src/lib/crypto/ChangeLog b/src/lib/crypto/ChangeLog index 55adaf2d5..bb48c01d5 100644 --- a/src/lib/crypto/ChangeLog +++ b/src/lib/crypto/ChangeLog @@ -1,3 +1,9 @@ +Wed Sep 13 10:26:37 1995 Keith Vetter (keithv@fusion.com) + + * Makefile.in: moved shared rule to all-unix:: target. + * des_crc.c, des_md5.c, raw_des.c: had a volatile/const mismatch + which needs a cast to resolve. + Wed Sep 06 14:20:57 1995 Chris Provenzano (proven@mit.edu) * cryptoconf.c, des_crc.c, des_md5.c raw_des.c diff --git a/src/lib/crypto/Makefile.in b/src/lib/crypto/Makefile.in index 1fcb041d4..13e38e32b 100644 --- a/src/lib/crypto/Makefile.in +++ b/src/lib/crypto/Makefile.in @@ -31,7 +31,9 @@ SHLIB_LIBS= SHLIB_LDFLAGS= $(LDFLAGS) @SHLIB_RPATH_DIRS@ SHLIB_LIBDIRS= @SHLIB_LIBDIRS@ -all:: shared +all:: all-$(WHAT) + +all-unix:: shared shared: mkdir shared diff --git a/src/lib/crypto/des_crc.c b/src/lib/crypto/des_crc.c index 02dfb34cb..80bda0c65 100644 --- a/src/lib/crypto/des_crc.c +++ b/src/lib/crypto/des_crc.c @@ -139,7 +139,7 @@ mit_des_crc_decrypt_func(in, out, size, key, ivec) if ( size < 2*sizeof(mit_des_cblock) ) return KRB5_BAD_MSIZE; - retval = mit_des_cbc_encrypt(in, + retval = mit_des_cbc_encrypt((mit_des_cblock FAR *) in, out, size, (struct mit_des_ks_struct *) key->priv, diff --git a/src/lib/crypto/des_md5.c b/src/lib/crypto/des_md5.c index d365c2b6c..3ae64d7bc 100644 --- a/src/lib/crypto/des_md5.c +++ b/src/lib/crypto/des_md5.c @@ -140,7 +140,7 @@ mit_des_md5_decrypt_func(in, out, size, key, ivec) if ( size < 2*sizeof(mit_des_cblock) ) return KRB5_BAD_MSIZE; - retval = mit_des_cbc_encrypt(in, + retval = mit_des_cbc_encrypt((const mit_des_cblock *) in, out, size, (struct mit_des_ks_struct *) key->priv, diff --git a/src/lib/crypto/raw_des.c b/src/lib/crypto/raw_des.c index 7948ba601..65e0ebdbb 100644 --- a/src/lib/crypto/raw_des.c +++ b/src/lib/crypto/raw_des.c @@ -62,7 +62,7 @@ mit_raw_des_decrypt_func(in, out, size, key, ivec) krb5_encrypt_block * key; krb5_pointer ivec; { - return (mit_des_cbc_encrypt (in, + return (mit_des_cbc_encrypt ((const mit_des_cblock *) in, out, size, (struct mit_des_ks_struct *)key->priv, |