Apple-2gs-SW/telnetd
1
0
Fork 0
mirror of https://github.com/sheumann/telnetd.git synced 2025-02-19 18:30:30 +00:00
Code Issues Projects Releases Wiki Activity

Get crypto from libcrypto, not libdes.

Browse Source 
git-svn-id: http://svn0.us-east.freebsd.org/base/head/contrib/telnet@57442 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
This commit is contained in:
markm 2000-02-24 19:28:31 +00:00
parent 811772a718
commit 2d4e3ed569
5 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libtelnet/enc_des.c
View File

@ -29,6 +29,8 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * 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 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
*
* $FreeBSD$
*/ */
#ifndef lint #ifndef lint
@ -44,7 +46,7 @@ static const char sccsid[] = "@(#)enc_des.c 8.3 (Berkeley) 5/30/95";
#include <stdlib.h> #include <stdlib.h>
#endif #endif
#include <des.h> #include <openssl/des.h>
#include <string.h> #include <string.h>
#include "encrypt.h" #include "encrypt.h"
#include "key-proto.h" #include "key-proto.h"

3
libtelnet/encrypt.h
View File

@ -31,6 +31,7 @@
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* @(#)encrypt.h 8.1 (Berkeley) 6/4/93 * @(#)encrypt.h 8.1 (Berkeley) 6/4/93
* $FreeBSD$
*/ */
/* /*
@ -60,7 +61,7 @@
#define DIR_DECRYPT 1 #define DIR_DECRYPT 1
#define DIR_ENCRYPT 2 #define DIR_ENCRYPT 2
#include <des.h> #include <openssl/des.h>
typedef unsigned char Block[8]; typedef unsigned char Block[8];
typedef unsigned char *BlockT; typedef unsigned char *BlockT;
#if 0 #if 0

4
libtelnet/kerberos.c
View File

@ -29,6 +29,8 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * 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 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
*
* $FreeBSD$
*/ */
#ifndef lint #ifndef lint
@ -59,7 +61,7 @@ static const char sccsid[] = "@(#)kerberos.c 8.3 (Berkeley) 5/30/95";
#include <sys/types.h> #include <sys/types.h>
#include <arpa/telnet.h> #include <arpa/telnet.h>
#include <stdio.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> #include <krb.h>
#ifdef __STDC__ #ifdef __STDC__
#include <stdlib.h> #include <stdlib.h>

4
libtelnet/krb4encpwd.c
View File

@ -29,6 +29,8 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * 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 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
*
* $FreeBSD$
*/ */
#ifndef lint #ifndef lint
@ -75,7 +77,7 @@ static char sccsid[] = "@(#)krb4encpwd.c 8.3 (Berkeley) 5/30/95";
#include <pwd.h> #include <pwd.h>
#include <stdio.h> #include <stdio.h>
#include <des.h> #include <openssl/des.h>
#include <krb.h> #include <krb.h>
#ifdef __STDC__ #ifdef __STDC__
#include <stdlib.h> #include <stdlib.h>

3
libtelnet/pk.c
View File

@ -1,4 +1,5 @@
/* public key routines */ /* public key routines */
/* $FreeBSD$ */
/* functions: /* functions:
genkeys(char *public, char *secret) genkeys(char *public, char *secret)
common_key(char *secret, char *public, desData *deskey) common_key(char *secret, char *public, desData *deskey)
@ -13,7 +14,7 @@
#include <sys/time.h> #include <sys/time.h>
#include <string.h> #include <string.h>
#include <fcntl.h> #include <fcntl.h>
#include <des.h> #include <openssl/des.h>
#include "mp.h" #include "mp.h"
#include "pk.h" #include "pk.h"
#if defined(SOLARIS2) || defined(LINUX) #if defined(SOLARIS2) || defined(LINUX)