diff options
| author | markm <markm@FreeBSD.org> | 1996-02-10 15:54:48 +0000 |
|---|---|---|
| committer | markm <markm@FreeBSD.org> | 1996-02-10 15:54:48 +0000 |
| commit | 1f82e254e37337f4d2dc6f24b3b76ec4bf3c6b51 (patch) | |
| tree | 3127c6cefed91f04bbed8a20377e9b8634f093d6 /secure | |
| parent | 654d7208400d25aabc0fc7b11afc12a7e70422f5 (diff) | |
| download | FreeBSD-src-1f82e254e37337f4d2dc6f24b3b76ec4bf3c6b51.zip FreeBSD-src-1f82e254e37337f4d2dc6f24b3b76ec4bf3c6b51.tar.gz | |
iImport a FreeBSD Makefile, BSD-ise the header and correct a typo. As the
interface has changed a bit (there are more rentry points), the
shared library has been bumped to libdes.so.2.1.
Diffstat (limited to 'secure')
| -rw-r--r-- | secure/lib/libdes/des.h | 16 | ||||
| -rw-r--r-- | secure/lib/libdes/new_rkey.c | 4 |
2 files changed, 7 insertions, 13 deletions
diff --git a/secure/lib/libdes/des.h b/secure/lib/libdes/des.h index 87e68a6..80b293b 100644 --- a/secure/lib/libdes/des.h +++ b/secure/lib/libdes/des.h @@ -51,17 +51,7 @@ #include <stdio.h> typedef unsigned char des_cblock[8]; -typedef struct des_ks_struct - { - union { - des_cblock _; - /* make sure things are correct size on machines with - * 8 byte longs */ - unsigned long pad[2]; - } ks; -#undef _ -#define _ ks._ - } des_key_schedule[16]; +typedef struct des_ks_struct { des_cblock _; } des_key_schedule[16]; #define DES_KEY_SZ (sizeof(des_cblock)) #define DES_SCHEDULE_SZ (sizeof(des_key_schedule)) @@ -148,6 +138,7 @@ int des_enc_read(int fd,char *buf,int len,des_key_schedule sched, des_cblock *iv); int des_enc_write(int fd,char *buf,int len,des_key_schedule sched, des_cblock *iv); +#if 0 #ifdef PERL5 char *des_crypt(const char *buf,const char *salt); #else @@ -159,6 +150,7 @@ char *crypt(const char *buf,const char *salt); char *crypt(); #endif #endif +#endif void des_ofb_encrypt(unsigned char *in,unsigned char *out, int numbits,long length,des_key_schedule schedule,des_cblock *ivec); void des_pcbc_encrypt(des_cblock *input,des_cblock *output,long length, @@ -209,11 +201,13 @@ void des_encrypt2(); void des_ede3_cbc_encrypt(); int des_enc_read(); int des_enc_write(); +#if 0 #ifdef PERL5 char *des_crypt(); #else char *crypt(); #endif +#endif void des_ofb_encrypt(); void des_pcbc_encrypt(); unsigned long des_quad_cksum(); diff --git a/secure/lib/libdes/new_rkey.c b/secure/lib/libdes/new_rkey.c index 65aa056..c6b856c 100644 --- a/secure/lib/libdes/new_rkey.c +++ b/secure/lib/libdes/new_rkey.c @@ -77,14 +77,14 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: new_rnd_key.c,v 1.1 1995/09/16 21:01:51 mark Exp $ + * $Id: new_rkey.c,v 1.1.1.1 1996/02/10 15:32:24 markm Exp $ */ /* 21-Nov-95 - eay - I've finally put this into libdes, I have made a * few changes since it need to compile on all version of unix and * there were a few things that would not :-) */ -#incldue <stdio.h> +#include <stdio.h> #include <unistd.h> #include <sys/time.h> #include <sys/param.h> |
