mirrors/openssh
0
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2024-11-27 05:46:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

- Reduce diff against OpenBSD source

Browse Source 
- All OpenSSL includes are now unconditionally referenced as
     openssl/foo.h
   - Pick up formatting changes
   - Other minor changed (typecasts, etc) that I missed
This commit is contained in:
Damien Miller 2000-04-16 12:31:48 +10:00
parent a664e870f2
commit 5f05637b0e
29 changed files with 65 additions and 232 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
20000416
- Reduce diff against OpenBSD source
- All OpenSSL includes are now unconditionally referenced as
openssl/foo.h
- Pick up formatting changes
- Other minor changed (typecasts, etc) that I missed
20000415
- OpenBSD CVS updates.
[ssh.1 ssh.c]

3
acconfig.h
View File

@ -30,9 +30,6 @@
/* Define if you want to install preformatted manpages.*/
#undef MANTYPE
/* Define if your ssl headers are included with #include <ssl/header.h> */
#undef HAVE_SSL
/* Define if your ssl headers are included with #include <openssl/header.h> */
#undef HAVE_OPENSSL

4
atomicio.c
View File

@ -24,7 +24,7 @@
*/
#include "includes.h"
RCSID("$Id: atomicio.c,v 1.10 2000/03/17 12:40:15 damien Exp $");
RCSID("$Id: atomicio.c,v 1.11 2000/04/16 02:31:49 damien Exp $");
#include "xmalloc.h"
#include "ssh.h"
@ -43,7 +43,7 @@ atomicio(f, fd, _s, n)
ssize_t res, pos = 0;
while (n > pos) {
res = (f) (fd, (char*)s + pos, n - pos);
res = (f) (fd, s + pos, n - pos);
switch (res) {
case -1:
if (errno == EINTR || errno == EAGAIN)

2
auth-passwd.c
View File

@ -11,7 +11,7 @@
#ifndef USE_PAM
RCSID("$Id: auth-passwd.c,v 1.17 2000/04/16 01:18:39 damien Exp $");
RCSID("$Id: auth-passwd.c,v 1.18 2000/04/16 02:31:49 damien Exp $");
#include "packet.h"
#include "ssh.h"

15
auth-rh-rsa.c
View File

@ -15,18 +15,7 @@
*/
#include "includes.h"
RCSID("$Id: auth-rh-rsa.c,v 1.10 2000/04/16 01:18:39 damien Exp $");
#ifdef HAVE_OPENSSL
#include <openssl/bn.h>
#include <openssl/rsa.h>
#include <openssl/dsa.h>
#endif
#ifdef HAVE_SSL
#include <ssl/bn.h>
#include <ssl/rsa.h>
#include <ssl/dsa.h>
#endif
RCSID("$Id: auth-rh-rsa.c,v 1.11 2000/04/16 02:31:49 damien Exp $");
#include "packet.h"
#include "ssh.h"
@ -34,6 +23,8 @@ RCSID("$Id: auth-rh-rsa.c,v 1.10 2000/04/16 01:18:39 damien Exp $");
#include "uidswap.h"
#include "servconf.h"
#include <openssl/rsa.h>
#include <openssl/dsa.h>
#include "key.h"
#include "hostfile.h"

8
auth-rsa.c
View File

@ -16,7 +16,7 @@
*/
#include "includes.h"
RCSID("$Id: auth-rsa.c,v 1.16 2000/04/16 01:18:39 damien Exp $");
RCSID("$Id: auth-rsa.c,v 1.17 2000/04/16 02:31:49 damien Exp $");
#include "rsa.h"
#include "packet.h"
@ -27,14 +27,8 @@ RCSID("$Id: auth-rsa.c,v 1.16 2000/04/16 01:18:39 damien Exp $");
#include "match.h"
#include "servconf.h"
#ifdef HAVE_OPENSSL
#include <openssl/rsa.h>
#include <openssl/md5.h>
#endif
#ifdef HAVE_SSL
#include <ssl/rsa.h>
#include <ssl/md5.h>
#endif
/* Flags that may be set in authorized_keys options. */
extern int no_port_forwarding_flag;

9
auth-skey.c
View File

@ -1,17 +1,10 @@
#include "includes.h"
#ifdef SKEY
RCSID("$Id: auth-skey.c,v 1.6 2000/04/14 10:30:29 markus Exp $");
#include "ssh.h"
#include "packet.h"
#ifdef HAVE_OPENSSL
#include <openssl/sha.h>
#endif
#ifdef HAVE_SSL
#include <ssl/sha.h>
#endif
#include <sha1.h>
/* from %OpenBSD: skeylogin.c,v 1.32 1999/08/16 14:46:56 millert Exp % */

7
authfd.c
View File

@ -14,7 +14,7 @@
*/
#include "includes.h"
RCSID("$Id: authfd.c,v 1.12 2000/04/16 01:18:40 damien Exp $");
RCSID("$Id: authfd.c,v 1.13 2000/04/16 02:31:49 damien Exp $");
#include "ssh.h"
#include "rsa.h"
@ -24,12 +24,7 @@ RCSID("$Id: authfd.c,v 1.12 2000/04/16 01:18:40 damien Exp $");
#include "xmalloc.h"
#include "getput.h"
#ifdef HAVE_OPENSSL
#include <openssl/rsa.h>
#endif
#ifdef HAVE_SSL
#include <ssl/rsa.h>
#endif
/* Returns the number of the authentication fd, or -1 if there is none. */

8
authfile.c
View File

@ -15,15 +15,9 @@
*/
#include "includes.h"
RCSID("$Id: authfile.c,v 1.10 2000/04/16 01:18:40 damien Exp $");
RCSID("$Id: authfile.c,v 1.11 2000/04/16 02:31:49 damien Exp $");
#ifdef HAVE_OPENSSL
#include <openssl/bn.h>
#endif
#ifdef HAVE_SSL
#include <ssl/bn.h>
#endif
#include "xmalloc.h"
#include "buffer.h"
#include "bufaux.h"

21
bufaux.c
View File

@ -17,17 +17,10 @@
*/
#include "includes.h"
RCSID("$Id: bufaux.c,v 1.11 2000/04/16 01:18:40 damien Exp $");
RCSID("$Id: bufaux.c,v 1.12 2000/04/16 02:31:50 damien Exp $");
#include "ssh.h"
#ifdef HAVE_OPENSSL
#include <openssl/bn.h>
#endif
#ifdef HAVE_SSL
#include <ssl/bn.h>
#endif
#include "bufaux.h"
#include "xmalloc.h"
#include "getput.h"
@ -131,7 +124,7 @@ buffer_get_bignum2(Buffer *buffer, BIGNUM *value)
/*
* Returns an integer from the buffer (4 bytes, msb first).
*/
unsigned int
unsigned int
buffer_get_int(Buffer *buffer)
{
unsigned char buf[4];
@ -142,7 +135,7 @@ buffer_get_int(Buffer *buffer)
/*
* Stores an integer in the buffer in 4 bytes, msb first.
*/
void
void
buffer_put_int(Buffer *buffer, unsigned int value)
{
char buf[4];
@ -182,13 +175,13 @@ buffer_get_string(Buffer *buffer, unsigned int *length_ptr)
/*
* Stores and arbitrary binary string in the buffer.
*/
void
void
buffer_put_string(Buffer *buffer, const void *buf, unsigned int len)
{
buffer_put_int(buffer, len);
buffer_append(buffer, buf, len);
}
void
void
buffer_put_cstring(Buffer *buffer, const char *s)
{
buffer_put_string(buffer, s, strlen(s));
@ -197,7 +190,7 @@ buffer_put_cstring(Buffer *buffer, const char *s)
/*
* Returns a character from the buffer (0 - 255).
*/
int
int
buffer_get_char(Buffer *buffer)
{
char ch;
@ -208,7 +201,7 @@ buffer_get_char(Buffer *buffer)
/*
* Stores a character in the buffer.
*/
void
void
buffer_put_char(Buffer *buffer, int value)
{
char ch = value;

14
buffer.h
View File

@ -1,19 +1,19 @@
/*
*
*
* buffer.h
*
*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
*
*
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
* All rights reserved
*
*
* Created: Sat Mar 18 04:12:25 1995 ylo
*
*
* Code for manipulating FIFO buffers.
*
*
*/
/* RCSID("$Id: buffer.h,v 1.3 1999/11/25 00:54:58 damien Exp $"); */
/* RCSID("$Id: buffer.h,v 1.4 2000/04/16 02:31:50 damien Exp $"); */
#ifndef BUFFER_H
#define BUFFER_H

7
cipher.c
View File

@ -12,18 +12,13 @@
*/
#include "includes.h"
RCSID("$Id: cipher.c,v 1.19 2000/04/16 01:18:41 damien Exp $");
RCSID("$Id: cipher.c,v 1.20 2000/04/16 02:31:50 damien Exp $");
#include "ssh.h"
#include "cipher.h"
#include "xmalloc.h"
#ifdef HAVE_OPENSSL
#include <openssl/md5.h>
#endif
#ifdef HAVE_SSL
#include <ssl/md5.h>
#endif
/*
* This is used by SSH1:

12
cipher.h
View File

@ -11,25 +11,15 @@
*
*/
/* RCSID("$Id: cipher.h,v 1.11 2000/04/16 01:18:41 damien Exp $"); */
/* RCSID("$Id: cipher.h,v 1.12 2000/04/16 02:31:50 damien Exp $"); */
#ifndef CIPHER_H
#define CIPHER_H
#include "config.h"
#ifdef HAVE_OPENSSL
#include <openssl/des.h>
#include <openssl/blowfish.h>
#include <openssl/rc4.h>
#include <openssl/cast.h>
#endif
#ifdef HAVE_SSL
#include <ssl/des.h>
#include <ssl/blowfish.h>
#include <ssl/rc4.h>
#include <ssl/cast.h>
#endif
/* Cipher types. New types can be added, but old types should not be removed
for compatibility. The maximum allowed value is 31. */

21
configure.in
View File

@ -213,27 +213,6 @@ for ssldir in "" $tryssldir /usr/local/openssl /usr/lib/openssl /usr/local/ssl /
break;
], []
)
AC_TRY_RUN(
[
#include <ssl/rsa.h>
#include <ssl/bn.h>
#include <ssl/sha.h>
int main(void)
{
RSA *key; char a[2048],b[2048];;
memset(a, 0, sizeof(a));memset(b, 0, sizeof(b));
RAND_seed(a, sizeof(a));
key=RSA_generate_key(32,3,NULL,NULL);
if (key==NULL) return(1);
return(-1==RSA_private_decrypt(RSA_size(key),a,b,key,RSA_NO_PADDING));
}
],
[
AC_DEFINE(HAVE_SSL)
found_crypto=1
break;
], []
)
done
if test ! -z "$found_crypto" ; then

12
entropy.c
View File

@ -32,16 +32,10 @@
#include "ssh.h"
#include "xmalloc.h"
#ifdef HAVE_OPENSSL
# include <openssl/rand.h>
# include <openssl/sha.h>
#endif
#ifdef HAVE_SSL
# include <ssl/rand.h>
# include <ssl/sha.h>
#endif
#include <openssl/rand.h>
#include <openssl/sha.h>
RCSID("$Id: entropy.c,v 1.4 2000/04/08 07:48:56 damien Exp $");
RCSID("$Id: entropy.c,v 1.5 2000/04/16 02:31:50 damien Exp $");
#ifdef EGD_SOCKET
#ifndef offsetof

7
fingerprint.c
View File

@ -28,16 +28,11 @@
*/
#include "includes.h"
RCSID("$Id: fingerprint.c,v 1.5 2000/03/16 20:56:14 markus Exp $");
RCSID("$Id: fingerprint.c,v 1.6 2000/04/12 09:39:10 markus Exp $");
#include "ssh.h"
#include "xmalloc.h"
#ifdef HAVE_OPENSSL
#include <openssl/md5.h>
#endif
#ifdef HAVE_SSL
#include <ssl/md5.h>
#endif
#define FPRINT "%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x"

13
hostfile.c
View File

@ -16,20 +16,11 @@
#include "includes.h"
RCSID("$OpenBSD: hostfile.c,v 1.16 2000/04/14 10:30:31 markus Exp $");
#ifdef HAVE_OPENSSL
#include <openssl/bn.h>
#include <openssl/rsa.h>
#include <openssl/dsa.h>
#endif
#ifdef HAVE_SSL
#include <ssl/bn.h>
#include <ssl/rsa.h>
#include <ssl/dsa.h>
#endif
#include "packet.h"
#include "match.h"
#include "ssh.h"
#include <openssl/rsa.h>
#include <openssl/dsa.h>
#include "key.h"
#include "hostfile.h"

3
includes.h
View File

@ -108,6 +108,9 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg }
#include "fake-getnameinfo.h"
#include "fake-socket.h"
/* Entropy collection */
#include "entropy.h"
/* Define this to be the path of the xauth program. */
#ifndef XAUTH_PATH
#define XAUTH_PATH "/usr/X11R6/bin/xauth"

11
kex.h
View File

@ -29,17 +29,6 @@
#ifndef KEX_H
#define KEX_H
#include "config.h"
#ifdef HAVE_OPENSSL
# include <openssl/bn.h>
# include <openssl/evp.h>
#endif
#ifdef HAVE_SSL
# include <ssl/bn.h>
# include <ssl/evp.h>
#endif
#define KEX_DH1 "diffie-hellman-group1-sha1"
#define KEX_DSS "ssh-dss"

13
key.c
View File

@ -32,21 +32,10 @@
*/
#include "includes.h"
#ifdef HAVE_OPENSSL
#include <openssl/bn.h>
#include "ssh.h"
#include <openssl/rsa.h>
#include <openssl/dsa.h>
#include <openssl/evp.h>
#endif
#ifdef HAVE_SSL
#include <ssl/bn.h>
#include <ssl/rsa.h>
#include <ssl/dsa.h>
#include <ssl/evp.h>
#endif
#include "ssh.h"
#include "xmalloc.h"
#include "key.h"

7
md5crypt.c
View File

@ -21,14 +21,7 @@
#include <unistd.h>
#include <string.h>
#ifdef HAVE_OPENSSL
#include <openssl/md5.h>
#endif
#ifdef HAVE_SSL
#include <ssl/md5.h>
#endif
static unsigned char itoa64[] = /* 0 ... 63 => ascii - 64 */
"./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";

10
mpaux.c
View File

@ -15,19 +15,13 @@
*/
#include "includes.h"
RCSID("$Id: mpaux.c,v 1.11 2000/04/16 01:18:43 damien Exp $");
RCSID("$Id: mpaux.c,v 1.12 2000/04/16 02:31:51 damien Exp $");
#include <openssl/bn.h>
#include "getput.h"
#include "xmalloc.h"
#ifdef HAVE_OPENSSL
#include <openssl/bn.h>
#include <openssl/md5.h>
#endif
#ifdef HAVE_SSL
#include <ssl/bn.h>
#include <ssl/md5.h>
#endif
void
compute_session_id(unsigned char session_id[16],

16
packet.c
View File

@ -17,18 +17,7 @@
*/
#include "includes.h"
RCSID("$Id: packet.c,v 1.18 2000/04/16 01:18:43 damien Exp $");
#ifdef HAVE_OPENSSL
# include <openssl/bn.h>
# include <openssl/dh.h>
# include <openssl/hmac.h>
#endif /* HAVE_OPENSSL */
#ifdef HAVE_SSL
# include <ssl/bn.h>
# include <ssl/dh.h>
# include <ssl/hmac.h>
#endif /* HAVE_SSL */
RCSID("$Id: packet.c,v 1.19 2000/04/16 02:31:51 damien Exp $");
#include "xmalloc.h"
#include "buffer.h"
@ -46,6 +35,9 @@ RCSID("$Id: packet.c,v 1.18 2000/04/16 01:18:43 damien Exp $");
#include "compat.h"
#include "ssh2.h"
#include <openssl/bn.h>
#include <openssl/dh.h>
#include <openssl/hmac.h>
#include "buffer.h"
#include "kex.h"
#include "hmac.h"

7
packet.h
View File

@ -13,17 +13,12 @@
*
*/
/* RCSID("$Id: packet.h,v 1.14 2000/04/16 01:18:44 damien Exp $"); */
/* RCSID("$Id: packet.h,v 1.15 2000/04/16 02:31:51 damien Exp $"); */
#ifndef PACKET_H
#define PACKET_H
#ifdef HAVE_OPENSSL
#include <openssl/bn.h>
#endif
#ifdef HAVE_SSL
#include <ssl/bn.h>
#endif
/*
* Sets the socket used for communication. Disables encryption until

13
rsa.h
View File

@ -13,24 +13,13 @@
*
*/
/* RCSID("$Id: rsa.h,v 1.8 2000/04/16 01:18:45 damien Exp $"); */
/* RCSID("$Id: rsa.h,v 1.9 2000/04/16 02:31:51 damien Exp $"); */
#ifndef RSA_H
#define RSA_H
#include "config.h"
#ifdef HAVE_OPENSSL
#include <openssl/bn.h>
#include <openssl/rsa.h>
#include <openssl/rand.h>
#endif
#ifdef HAVE_SSL
#include <ssl/bn.h>
#include <ssl/rsa.h>
#include <ssl/rand.h>
#endif
/* Calls SSL RSA_generate_key, only copies to prv and pub */
void rsa_generate_key(RSA * prv, RSA * pub, unsigned int bits);

6
session.c
View File

@ -1247,6 +1247,8 @@ session_pty_req(Session *s)
/* Get window size from the packet. */
pty_change_window_size(s->ptyfd, s->row, s->col, s->xpixel, s->ypixel);
/* XXX parse and set terminal modes */
xfree(term_modes);
return 1;
}
@ -1286,6 +1288,7 @@ session_input_channel_req(int id, void *arg)
success = 1;
} else if (strcmp(rtype, "exec") == 0) {
char *command = packet_get_string(&len);
packet_done();
if (s->ttyfd == -1)
do_exec_no_pty(s, command, s->pw);
else
@ -1293,8 +1296,7 @@ session_input_channel_req(int id, void *arg)
xfree(command);
success = 1;
} else if (strcmp(rtype, "pty-req") == 0) {
if (session_pty_req(s) > 0)
success = 1;
success = session_pty_req(s);
}
}
if (strcmp(rtype, "window-change") == 0) {

5
ssh-agent.c
View File

@ -21,12 +21,7 @@ RCSID("$OpenBSD: ssh-agent.c,v 1.28 2000/04/14 10:30:33 markus Exp $");
#include "getput.h"
#include "mpaux.h"
#ifdef HAVE_OPENSSL
#include <openssl/md5.h>
#endif
#ifdef HAVE_SSL
#include <ssl/md5.h>
#endif
typedef struct {
int fd;

17
sshconnect.c
View File

@ -12,19 +12,7 @@
#include "includes.h"
RCSID("$OpenBSD: sshconnect.c,v 1.68 2000/04/14 10:30:33 markus Exp $");
#ifdef HAVE_OPENSSL
#include <openssl/bn.h>
#include <openssl/rsa.h>
#include <openssl/dsa.h>
#include <openssl/md5.h>
#endif
#ifdef HAVE_SSL
#include <ssl/bn.h>
#include <ssl/rsa.h>
#include <ssl/dsa.h>
#include <ssl/md5.h>
#endif
#include "xmalloc.h"
#include "rsa.h"
#include "ssh.h"
@ -38,8 +26,13 @@ RCSID("$OpenBSD: sshconnect.c,v 1.68 2000/04/14 10:30:33 markus Exp $");
#include "readconf.h"
#include "bufaux.h"
#include <openssl/rsa.h>
#include <openssl/dsa.h>
#include "ssh2.h"
#include <openssl/md5.h>
#include <openssl/dh.h>
#include <openssl/hmac.h>
#include "kex.h"
#include "myproposal.h"
#include "key.h"

19
sshd.c
View File

@ -29,21 +29,12 @@ RCSID("$OpenBSD: sshd.c,v 1.105 2000/04/14 10:30:33 markus Exp $");
#include "buffer.h"
#include "ssh2.h"
#ifdef HAVE_OPENSSL
# include <openssl/dh.h>
# include <openssl/bn.h>
# include <openssl/hmac.h>
# include <openssl/dsa.h>
# include <openssl/rsa.h>
#endif
#ifdef HAVE_SSL
# include <ssl/dh.h>
# include <ssl/bn.h>
# include <ssl/hmac.h>
# include <ssl/dsa.h>
# include <ssl/rsa.h>
#endif
#include <openssl/dh.h>
#include <openssl/bn.h>
#include <openssl/hmac.h>
#include "kex.h"
#include <openssl/dsa.h>
#include <openssl/rsa.h>
#include "key.h"
#include "dsa.h"