#include <ssl/foo.h> -> <openssh/foo.h>

diff --git a/usr.bin/ssh/auth-rh-rsa.c b/usr.bin/ssh/auth-rh-rsa.c
index b7adab7..4f46e3b 100644 (file)
--- a/usr.bin/ssh/auth-rh-rsa.c
+++ b/usr.bin/ssh/auth-rh-rsa.c
@@ -15,7 +15,7 @@
  */
 
 #include "includes.h"
-RCSID("$Id: auth-rh-rsa.c,v 1.11 2000/03/23 22:15:33 markus Exp $");
+RCSID("$Id: auth-rh-rsa.c,v 1.12 2000/04/12 09:39:09 markus Exp $");
 
 #include "packet.h"
 #include "ssh.h"
@@ -23,8 +23,8 @@ RCSID("$Id: auth-rh-rsa.c,v 1.11 2000/03/23 22:15:33 markus Exp $");
 #include "uidswap.h"
 #include "servconf.h"
 
-#include <ssl/rsa.h>
-#include <ssl/dsa.h>
+#include <openssl/rsa.h>
+#include <openssl/dsa.h>
 #include "key.h"
 #include "hostfile.h"
 

diff --git a/usr.bin/ssh/auth-rsa.c b/usr.bin/ssh/auth-rsa.c
index 3d2e84f..9e43cf6 100644 (file)
--- a/usr.bin/ssh/auth-rsa.c
+++ b/usr.bin/ssh/auth-rsa.c
@@ -16,7 +16,7 @@
  */
 
 #include "includes.h"
-RCSID("$Id: auth-rsa.c,v 1.19 2000/03/23 22:15:33 markus Exp $");
+RCSID("$Id: auth-rsa.c,v 1.20 2000/04/12 09:39:09 markus Exp $");
 
 #include "rsa.h"
 #include "packet.h"
@@ -27,8 +27,8 @@ RCSID("$Id: auth-rsa.c,v 1.19 2000/03/23 22:15:33 markus Exp $");
 #include "match.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;

diff --git a/usr.bin/ssh/authfd.c b/usr.bin/ssh/authfd.c
index 6a9ec6b..93188f2 100644 (file)
--- a/usr.bin/ssh/authfd.c
+++ b/usr.bin/ssh/authfd.c
@@ -14,7 +14,7 @@
  */
 
 #include "includes.h"
-RCSID("$Id: authfd.c,v 1.16 1999/12/15 19:43:10 markus Exp $");
+RCSID("$Id: authfd.c,v 1.17 2000/04/12 09:39:09 markus Exp $");
 
 #include "ssh.h"
 #include "rsa.h"
@@ -24,7 +24,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. */
 

diff --git a/usr.bin/ssh/authfile.c b/usr.bin/ssh/authfile.c
index 6acc330..50f2437 100644 (file)
--- a/usr.bin/ssh/authfile.c
+++ b/usr.bin/ssh/authfile.c
@@ -15,9 +15,9 @@
  */
 
 #include "includes.h"
-RCSID("$Id: authfile.c,v 1.12 2000/04/04 21:37:27 markus Exp $");
+RCSID("$Id: authfile.c,v 1.13 2000/04/12 09:39:10 markus Exp $");
 
-#include <ssl/bn.h>
+#include <openssl/bn.h>
 #include "xmalloc.h"
 #include "buffer.h"
 #include "bufaux.h"

diff --git a/usr.bin/ssh/bufaux.c b/usr.bin/ssh/bufaux.c
index 16dce15..c7a2e31 100644 (file)
--- a/usr.bin/ssh/bufaux.c
+++ b/usr.bin/ssh/bufaux.c
@@ -17,10 +17,10 @@
  */
 
 #include "includes.h"
-RCSID("$Id: bufaux.c,v 1.9 2000/03/28 20:24:18 markus Exp $");
+RCSID("$Id: bufaux.c,v 1.10 2000/04/12 09:39:10 markus Exp $");
 
 #include "ssh.h"
-#include <ssl/bn.h>
+#include <openssl/bn.h>
 #include "bufaux.h"
 #include "xmalloc.h"
 #include "getput.h"

diff --git a/usr.bin/ssh/cipher.c b/usr.bin/ssh/cipher.c
index 9c19da6..701fbb1 100644 (file)
--- a/usr.bin/ssh/cipher.c
+++ b/usr.bin/ssh/cipher.c
@@ -12,13 +12,13 @@
  */
 
 #include "includes.h"
-RCSID("$Id: cipher.c,v 1.24 2000/04/12 07:45:43 markus Exp $");
+RCSID("$Id: cipher.c,v 1.25 2000/04/12 09:39:10 markus Exp $");
 
 #include "ssh.h"
 #include "cipher.h"
 #include "xmalloc.h"
 
-#include <ssl/md5.h>
+#include <openssl/md5.h>
 
 /*
  * This is used by SSH1:

diff --git a/usr.bin/ssh/cipher.h b/usr.bin/ssh/cipher.h
index bf08d89..877df9a 100644 (file)
--- a/usr.bin/ssh/cipher.h
+++ b/usr.bin/ssh/cipher.h
@@ -11,15 +11,15 @@
  * 
  */
 
-/* RCSID("$Id: cipher.h,v 1.14 2000/04/12 07:45:43 markus Exp $"); */
+/* RCSID("$Id: cipher.h,v 1.15 2000/04/12 09:39:10 markus Exp $"); */
 
 #ifndef CIPHER_H
 #define CIPHER_H
 
-#include <ssl/des.h>
-#include <ssl/blowfish.h>
-#include <ssl/rc4.h>
-#include <ssl/cast.h>
+#include <openssl/des.h>
+#include <openssl/blowfish.h>
+#include <openssl/rc4.h>
+#include <openssl/cast.h>
 
 /* Cipher types.  New types can be added, but old types should not be removed
    for compatibility.  The maximum allowed value is 31. */

diff --git a/usr.bin/ssh/dsa.c b/usr.bin/ssh/dsa.c
index ec4b2c6..0f085ac 100644 (file)
--- a/usr.bin/ssh/dsa.c
+++ b/usr.bin/ssh/dsa.c
@@ -28,7 +28,7 @@
  */
 
 #include "includes.h"
-RCSID("$Id: dsa.c,v 1.2 2000/04/12 06:37:02 markus Exp $");
+RCSID("$Id: dsa.c,v 1.3 2000/04/12 09:39:10 markus Exp $");
 
 #include "ssh.h"
 #include "xmalloc.h"
@@ -36,15 +36,15 @@ RCSID("$Id: dsa.c,v 1.2 2000/04/12 06:37:02 markus Exp $");
 #include "bufaux.h"
 #include "compat.h"
 
-#include <ssl/bn.h>
-#include <ssl/dh.h>
-#include <ssl/rsa.h>
-#include <ssl/dsa.h>
-#include <ssl/evp.h>
-#include <ssl/bio.h>
-#include <ssl/pem.h>
+#include <openssl/bn.h>
+#include <openssl/dh.h>
+#include <openssl/rsa.h>
+#include <openssl/dsa.h>
+#include <openssl/evp.h>
+#include <openssl/bio.h>
+#include <openssl/pem.h>
 
-#include <ssl/hmac.h>
+#include <openssl/hmac.h>
 #include "kex.h"
 #include "key.h"
 

diff --git a/usr.bin/ssh/fingerprint.c b/usr.bin/ssh/fingerprint.c
index c001ca2..4b0966d 100644 (file)
--- a/usr.bin/ssh/fingerprint.c
+++ b/usr.bin/ssh/fingerprint.c
@@ -28,11 +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"
-#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"
 

diff --git a/usr.bin/ssh/hmac.c b/usr.bin/ssh/hmac.c
index 6d27ebc..fe53aa4 100644 (file)
--- a/usr.bin/ssh/hmac.c
+++ b/usr.bin/ssh/hmac.c
@@ -28,13 +28,13 @@
  */
 
 #include "includes.h"
-RCSID("$Id: hmac.c,v 1.1 2000/04/03 20:06:15 markus Exp $");
+RCSID("$Id: hmac.c,v 1.2 2000/04/12 09:39:10 markus Exp $");
 
 #include "xmalloc.h"
 #include "ssh.h"
 #include "getput.h"
 
-#include <ssl/hmac.h>
+#include <openssl/hmac.h>
 
 unsigned char *
 hmac(

diff --git a/usr.bin/ssh/hostfile.c b/usr.bin/ssh/hostfile.c
index eca68da..33df5e9 100644 (file)
--- a/usr.bin/ssh/hostfile.c
+++ b/usr.bin/ssh/hostfile.c
@@ -14,13 +14,13 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: hostfile.c,v 1.14 2000/03/23 22:15:33 markus Exp $");
+RCSID("$OpenBSD: hostfile.c,v 1.15 2000/04/12 09:39:10 markus Exp $");
 
 #include "packet.h"
 #include "match.h"
 #include "ssh.h"
-#include <ssl/rsa.h>
-#include <ssl/dsa.h>
+#include <openssl/rsa.h>
+#include <openssl/dsa.h>
 #include "key.h"
 #include "hostfile.h"
 

diff --git a/usr.bin/ssh/kex.c b/usr.bin/ssh/kex.c
index 2308c93..f9f5dde 100644 (file)
--- a/usr.bin/ssh/kex.c
+++ b/usr.bin/ssh/kex.c
@@ -28,7 +28,7 @@
  */
 
 #include "includes.h"
-RCSID("$Id: kex.c,v 1.3 2000/04/12 07:03:05 markus Exp $");
+RCSID("$Id: kex.c,v 1.4 2000/04/12 09:39:10 markus Exp $");
 
 #include "ssh.h"
 #include "ssh2.h"
@@ -38,14 +38,14 @@ RCSID("$Id: kex.c,v 1.3 2000/04/12 07:03:05 markus Exp $");
 #include "cipher.h"
 #include "compat.h"
 
-#include <ssl/bn.h>
-#include <ssl/dh.h>
+#include <openssl/bn.h>
+#include <openssl/dh.h>
 
-#include <ssl/crypto.h>
-#include <ssl/bio.h>
-#include <ssl/bn.h>
-#include <ssl/dh.h>
-#include <ssl/pem.h>
+#include <openssl/crypto.h>
+#include <openssl/bio.h>
+#include <openssl/bn.h>
+#include <openssl/dh.h>
+#include <openssl/pem.h>
 
 #include "kex.h"
 

diff --git a/usr.bin/ssh/key.c b/usr.bin/ssh/key.c
index 6ad35cb..872313a 100644 (file)
--- a/usr.bin/ssh/key.c
+++ b/usr.bin/ssh/key.c
@@ -33,9 +33,9 @@
 
 #include "includes.h"
 #include "ssh.h"
-#include <ssl/rsa.h>
-#include <ssl/dsa.h>
-#include <ssl/evp.h>
+#include <openssl/rsa.h>
+#include <openssl/dsa.h>
+#include <openssl/evp.h>
 #include "xmalloc.h"
 #include "key.h"
 

diff --git a/usr.bin/ssh/mpaux.c b/usr.bin/ssh/mpaux.c
index f8523a9..f4f6033 100644 (file)
--- a/usr.bin/ssh/mpaux.c
+++ b/usr.bin/ssh/mpaux.c
@@ -15,13 +15,13 @@
 */
 
 #include "includes.h"
-RCSID("$Id: mpaux.c,v 1.10 2000/03/28 20:27:09 markus Exp $");
+RCSID("$Id: mpaux.c,v 1.11 2000/04/12 09:39:10 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],

diff --git a/usr.bin/ssh/packet.c b/usr.bin/ssh/packet.c
index 0e01e6e..c6a462c 100644 (file)
--- a/usr.bin/ssh/packet.c
+++ b/usr.bin/ssh/packet.c
@@ -17,7 +17,7 @@
  */
 
 #include "includes.h"
-RCSID("$Id: packet.c,v 1.26 2000/04/04 21:37:27 markus Exp $");
+RCSID("$Id: packet.c,v 1.27 2000/04/12 09:39:10 markus Exp $");
 
 #include "xmalloc.h"
 #include "buffer.h"
@@ -35,9 +35,9 @@ RCSID("$Id: packet.c,v 1.26 2000/04/04 21:37:27 markus Exp $");
 #include "compat.h"
 #include "ssh2.h"
 
-#include <ssl/bn.h>
-#include <ssl/dh.h>
-#include <ssl/hmac.h>
+#include <openssl/bn.h>
+#include <openssl/dh.h>
+#include <openssl/hmac.h>
 #include "buffer.h"
 #include "kex.h"
 #include "hmac.h"

diff --git a/usr.bin/ssh/packet.h b/usr.bin/ssh/packet.h
index 6d936a7..51d4882 100644 (file)
--- a/usr.bin/ssh/packet.h
+++ b/usr.bin/ssh/packet.h
@@ -13,12 +13,12 @@
  * 
  */
 
-/* RCSID("$Id: packet.h,v 1.12 2000/04/03 20:12:55 markus Exp $"); */
+/* RCSID("$Id: packet.h,v 1.13 2000/04/12 09:39:10 markus Exp $"); */
 
 #ifndef PACKET_H
 #define PACKET_H
 
-#include <ssl/bn.h>
+#include <openssl/bn.h>
 
 /*
  * Sets the socket used for communication.  Disables encryption until

diff --git a/usr.bin/ssh/rsa.h b/usr.bin/ssh/rsa.h
index 2e33cee..5765d4a 100644 (file)
--- a/usr.bin/ssh/rsa.h
+++ b/usr.bin/ssh/rsa.h
@@ -13,13 +13,13 @@
  * 
 */
 
-/* RCSID("$Id: rsa.h,v 1.4 1999/11/24 19:53:50 markus Exp $"); */
+/* RCSID("$Id: rsa.h,v 1.5 2000/04/12 09:39:10 markus Exp $"); */
 
 #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);

diff --git a/usr.bin/ssh/ssh-agent.c b/usr.bin/ssh/ssh-agent.c
index 393fdf0..c3cbe02 100644 (file)
--- a/usr.bin/ssh/ssh-agent.c
+++ b/usr.bin/ssh/ssh-agent.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: ssh-agent.c,v 1.26 2000/03/16 20:56:14 markus Exp $   */
+/*     $OpenBSD: ssh-agent.c,v 1.27 2000/04/12 09:39:10 markus Exp $   */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -9,7 +9,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: ssh-agent.c,v 1.26 2000/03/16 20:56:14 markus Exp $");
+RCSID("$OpenBSD: ssh-agent.c,v 1.27 2000/04/12 09:39:10 markus Exp $");
 
 #include "ssh.h"
 #include "rsa.h"
@@ -21,7 +21,7 @@ RCSID("$OpenBSD: ssh-agent.c,v 1.26 2000/03/16 20:56:14 markus Exp $");
 #include "getput.h"
 #include "mpaux.h"
 
-#include <ssl/md5.h>
+#include <openssl/md5.h>
 
 typedef struct {
        int fd;

diff --git a/usr.bin/ssh/sshconnect.c b/usr.bin/ssh/sshconnect.c
index 85944c7..18d1c59 100644 (file)
--- a/usr.bin/ssh/sshconnect.c
+++ b/usr.bin/ssh/sshconnect.c
@@ -10,9 +10,9 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: sshconnect.c,v 1.65 2000/04/12 07:56:16 markus Exp $");
+RCSID("$OpenBSD: sshconnect.c,v 1.66 2000/04/12 09:39:10 markus Exp $");
 
-#include <ssl/bn.h>
+#include <openssl/bn.h>
 #include "xmalloc.h"
 #include "rsa.h"
 #include "ssh.h"
@@ -26,13 +26,13 @@ RCSID("$OpenBSD: sshconnect.c,v 1.65 2000/04/12 07:56:16 markus Exp $");
 #include "readconf.h"
 
 #include "bufaux.h"
-#include <ssl/rsa.h>
-#include <ssl/dsa.h>
+#include <openssl/rsa.h>
+#include <openssl/dsa.h>
 
 #include "ssh2.h"
-#include <ssl/md5.h>
-#include <ssl/dh.h>
-#include <ssl/hmac.h>
+#include <openssl/md5.h>
+#include <openssl/dh.h>
+#include <openssl/hmac.h>
 #include "kex.h"
 #include "myproposal.h"
 #include "key.h"

diff --git a/usr.bin/ssh/sshd.c b/usr.bin/ssh/sshd.c
index f0c504c..4400c72 100644 (file)
--- a/usr.bin/ssh/sshd.c
+++ b/usr.bin/ssh/sshd.c
@@ -14,7 +14,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: sshd.c,v 1.103 2000/04/12 08:11:36 markus Exp $");
+RCSID("$OpenBSD: sshd.c,v 1.104 2000/04/12 09:39:10 markus Exp $");
 
 #include "xmalloc.h"
 #include "rsa.h"
@@ -29,12 +29,12 @@ RCSID("$OpenBSD: sshd.c,v 1.103 2000/04/12 08:11:36 markus Exp $");
 #include "buffer.h"
 
 #include "ssh2.h"
-#include <ssl/dh.h>
-#include <ssl/bn.h>
-#include <ssl/hmac.h>
+#include <openssl/dh.h>
+#include <openssl/bn.h>
+#include <openssl/hmac.h>
 #include "kex.h"
-#include <ssl/dsa.h>
-#include <ssl/rsa.h>
+#include <openssl/dsa.h>
+#include <openssl/rsa.h>
 #include "key.h"
 #include "dsa.h"