diff options
author | markm <markm@FreeBSD.org> | 2000-02-24 19:28:31 +0000 |
---|---|---|
committer | markm <markm@FreeBSD.org> | 2000-02-24 19:28:31 +0000 |
commit | 2cbf93e2b4f618912104456777d6a9335a25ee6a (patch) | |
tree | 7cc8acf64b3850848462ec68d52ce2ecc28c6999 /contrib/telnet/libtelnet | |
parent | a2e9fa03c1cb7574c2bcf396e49a8f8cfaac29b6 (diff) | |
download | FreeBSD-src-2cbf93e2b4f618912104456777d6a9335a25ee6a.zip FreeBSD-src-2cbf93e2b4f618912104456777d6a9335a25ee6a.tar.gz |
Get crypto from libcrypto, not libdes.
Diffstat (limited to 'contrib/telnet/libtelnet')
-rw-r--r-- | contrib/telnet/libtelnet/enc_des.c | 4 | ||||
-rw-r--r-- | contrib/telnet/libtelnet/encrypt.h | 3 | ||||
-rw-r--r-- | contrib/telnet/libtelnet/kerberos.c | 4 | ||||
-rw-r--r-- | contrib/telnet/libtelnet/krb4encpwd.c | 4 | ||||
-rw-r--r-- | contrib/telnet/libtelnet/pk.c | 3 |
5 files changed, 13 insertions, 5 deletions
diff --git a/contrib/telnet/libtelnet/enc_des.c b/contrib/telnet/libtelnet/enc_des.c index 8e4b9a7..c0f669b 100644 --- a/contrib/telnet/libtelnet/enc_des.c +++ b/contrib/telnet/libtelnet/enc_des.c @@ -29,6 +29,8 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. + * + * $FreeBSD$ */ #ifndef lint @@ -44,7 +46,7 @@ static const char sccsid[] = "@(#)enc_des.c 8.3 (Berkeley) 5/30/95"; #include <stdlib.h> #endif -#include <des.h> +#include <openssl/des.h> #include <string.h> #include "encrypt.h" #include "key-proto.h" diff --git a/contrib/telnet/libtelnet/encrypt.h b/contrib/telnet/libtelnet/encrypt.h index 14be826..869ad75 100644 --- a/contrib/telnet/libtelnet/encrypt.h +++ b/contrib/telnet/libtelnet/encrypt.h @@ -31,6 +31,7 @@ * SUCH DAMAGE. * * @(#)encrypt.h 8.1 (Berkeley) 6/4/93 + * $FreeBSD$ */ /* @@ -60,7 +61,7 @@ #define DIR_DECRYPT 1 #define DIR_ENCRYPT 2 -#include <des.h> +#include <openssl/des.h> typedef unsigned char Block[8]; typedef unsigned char *BlockT; #if 0 diff --git a/contrib/telnet/libtelnet/kerberos.c b/contrib/telnet/libtelnet/kerberos.c index 738a57f..3b6155e 100644 --- a/contrib/telnet/libtelnet/kerberos.c +++ b/contrib/telnet/libtelnet/kerberos.c @@ -29,6 +29,8 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. + * + * $FreeBSD$ */ #ifndef lint @@ -59,7 +61,7 @@ static const char sccsid[] = "@(#)kerberos.c 8.3 (Berkeley) 5/30/95"; #include <sys/types.h> #include <arpa/telnet.h> #include <stdio.h> -#include <des.h> /* BSD wont include this in krb.h, so we do it here */ +#include <openssl/des.h> /* BSD wont include this in krb.h, so we do it here */ #include <krb.h> #ifdef __STDC__ #include <stdlib.h> diff --git a/contrib/telnet/libtelnet/krb4encpwd.c b/contrib/telnet/libtelnet/krb4encpwd.c index cb9523c..3184a52 100644 --- a/contrib/telnet/libtelnet/krb4encpwd.c +++ b/contrib/telnet/libtelnet/krb4encpwd.c @@ -29,6 +29,8 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. + * + * $FreeBSD$ */ #ifndef lint @@ -75,7 +77,7 @@ static char sccsid[] = "@(#)krb4encpwd.c 8.3 (Berkeley) 5/30/95"; #include <pwd.h> #include <stdio.h> -#include <des.h> +#include <openssl/des.h> #include <krb.h> #ifdef __STDC__ #include <stdlib.h> diff --git a/contrib/telnet/libtelnet/pk.c b/contrib/telnet/libtelnet/pk.c index 78e474f..9af8915 100644 --- a/contrib/telnet/libtelnet/pk.c +++ b/contrib/telnet/libtelnet/pk.c @@ -1,4 +1,5 @@ /* public key routines */ +/* $FreeBSD$ */ /* functions: genkeys(char *public, char *secret) common_key(char *secret, char *public, desData *deskey) @@ -13,7 +14,7 @@ #include <sys/time.h> #include <string.h> #include <fcntl.h> -#include <des.h> +#include <openssl/des.h> #include "mp.h" #include "pk.h" #if defined(SOLARIS2) || defined(LINUX) |