2c2
< /* $FreeBSD: head/contrib/telnet/libtelnet/pk.c 76711 2001-05-17 03:13:00Z peter $ */
---
> /* $FreeBSD: head/contrib/telnet/libtelnet/pk.c 81965 2001-08-20 12:28:40Z markm $ */
13d12
< #include <stdio.h>
15,16d13
< #include <string.h>
< #include <fcntl.h>
17a15,17
> #include <fcntl.h>
> #include <stdio.h>
> #include <string.h>
20c20
< #if defined(SOLARIS2) || defined(LINUX)
---
> #if defined(SOLARIS2) || defined(LINUX) || defined(__FreeBSD__)
23a24,25
> static void adjust(char keyout[HEXKEYBYTES+1], char *keyin);
>
27,30c29,30
< static
< extractideakey(ck, ideakey)
< MINT *ck;
< IdeaData *ideakey;
---
> static void
> extractideakey(MINT *ck, IdeaData *ideakey)
58,61c58,59
< static
< extractdeskey(ck, deskey)
< MINT *ck;
< DesData *deskey;
---
> static void
> extractdeskey(MINT *ck, DesData *deskey)
88c86,87
< void common_key(char *xsecret, char *xpublic, IdeaData *ideakey, DesData *deskey)
---
> void
> common_key(char *xsecret, char *xpublic, IdeaData *ideakey, DesData *deskey)
112d110
<
116,118c114,115
< void getseed(seed, seedsize)
< char *seed;
< int seedsize;
---
> void
> getseed(char *seed, int seedsize)
120,144d116
< #if 0
< int i,f;
< int rseed;
< struct timeval tv;
< long devrand;
<
< (void)gettimeofday(&tv, (struct timezone *)NULL);
< rseed = tv.tv_sec + tv.tv_usec;
< /* XXX What the hell is this?! */
< for (i = 0; i < 8; i++) {
< rseed ^= (rseed << 8);
< }
<
< f=open("/dev/random",O_NONBLOCK|O_RDONLY);
< if (f>=0)
< {
< read(f,&devrand,sizeof(devrand));
< close(f);
< }
< srand48((long)rseed^devrand);
<
< for (i = 0; i < seedsize; i++) {
< seed[i] = (lrand48() & 0xff);
< }
< #else
151d122
< #endif
154d124
<
158,160c128,129
< void genkeys(public, secret)
< char *public;
< char *secret;
---
> void
> genkeys(char *public, char *secret)
203,205c172,173
< adjust(keyout, keyin)
< char keyout[HEXKEYBYTES+1];
< char *keyin;
---
> static void
> adjust(char keyout[HEXKEYBYTES+1], char *keyin)
223,225c191,192
< void pk_encode(in, out, key)
< char *in,*out;
< DesData *key;
---
> void
> pk_encode(char *in, char *out, DesData *key)
245,247c212,213
< void pk_decode(in, out, key)
< char *in,*out;
< DesData *key;
---
> void
> pk_decode(char *in, char *out, DesData *key)