The includes must be <openssl/.*\.h>, not <ssl/.*\.h>.
This commit is contained in:
parent
b719e3c926
commit
18a711954e
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=57464
@ -13,6 +13,7 @@
|
||||
* based on RSA authentication. This file also contains functions to check
|
||||
* validity of the host key.
|
||||
*
|
||||
* $FreeBSD$
|
||||
*/
|
||||
|
||||
#include "includes.h"
|
||||
@ -26,8 +27,8 @@ RCSID("$Id: auth-rsa.c,v 1.18 2000/02/11 10:59:11 markus Exp $");
|
||||
#include "uidswap.h"
|
||||
#include "servconf.h"
|
||||
|
||||
#include <ssl/rsa.h>
|
||||
#include <ssl/md5.h>
|
||||
#include <openssl/rsa.h>
|
||||
#include <openssl/md5.h>
|
||||
|
||||
/* Flags that may be set in authorized_keys options. */
|
||||
extern int no_port_forwarding_flag;
|
||||
|
@ -11,6 +11,7 @@
|
||||
*
|
||||
* Functions for connecting the local authentication agent.
|
||||
*
|
||||
* $FreeBSD$
|
||||
*/
|
||||
|
||||
#include "includes.h"
|
||||
@ -24,7 +25,7 @@ RCSID("$Id: authfd.c,v 1.16 1999/12/15 19:43:10 markus Exp $");
|
||||
#include "xmalloc.h"
|
||||
#include "getput.h"
|
||||
|
||||
#include <ssl/rsa.h>
|
||||
#include <openssl/rsa.h>
|
||||
|
||||
/* Returns the number of the authentication fd, or -1 if there is none. */
|
||||
|
||||
|
@ -12,12 +12,13 @@
|
||||
* This file contains functions for reading and writing identity files, and
|
||||
* for reading the passphrase from the user.
|
||||
*
|
||||
* $FreeBSD$
|
||||
*/
|
||||
|
||||
#include "includes.h"
|
||||
RCSID("$Id: authfile.c,v 1.11 1999/12/06 19:11:15 deraadt Exp $");
|
||||
|
||||
#include <ssl/bn.h>
|
||||
#include <openssl/bn.h>
|
||||
#include "xmalloc.h"
|
||||
#include "buffer.h"
|
||||
#include "bufaux.h"
|
||||
|
@ -12,13 +12,14 @@
|
||||
* Auxiliary functions for storing and retrieving various data types to/from
|
||||
* Buffers.
|
||||
*
|
||||
* $FreeBSD$
|
||||
*/
|
||||
|
||||
#include "includes.h"
|
||||
RCSID("$Id: bufaux.c,v 1.7 1999/11/24 19:53:44 markus Exp $");
|
||||
|
||||
#include "ssh.h"
|
||||
#include <ssl/bn.h>
|
||||
#include <openssl/bn.h>
|
||||
#include "bufaux.h"
|
||||
#include "xmalloc.h"
|
||||
#include "getput.h"
|
||||
|
@ -9,6 +9,7 @@
|
||||
*
|
||||
* Created: Wed Apr 19 17:41:39 1995 ylo
|
||||
*
|
||||
* $FreeBSD$
|
||||
*/
|
||||
|
||||
#include "includes.h"
|
||||
@ -17,7 +18,7 @@ RCSID("$Id: cipher.c,v 1.19 2000/02/22 15:19:29 markus Exp $");
|
||||
#include "ssh.h"
|
||||
#include "cipher.h"
|
||||
|
||||
#include <ssl/md5.h>
|
||||
#include <openssl/md5.h>
|
||||
|
||||
/*
|
||||
* What kind of tripple DES are these 2 routines?
|
||||
|
@ -9,6 +9,7 @@
|
||||
*
|
||||
* Created: Wed Apr 19 16:50:42 1995 ylo
|
||||
*
|
||||
* $FreeBSD$
|
||||
*/
|
||||
|
||||
/* RCSID("$Id: cipher.h,v 1.10 1999/11/24 19:53:46 markus Exp $"); */
|
||||
@ -16,8 +17,8 @@
|
||||
#ifndef CIPHER_H
|
||||
#define CIPHER_H
|
||||
|
||||
#include <ssl/des.h>
|
||||
#include <ssl/blowfish.h>
|
||||
#include <openssl/des.h>
|
||||
#include <openssl/blowfish.h>
|
||||
|
||||
/* Cipher types. New types can be added, but old types should not be removed
|
||||
for compatibility. The maximum allowed value is 31. */
|
||||
|
@ -25,6 +25,8 @@
|
||||
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 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$
|
||||
*/
|
||||
|
||||
#include "includes.h"
|
||||
@ -32,7 +34,7 @@ RCSID("$Id: fingerprint.c,v 1.4 1999/11/24 16:15:25 markus Exp $");
|
||||
|
||||
#include "ssh.h"
|
||||
#include "xmalloc.h"
|
||||
#include <ssl/md5.h>
|
||||
#include <openssl/md5.h>
|
||||
|
||||
#define FPRINT "%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x"
|
||||
|
||||
|
@ -12,16 +12,17 @@
|
||||
* This file contains various auxiliary functions related to multiple
|
||||
* precision integers.
|
||||
*
|
||||
* $FreeBSD$
|
||||
*/
|
||||
|
||||
#include "includes.h"
|
||||
RCSID("$Id: mpaux.c,v 1.9 1999/12/08 22:37:42 markus Exp $");
|
||||
|
||||
#include <ssl/bn.h>
|
||||
#include <openssl/bn.h>
|
||||
#include "getput.h"
|
||||
#include "xmalloc.h"
|
||||
|
||||
#include <ssl/md5.h>
|
||||
#include <openssl/md5.h>
|
||||
|
||||
void
|
||||
compute_session_id(unsigned char session_id[16],
|
||||
|
@ -11,6 +11,7 @@
|
||||
*
|
||||
* Interface for the packet protocol functions.
|
||||
*
|
||||
* $FreeBSD$
|
||||
*/
|
||||
|
||||
/* RCSID("$Id: packet.h,v 1.9 2000/01/04 16:54:58 markus Exp $"); */
|
||||
@ -18,7 +19,7 @@
|
||||
#ifndef PACKET_H
|
||||
#define PACKET_H
|
||||
|
||||
#include <ssl/bn.h>
|
||||
#include <openssl/bn.h>
|
||||
|
||||
/*
|
||||
* Sets the socket used for communication. Disables encryption until
|
||||
|
@ -11,6 +11,7 @@
|
||||
*
|
||||
* RSA key generation, encryption and decryption.
|
||||
*
|
||||
* $FreeBSD$
|
||||
*/
|
||||
|
||||
/* RCSID("$Id: rsa.h,v 1.4 1999/11/24 19:53:50 markus Exp $"); */
|
||||
@ -18,8 +19,8 @@
|
||||
#ifndef RSA_H
|
||||
#define RSA_H
|
||||
|
||||
#include <ssl/bn.h>
|
||||
#include <ssl/rsa.h>
|
||||
#include <openssl/bn.h>
|
||||
#include <openssl/rsa.h>
|
||||
|
||||
/* Calls SSL RSA_generate_key, only copies to prv and pub */
|
||||
void rsa_generate_key(RSA * prv, RSA * pub, unsigned int bits);
|
||||
|
@ -6,6 +6,8 @@
|
||||
* All rights reserved
|
||||
* Created: Wed Mar 29 03:46:59 1995 ylo
|
||||
* The authentication agent program.
|
||||
*
|
||||
* $FreeBSD$
|
||||
*/
|
||||
|
||||
#include "includes.h"
|
||||
@ -21,7 +23,7 @@ RCSID("$OpenBSD: ssh-agent.c,v 1.25 2000/01/02 21:51:03 markus Exp $");
|
||||
#include "getput.h"
|
||||
#include "mpaux.h"
|
||||
|
||||
#include <ssl/md5.h>
|
||||
#include <openssl/md5.h>
|
||||
|
||||
typedef struct {
|
||||
int fd;
|
||||
|
@ -12,7 +12,7 @@
|
||||
#include "includes.h"
|
||||
RCSID("$OpenBSD: sshconnect.c,v 1.56 2000/02/18 08:50:33 markus Exp $");
|
||||
|
||||
#include <ssl/bn.h>
|
||||
#include <openssl/bn.h>
|
||||
#include "xmalloc.h"
|
||||
#include "rsa.h"
|
||||
#include "ssh.h"
|
||||
@ -25,7 +25,7 @@ RCSID("$OpenBSD: sshconnect.c,v 1.56 2000/02/18 08:50:33 markus Exp $");
|
||||
#include "readconf.h"
|
||||
#include "fingerprint.h"
|
||||
|
||||
#include <ssl/md5.h>
|
||||
#include <openssl/md5.h>
|
||||
|
||||
/* Session id for the current session. */
|
||||
unsigned char session_id[16];
|
||||
|
Loading…
Reference in New Issue
Block a user