aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--contrib/telnet/libtelnet/enc_des.c4
-rw-r--r--contrib/telnet/libtelnet/encrypt.h3
-rw-r--r--contrib/telnet/libtelnet/kerberos.c4
-rw-r--r--contrib/telnet/libtelnet/krb4encpwd.c4
-rw-r--r--contrib/telnet/libtelnet/pk.c3
-rw-r--r--crypto/telnet/libtelnet/enc_des.c4
-rw-r--r--crypto/telnet/libtelnet/encrypt.h3
-rw-r--r--crypto/telnet/libtelnet/kerberos.c4
-rw-r--r--crypto/telnet/libtelnet/krb4encpwd.c4
-rw-r--r--crypto/telnet/libtelnet/pk.c3
10 files changed, 26 insertions, 10 deletions
diff --git a/contrib/telnet/libtelnet/enc_des.c b/contrib/telnet/libtelnet/enc_des.c
index 8e4b9a7f4b78..c0f669b59929 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 14be82697f5f..869ad751709a 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 738a57f35ce6..3b6155e593b4 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 cb9523c99205..3184a529ce0d 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 78e474ffed95..9af8915148a7 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)
diff --git a/crypto/telnet/libtelnet/enc_des.c b/crypto/telnet/libtelnet/enc_des.c
index 8e4b9a7f4b78..c0f669b59929 100644
--- a/crypto/telnet/libtelnet/enc_des.c
+++ b/crypto/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/crypto/telnet/libtelnet/encrypt.h b/crypto/telnet/libtelnet/encrypt.h
index 14be82697f5f..869ad751709a 100644
--- a/crypto/telnet/libtelnet/encrypt.h
+++ b/crypto/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/crypto/telnet/libtelnet/kerberos.c b/crypto/telnet/libtelnet/kerberos.c
index 738a57f35ce6..3b6155e593b4 100644
--- a/crypto/telnet/libtelnet/kerberos.c
+++ b/crypto/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/crypto/telnet/libtelnet/krb4encpwd.c b/crypto/telnet/libtelnet/krb4encpwd.c
index cb9523c99205..3184a529ce0d 100644
--- a/crypto/telnet/libtelnet/krb4encpwd.c
+++ b/crypto/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/crypto/telnet/libtelnet/pk.c b/crypto/telnet/libtelnet/pk.c
index 78e474ffed95..9af8915148a7 100644
--- a/crypto/telnet/libtelnet/pk.c
+++ b/crypto/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)