1,2c1,2
< /* $FreeBSD: head/sys/crypto/des/des_locl.h 62587 2000-07-04 16:35:15Z itojun $ */
< /* $KAME: des_locl.h,v 1.4 2000/03/27 04:43:46 sumikawa Exp $ */
---
> /* $FreeBSD: head/sys/crypto/des/des_locl.h 78064 2001-06-11 12:39:29Z ume $ */
> /* $KAME: des_locl.h,v 1.6 2000/11/06 13:58:09 itojun Exp $ */
58,62d57
< #include <sys/param.h>
< #include <sys/malloc.h>
< #include <sys/mbuf.h>
< #include <sys/systm.h>
<
66,78d60
< #if defined(WIN32) || defined(WIN16)
< #ifndef MSDOS
< #define MSDOS
< #endif
< #endif
<
< /*
< #include <stdio.h>
< #include <stdlib.h>
< #ifndef MSDOS
< #include <unistd.h>
< #endif
< */
81,83d62
< /* the following is tweaked from a config script, that is why it is a
< * protected undef/define */
< #ifndef DES_PTR
85d63
< #endif
87,125d64
< #ifdef MSDOS /* Visual C++ 2.1 (Windows NT/95) */
< #include <stdlib.h>
< #include <errno.h>
< #include <time.h>
< #include <io.h>
< #ifndef RAND
< #define RAND
< #endif
< #undef NOPROTO
< #endif
<
< #if !defined(_KERNEL) && (defined(__STDC__) || defined(VMS) || defined(M_XENIX) || defined(MSDOS))
< #ifndef __NetBSD__
< #include <string.h>
< #endif
< #endif
<
< #ifdef __NetBSD__
< #include <sys/systm.h>
< #endif
<
< #ifndef RAND
< #define RAND
< #endif
<
< #ifdef linux
< #undef RAND
< #endif
<
< #ifdef MSDOS
< #define getpid() 2
< #define RAND
< #undef NOPROTO
< #endif
<
< #if defined(NOCONST)
< #define const
< #endif
<
130,134d68
< #ifdef RAND
< #define srandom(s) srand(s)
< #define random rand
< #endif
<
197,199d130
< #if defined(WIN32)
< #define ROTATE(a,n) (_lrotr(a,n))
< #else
201d131
< #endif
316,348d245
<
<
< /*
< #define mbuf2char(i_mbuf, i_index, in) \
< { \
< register int i; \
< struct mbuf *m; \
< char *buf; \
< m = i_mbuf; \
< for (i = 0; i < 8; i ++){ \
< if (i_index + i == m->m_len){ \
< m = m->m_next; \
< } \
< buf = mtod(m, char *); \
< in[i] = *(buf + i); \
< }
<
<
< #define char2mbuf(o_mbuf, o_index, out) \
< { \
< register int i; \
< struct mbuf *m; \
< char *buf; \
< m = o_mbuf; \
< for (i = 0; i < 8; i ++){ \
< if (i_index + i == m->m_len){ \
< m = m->m_next; \
< } \
< buf = mtod(m, char *); \
< *(buf + i) = out[i]; \
< }
< */
<