Assar Westerlund 6e3caa0833 fix conflicts from merge

2000-12-29 21:16:01 +00:00

..

auth-proto.h

Clean import of KTH krb4-0.10.1.

1999-09-19 14:19:32 +00:00

auth.c

Clean import of KTH krb4-0.10.1.

1999-09-19 14:19:32 +00:00

auth.h

Clean import of KTH krb4-0.10.1.

1999-09-19 14:19:32 +00:00

enc_des.c

Use libcrypto instead of libdes.

2000-02-24 20:21:16 +00:00

enc-proto.h

Clean import of KTH krb4-0.10.1.

1999-09-19 14:19:32 +00:00

encrypt.c

Clean import of KTH krb4-0.10.1.

1999-09-19 14:19:32 +00:00

encrypt.h

Clean import of KTH krb4-0.10.1.

1999-09-19 14:19:32 +00:00

genget.c

Clean import of KTH krb4-0.10.1.

1999-09-19 14:19:32 +00:00

kerberos5.c

import krb4-1.0.5

2000-12-29 21:00:22 +00:00

kerberos.c

fix conflicts from merge

2000-12-29 21:16:01 +00:00

krb4encpwd.c

fix conflicts from merge

2000-12-29 21:16:01 +00:00

Makefile.am

Clean import of KTH krb4-0.10.1.

1999-09-19 14:19:32 +00:00

Makefile.in

Clean import of KTH krb4-0.10.1.

1999-09-19 14:19:32 +00:00

misc-proto.h

Clean import of KTH krb4-0.10.1.

1999-09-19 14:19:32 +00:00

misc.c

Clean import of KTH krb4-0.10.1.

1999-09-19 14:19:32 +00:00

misc.h

Clean import of KTH krb4-0.10.1.

1999-09-19 14:19:32 +00:00

rsaencpwd.c

import krb4-1.0.5

2000-12-29 21:00:22 +00:00

spx.c

import krb4-1.0.5

2000-12-29 21:00:22 +00:00