mirror of
https://github.com/PowerShell/openssh-portable.git
synced 2025-07-30 09:14:59 +02:00
- deraadt@cvs.openbsd.org 2001/12/19 07:18:56
[auth1.c auth2.c auth2-chall.c auth-bsdauth.c auth.c authfile.c auth.h]
[auth-krb4.c auth-rhosts.c auth-skey.c bufaux.c canohost.c channels.c]
[cipher.c clientloop.c compat.c compress.c deattack.c key.c log.c mac.c]
[match.c misc.c nchan.c packet.c readconf.c rijndael.c rijndael.h scard.c]
[servconf.c servconf.h serverloop.c session.c sftp.c sftp-client.c]
[sftp-glob.c sftp-int.c sftp-server.c ssh-add.c ssh-agent.c ssh.c]
[sshconnect1.c sshconnect2.c sshconnect.c sshd.8 sshd.c sshd_config]
[ssh-keygen.c sshlogin.c sshpty.c sshtty.c ttymodes.c uidswap.c]
basic KNF done while i was looking for something else
This commit is contained in:
Damien Miller
parent
89681214ca
commit
9f0f5c64bc
12
ChangeLog
12
ChangeLog
@ -28,6 +28,16 @@
|
|||||||
[auth-rsa.c]
|
[auth-rsa.c]
|
||||||
log fingerprint on successful public key authentication, simplify
|
log fingerprint on successful public key authentication, simplify
|
||||||
usage of key structs; ok markus@
|
usage of key structs; ok markus@
|
||||||
|
- deraadt@cvs.openbsd.org 2001/12/19 07:18:56
|
||||||
|
[auth1.c auth2.c auth2-chall.c auth-bsdauth.c auth.c authfile.c auth.h]
|
||||||
|
[auth-krb4.c auth-rhosts.c auth-skey.c bufaux.c canohost.c channels.c]
|
||||||
|
[cipher.c clientloop.c compat.c compress.c deattack.c key.c log.c mac.c]
|
||||||
|
[match.c misc.c nchan.c packet.c readconf.c rijndael.c rijndael.h scard.c]
|
||||||
|
[servconf.c servconf.h serverloop.c session.c sftp.c sftp-client.c]
|
||||||
|
[sftp-glob.c sftp-int.c sftp-server.c ssh-add.c ssh-agent.c ssh.c]
|
||||||
|
[sshconnect1.c sshconnect2.c sshconnect.c sshd.8 sshd.c sshd_config]
|
||||||
|
[ssh-keygen.c sshlogin.c sshpty.c sshtty.c ttymodes.c uidswap.c]
|
||||||
|
basic KNF done while i was looking for something else
|
||||||
|
|
||||||
20011219
|
20011219
|
||||||
- (stevesk) OpenBSD CVS sync X11 localhost display
|
- (stevesk) OpenBSD CVS sync X11 localhost display
|
||||||
@ -7056,4 +7066,4 @@
|
|||||||
- Wrote replacements for strlcpy and mkdtemp
|
- Wrote replacements for strlcpy and mkdtemp
|
||||||
- Released 1.0pre1
|
- Released 1.0pre1
|
||||||
|
|
||||||
$Id: ChangeLog,v 1.1700 2001/12/21 01:52:39 djm Exp $
|
$Id: ChangeLog,v 1.1701 2001/12/21 03:45:46 djm Exp $
|
||||||
|
|||||||
@ -22,7 +22,7 @@
|
|||||||
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
*/
|
*/
|
||||||
#include "includes.h"
|
#include "includes.h"
|
||||||
RCSID("$OpenBSD: auth-bsdauth.c,v 1.1 2001/05/18 14:13:28 markus Exp $");
|
RCSID("$OpenBSD: auth-bsdauth.c,v 1.2 2001/12/19 07:18:56 deraadt Exp $");
|
||||||
|
|
||||||
#ifdef BSD_AUTH
|
#ifdef BSD_AUTH
|
||||||
#include "xmalloc.h"
|
#include "xmalloc.h"
|
||||||
@ -39,71 +39,71 @@ static int
|
|||||||
bsdauth_query(void *ctx, char **name, char **infotxt,
|
bsdauth_query(void *ctx, char **name, char **infotxt,
|
||||||
u_int *numprompts, char ***prompts, u_int **echo_on)
|
u_int *numprompts, char ***prompts, u_int **echo_on)
|
||||||
{
|
{
|
||||||
Authctxt *authctxt = ctx;
|
Authctxt *authctxt = ctx;
|
||||||
char *challenge = NULL;
|
char *challenge = NULL;
|
||||||
|
|
||||||
if (authctxt->as != NULL) {
|
if (authctxt->as != NULL) {
|
||||||
debug2("bsdauth_query: try reuse session");
|
debug2("bsdauth_query: try reuse session");
|
||||||
challenge = auth_getitem(authctxt->as, AUTHV_CHALLENGE);
|
challenge = auth_getitem(authctxt->as, AUTHV_CHALLENGE);
|
||||||
if (challenge == NULL) {
|
if (challenge == NULL) {
|
||||||
auth_close(authctxt->as);
|
auth_close(authctxt->as);
|
||||||
authctxt->as = NULL;
|
authctxt->as = NULL;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (challenge == NULL) {
|
if (challenge == NULL) {
|
||||||
debug2("bsdauth_query: new bsd auth session");
|
debug2("bsdauth_query: new bsd auth session");
|
||||||
debug3("bsdauth_query: style %s",
|
debug3("bsdauth_query: style %s",
|
||||||
authctxt->style ? authctxt->style : "<default>");
|
authctxt->style ? authctxt->style : "<default>");
|
||||||
authctxt->as = auth_userchallenge(authctxt->user,
|
authctxt->as = auth_userchallenge(authctxt->user,
|
||||||
authctxt->style, "auth-ssh", &challenge);
|
authctxt->style, "auth-ssh", &challenge);
|
||||||
if (authctxt->as == NULL)
|
if (authctxt->as == NULL)
|
||||||
challenge = NULL;
|
challenge = NULL;
|
||||||
debug2("bsdauth_query: <%s>", challenge ? challenge : "empty");
|
debug2("bsdauth_query: <%s>", challenge ? challenge : "empty");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (challenge == NULL)
|
if (challenge == NULL)
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
*name = xstrdup("");
|
*name = xstrdup("");
|
||||||
*infotxt = xstrdup("");
|
*infotxt = xstrdup("");
|
||||||
*numprompts = 1;
|
*numprompts = 1;
|
||||||
*prompts = xmalloc(*numprompts * sizeof(char*));
|
*prompts = xmalloc(*numprompts * sizeof(char*));
|
||||||
*echo_on = xmalloc(*numprompts * sizeof(u_int));
|
*echo_on = xmalloc(*numprompts * sizeof(u_int));
|
||||||
(*echo_on)[0] = 0;
|
(*echo_on)[0] = 0;
|
||||||
(*prompts)[0] = xstrdup(challenge);
|
(*prompts)[0] = xstrdup(challenge);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
bsdauth_respond(void *ctx, u_int numresponses, char **responses)
|
bsdauth_respond(void *ctx, u_int numresponses, char **responses)
|
||||||
{
|
{
|
||||||
Authctxt *authctxt = ctx;
|
Authctxt *authctxt = ctx;
|
||||||
int authok;
|
int authok;
|
||||||
|
|
||||||
if (authctxt->as == 0)
|
if (authctxt->as == 0)
|
||||||
error("bsdauth_respond: no bsd auth session");
|
error("bsdauth_respond: no bsd auth session");
|
||||||
|
|
||||||
if (numresponses != 1)
|
if (numresponses != 1)
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
authok = auth_userresponse(authctxt->as, responses[0], 0);
|
authok = auth_userresponse(authctxt->as, responses[0], 0);
|
||||||
authctxt->as = NULL;
|
authctxt->as = NULL;
|
||||||
debug3("bsdauth_respond: <%s> = <%d>", responses[0], authok);
|
debug3("bsdauth_respond: <%s> = <%d>", responses[0], authok);
|
||||||
|
|
||||||
return (authok == 0) ? -1 : 0;
|
return (authok == 0) ? -1 : 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
bsdauth_free_ctx(void *ctx)
|
bsdauth_free_ctx(void *ctx)
|
||||||
{
|
{
|
||||||
Authctxt *authctxt = ctx;
|
Authctxt *authctxt = ctx;
|
||||||
|
|
||||||
if (authctxt && authctxt->as) {
|
if (authctxt && authctxt->as) {
|
||||||
auth_close(authctxt->as);
|
auth_close(authctxt->as);
|
||||||
authctxt->as = NULL;
|
authctxt->as = NULL;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
KbdintDevice bsdauth_device = {
|
KbdintDevice bsdauth_device = {
|
||||||
|
|||||||
@ -23,7 +23,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "includes.h"
|
#include "includes.h"
|
||||||
RCSID("$OpenBSD: auth-krb4.c,v 1.24 2001/06/26 16:15:22 dugsong Exp $");
|
RCSID("$OpenBSD: auth-krb4.c,v 1.25 2001/12/19 07:18:56 deraadt Exp $");
|
||||||
|
|
||||||
#include "ssh.h"
|
#include "ssh.h"
|
||||||
#include "ssh1.h"
|
#include "ssh1.h"
|
||||||
|
|||||||
@ -14,7 +14,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "includes.h"
|
#include "includes.h"
|
||||||
RCSID("$OpenBSD: auth-rhosts.c,v 1.24 2001/06/23 15:12:17 itojun Exp $");
|
RCSID("$OpenBSD: auth-rhosts.c,v 1.25 2001/12/19 07:18:56 deraadt Exp $");
|
||||||
|
|
||||||
#include "packet.h"
|
#include "packet.h"
|
||||||
#include "xmalloc.h"
|
#include "xmalloc.h"
|
||||||
@ -186,7 +186,7 @@ auth_rhosts2(struct passwd *pw, const char *client_user, const char *hostname,
|
|||||||
* servers.
|
* servers.
|
||||||
*/
|
*/
|
||||||
for (rhosts_file_index = 0; rhosts_files[rhosts_file_index];
|
for (rhosts_file_index = 0; rhosts_files[rhosts_file_index];
|
||||||
rhosts_file_index++) {
|
rhosts_file_index++) {
|
||||||
/* Check users .rhosts or .shosts. */
|
/* Check users .rhosts or .shosts. */
|
||||||
snprintf(buf, sizeof buf, "%.500s/%.100s",
|
snprintf(buf, sizeof buf, "%.500s/%.100s",
|
||||||
pw->pw_dir, rhosts_files[rhosts_file_index]);
|
pw->pw_dir, rhosts_files[rhosts_file_index]);
|
||||||
@ -204,16 +204,16 @@ auth_rhosts2(struct passwd *pw, const char *client_user, const char *hostname,
|
|||||||
|
|
||||||
/* If not logging in as superuser, try /etc/hosts.equiv and shosts.equiv. */
|
/* If not logging in as superuser, try /etc/hosts.equiv and shosts.equiv. */
|
||||||
if (pw->pw_uid != 0) {
|
if (pw->pw_uid != 0) {
|
||||||
if (check_rhosts_file(_PATH_RHOSTS_EQUIV, hostname, ipaddr, client_user,
|
if (check_rhosts_file(_PATH_RHOSTS_EQUIV, hostname, ipaddr,
|
||||||
pw->pw_name)) {
|
client_user, pw->pw_name)) {
|
||||||
packet_send_debug("Accepted for %.100s [%.100s] by /etc/hosts.equiv.",
|
packet_send_debug("Accepted for %.100s [%.100s] by /etc/hosts.equiv.",
|
||||||
hostname, ipaddr);
|
hostname, ipaddr);
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
if (check_rhosts_file(_PATH_SSH_HOSTS_EQUIV, hostname, ipaddr, client_user,
|
if (check_rhosts_file(_PATH_SSH_HOSTS_EQUIV, hostname, ipaddr,
|
||||||
pw->pw_name)) {
|
client_user, pw->pw_name)) {
|
||||||
packet_send_debug("Accepted for %.100s [%.100s] by %.100s.",
|
packet_send_debug("Accepted for %.100s [%.100s] by %.100s.",
|
||||||
hostname, ipaddr, _PATH_SSH_HOSTS_EQUIV);
|
hostname, ipaddr, _PATH_SSH_HOSTS_EQUIV);
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -230,7 +230,7 @@ auth_rhosts2(struct passwd *pw, const char *client_user, const char *hostname,
|
|||||||
}
|
}
|
||||||
if (options.strict_modes &&
|
if (options.strict_modes &&
|
||||||
((st.st_uid != 0 && st.st_uid != pw->pw_uid) ||
|
((st.st_uid != 0 && st.st_uid != pw->pw_uid) ||
|
||||||
(st.st_mode & 022) != 0)) {
|
(st.st_mode & 022) != 0)) {
|
||||||
log("Rhosts authentication refused for %.100s: bad ownership or modes for home directory.",
|
log("Rhosts authentication refused for %.100s: bad ownership or modes for home directory.",
|
||||||
pw->pw_name);
|
pw->pw_name);
|
||||||
packet_send_debug("Rhosts authentication refused for %.100s: bad ownership or modes for home directory.",
|
packet_send_debug("Rhosts authentication refused for %.100s: bad ownership or modes for home directory.",
|
||||||
@ -242,7 +242,7 @@ auth_rhosts2(struct passwd *pw, const char *client_user, const char *hostname,
|
|||||||
|
|
||||||
/* Check all .rhosts files (currently .shosts and .rhosts). */
|
/* Check all .rhosts files (currently .shosts and .rhosts). */
|
||||||
for (rhosts_file_index = 0; rhosts_files[rhosts_file_index];
|
for (rhosts_file_index = 0; rhosts_files[rhosts_file_index];
|
||||||
rhosts_file_index++) {
|
rhosts_file_index++) {
|
||||||
/* Check users .rhosts or .shosts. */
|
/* Check users .rhosts or .shosts. */
|
||||||
snprintf(buf, sizeof buf, "%.500s/%.100s",
|
snprintf(buf, sizeof buf, "%.500s/%.100s",
|
||||||
pw->pw_dir, rhosts_files[rhosts_file_index]);
|
pw->pw_dir, rhosts_files[rhosts_file_index]);
|
||||||
@ -257,7 +257,7 @@ auth_rhosts2(struct passwd *pw, const char *client_user, const char *hostname,
|
|||||||
*/
|
*/
|
||||||
if (options.strict_modes &&
|
if (options.strict_modes &&
|
||||||
((st.st_uid != 0 && st.st_uid != pw->pw_uid) ||
|
((st.st_uid != 0 && st.st_uid != pw->pw_uid) ||
|
||||||
(st.st_mode & 022) != 0)) {
|
(st.st_mode & 022) != 0)) {
|
||||||
log("Rhosts authentication refused for %.100s: bad modes for %.200s",
|
log("Rhosts authentication refused for %.100s: bad modes for %.200s",
|
||||||
pw->pw_name, buf);
|
pw->pw_name, buf);
|
||||||
packet_send_debug("Bad file modes for %.200s", buf);
|
packet_send_debug("Bad file modes for %.200s", buf);
|
||||||
|
|||||||
@ -22,7 +22,7 @@
|
|||||||
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
*/
|
*/
|
||||||
#include "includes.h"
|
#include "includes.h"
|
||||||
RCSID("$OpenBSD: auth-skey.c,v 1.12 2001/05/18 14:13:28 markus Exp $");
|
RCSID("$OpenBSD: auth-skey.c,v 1.13 2001/12/19 07:18:56 deraadt Exp $");
|
||||||
|
|
||||||
#ifdef SKEY
|
#ifdef SKEY
|
||||||
|
|
||||||
|
|||||||
6
auth.c
6
auth.c
@ -23,7 +23,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "includes.h"
|
#include "includes.h"
|
||||||
RCSID("$OpenBSD: auth.c,v 1.30 2001/11/17 19:14:34 stevesk Exp $");
|
RCSID("$OpenBSD: auth.c,v 1.31 2001/12/19 07:18:56 deraadt Exp $");
|
||||||
|
|
||||||
#ifdef HAVE_LOGIN_H
|
#ifdef HAVE_LOGIN_H
|
||||||
#include <login.h>
|
#include <login.h>
|
||||||
@ -272,7 +272,7 @@ expand_filename(const char *filename, struct passwd *pw)
|
|||||||
}
|
}
|
||||||
if (cp[0] == '%' && cp[1] == 'u') {
|
if (cp[0] == '%' && cp[1] == 'u') {
|
||||||
buffer_append(&buffer, pw->pw_name,
|
buffer_append(&buffer, pw->pw_name,
|
||||||
strlen(pw->pw_name));
|
strlen(pw->pw_name));
|
||||||
cp++;
|
cp++;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
@ -326,7 +326,7 @@ check_key_in_hostfiles(struct passwd *pw, Key *key, const char *host,
|
|||||||
if (options.strict_modes &&
|
if (options.strict_modes &&
|
||||||
(stat(user_hostfile, &st) == 0) &&
|
(stat(user_hostfile, &st) == 0) &&
|
||||||
((st.st_uid != 0 && st.st_uid != pw->pw_uid) ||
|
((st.st_uid != 0 && st.st_uid != pw->pw_uid) ||
|
||||||
(st.st_mode & 022) != 0)) {
|
(st.st_mode & 022) != 0)) {
|
||||||
log("Authentication refused for %.100s: "
|
log("Authentication refused for %.100s: "
|
||||||
"bad owner or modes for %.200s",
|
"bad owner or modes for %.200s",
|
||||||
pw->pw_name, user_hostfile);
|
pw->pw_name, user_hostfile);
|
||||||
|
|||||||
2
auth.h
2
auth.h
@ -21,7 +21,7 @@
|
|||||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
||||||
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
*
|
*
|
||||||
* $OpenBSD: auth.h,v 1.24 2001/12/18 10:04:21 jakob Exp $
|
* $OpenBSD: auth.h,v 1.25 2001/12/19 07:18:56 deraadt Exp $
|
||||||
*/
|
*/
|
||||||
#ifndef AUTH_H
|
#ifndef AUTH_H
|
||||||
#define AUTH_H
|
#define AUTH_H
|
||||||
|
|||||||
4
auth1.c
4
auth1.c
@ -10,7 +10,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "includes.h"
|
#include "includes.h"
|
||||||
RCSID("$OpenBSD: auth1.c,v 1.26 2001/12/05 03:56:39 itojun Exp $");
|
RCSID("$OpenBSD: auth1.c,v 1.27 2001/12/19 07:18:56 deraadt Exp $");
|
||||||
|
|
||||||
#include "xmalloc.h"
|
#include "xmalloc.h"
|
||||||
#include "rsa.h"
|
#include "rsa.h"
|
||||||
@ -77,7 +77,7 @@ do_authloop(Authctxt *authctxt)
|
|||||||
struct passwd *pw = authctxt->pw;
|
struct passwd *pw = authctxt->pw;
|
||||||
|
|
||||||
debug("Attempting authentication for %s%.100s.",
|
debug("Attempting authentication for %s%.100s.",
|
||||||
authctxt->valid ? "" : "illegal user ", authctxt->user);
|
authctxt->valid ? "" : "illegal user ", authctxt->user);
|
||||||
|
|
||||||
/* If the user has no password, accept authentication immediately. */
|
/* If the user has no password, accept authentication immediately. */
|
||||||
if (options.password_authentication &&
|
if (options.password_authentication &&
|
||||||
|
|||||||
@ -23,7 +23,7 @@
|
|||||||
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
*/
|
*/
|
||||||
#include "includes.h"
|
#include "includes.h"
|
||||||
RCSID("$OpenBSD: auth2-chall.c,v 1.9 2001/12/09 18:45:56 markus Exp $");
|
RCSID("$OpenBSD: auth2-chall.c,v 1.10 2001/12/19 07:18:56 deraadt Exp $");
|
||||||
|
|
||||||
#include "ssh2.h"
|
#include "ssh2.h"
|
||||||
#include "auth.h"
|
#include "auth.h"
|
||||||
|
|||||||
4
auth2.c
4
auth2.c
@ -23,7 +23,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "includes.h"
|
#include "includes.h"
|
||||||
RCSID("$OpenBSD: auth2.c,v 1.76 2001/12/18 10:05:15 jakob Exp $");
|
RCSID("$OpenBSD: auth2.c,v 1.77 2001/12/19 07:18:56 deraadt Exp $");
|
||||||
|
|
||||||
#include <openssl/evp.h>
|
#include <openssl/evp.h>
|
||||||
|
|
||||||
@ -721,7 +721,7 @@ user_key_allowed2(struct passwd *pw, Key *key, char *file)
|
|||||||
file, linenum);
|
file, linenum);
|
||||||
fp = key_fingerprint(found, SSH_FP_MD5, SSH_FP_HEX);
|
fp = key_fingerprint(found, SSH_FP_MD5, SSH_FP_HEX);
|
||||||
verbose("Found matching %s key: %s",
|
verbose("Found matching %s key: %s",
|
||||||
key_type(found), fp);
|
key_type(found), fp);
|
||||||
xfree(fp);
|
xfree(fp);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -36,7 +36,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "includes.h"
|
#include "includes.h"
|
||||||
RCSID("$OpenBSD: authfile.c,v 1.40 2001/12/05 10:06:12 deraadt Exp $");
|
RCSID("$OpenBSD: authfile.c,v 1.41 2001/12/19 07:18:56 deraadt Exp $");
|
||||||
|
|
||||||
#include <openssl/err.h>
|
#include <openssl/err.h>
|
||||||
#include <openssl/evp.h>
|
#include <openssl/evp.h>
|
||||||
@ -147,7 +147,7 @@ key_save_private_rsa1(Key *key, const char *filename, const char *passphrase,
|
|||||||
if (write(fd, buffer_ptr(&encrypted), buffer_len(&encrypted)) !=
|
if (write(fd, buffer_ptr(&encrypted), buffer_len(&encrypted)) !=
|
||||||
buffer_len(&encrypted)) {
|
buffer_len(&encrypted)) {
|
||||||
error("write to key file %s failed: %s", filename,
|
error("write to key file %s failed: %s", filename,
|
||||||
strerror(errno));
|
strerror(errno));
|
||||||
buffer_free(&encrypted);
|
buffer_free(&encrypted);
|
||||||
close(fd);
|
close(fd);
|
||||||
unlink(filename);
|
unlink(filename);
|
||||||
@ -450,7 +450,7 @@ key_load_private_pem(int fd, int type, const char *passphrase,
|
|||||||
debug("PEM_read_PrivateKey failed");
|
debug("PEM_read_PrivateKey failed");
|
||||||
(void)ERR_get_error();
|
(void)ERR_get_error();
|
||||||
} else if (pk->type == EVP_PKEY_RSA &&
|
} else if (pk->type == EVP_PKEY_RSA &&
|
||||||
(type == KEY_UNSPEC||type==KEY_RSA)) {
|
(type == KEY_UNSPEC||type==KEY_RSA)) {
|
||||||
prv = key_new(KEY_UNSPEC);
|
prv = key_new(KEY_UNSPEC);
|
||||||
prv->rsa = EVP_PKEY_get1_RSA(pk);
|
prv->rsa = EVP_PKEY_get1_RSA(pk);
|
||||||
prv->type = KEY_RSA;
|
prv->type = KEY_RSA;
|
||||||
@ -459,7 +459,7 @@ key_load_private_pem(int fd, int type, const char *passphrase,
|
|||||||
RSA_print_fp(stderr, prv->rsa, 8);
|
RSA_print_fp(stderr, prv->rsa, 8);
|
||||||
#endif
|
#endif
|
||||||
} else if (pk->type == EVP_PKEY_DSA &&
|
} else if (pk->type == EVP_PKEY_DSA &&
|
||||||
(type == KEY_UNSPEC||type==KEY_DSA)) {
|
(type == KEY_UNSPEC||type==KEY_DSA)) {
|
||||||
prv = key_new(KEY_UNSPEC);
|
prv = key_new(KEY_UNSPEC);
|
||||||
prv->dsa = EVP_PKEY_get1_DSA(pk);
|
prv->dsa = EVP_PKEY_get1_DSA(pk);
|
||||||
prv->type = KEY_DSA;
|
prv->type = KEY_DSA;
|
||||||
|
|||||||
8
bufaux.c
8
bufaux.c
@ -37,7 +37,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "includes.h"
|
#include "includes.h"
|
||||||
RCSID("$OpenBSD: bufaux.c,v 1.18 2001/12/05 10:06:12 deraadt Exp $");
|
RCSID("$OpenBSD: bufaux.c,v 1.19 2001/12/19 07:18:56 deraadt Exp $");
|
||||||
|
|
||||||
#include <openssl/bn.h>
|
#include <openssl/bn.h>
|
||||||
#include "bufaux.h"
|
#include "bufaux.h"
|
||||||
@ -62,7 +62,7 @@ buffer_put_bignum(Buffer *buffer, BIGNUM *value)
|
|||||||
oi = BN_bn2bin(value, buf);
|
oi = BN_bn2bin(value, buf);
|
||||||
if (oi != bin_size)
|
if (oi != bin_size)
|
||||||
fatal("buffer_put_bignum: BN_bn2bin() failed: oi %d != bin_size %d",
|
fatal("buffer_put_bignum: BN_bn2bin() failed: oi %d != bin_size %d",
|
||||||
oi, bin_size);
|
oi, bin_size);
|
||||||
|
|
||||||
/* Store the number of bits in the buffer in two bytes, msb first. */
|
/* Store the number of bits in the buffer in two bytes, msb first. */
|
||||||
PUT_16BIT(msg, bits);
|
PUT_16BIT(msg, bits);
|
||||||
@ -112,14 +112,14 @@ buffer_put_bignum2(Buffer *buffer, BIGNUM *value)
|
|||||||
oi = BN_bn2bin(value, buf+1);
|
oi = BN_bn2bin(value, buf+1);
|
||||||
if (oi != bytes-1)
|
if (oi != bytes-1)
|
||||||
fatal("buffer_put_bignum: BN_bn2bin() failed: oi %d != bin_size %d",
|
fatal("buffer_put_bignum: BN_bn2bin() failed: oi %d != bin_size %d",
|
||||||
oi, bytes);
|
oi, bytes);
|
||||||
hasnohigh = (buf[1] & 0x80) ? 0 : 1;
|
hasnohigh = (buf[1] & 0x80) ? 0 : 1;
|
||||||
if (value->neg) {
|
if (value->neg) {
|
||||||
/**XXX should be two's-complement */
|
/**XXX should be two's-complement */
|
||||||
int i, carry;
|
int i, carry;
|
||||||
u_char *uc = buf;
|
u_char *uc = buf;
|
||||||
log("negativ!");
|
log("negativ!");
|
||||||
for(i = bytes-1, carry = 1; i>=0; i--) {
|
for (i = bytes-1, carry = 1; i>=0; i--) {
|
||||||
uc[i] ^= 0xff;
|
uc[i] ^= 0xff;
|
||||||
if (carry)
|
if (carry)
|
||||||
carry = !++uc[i];
|
carry = !++uc[i];
|
||||||
|
|||||||
10
canohost.c
10
canohost.c
@ -12,7 +12,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "includes.h"
|
#include "includes.h"
|
||||||
RCSID("$OpenBSD: canohost.c,v 1.28 2001/12/05 03:56:39 itojun Exp $");
|
RCSID("$OpenBSD: canohost.c,v 1.29 2001/12/19 07:18:56 deraadt Exp $");
|
||||||
|
|
||||||
#include "packet.h"
|
#include "packet.h"
|
||||||
#include "xmalloc.h"
|
#include "xmalloc.h"
|
||||||
@ -68,13 +68,13 @@ get_remote_hostname(int socket, int reverse_mapping_check)
|
|||||||
check_ip_options(socket, ntop);
|
check_ip_options(socket, ntop);
|
||||||
|
|
||||||
if (getnameinfo((struct sockaddr *)&from, fromlen, ntop, sizeof(ntop),
|
if (getnameinfo((struct sockaddr *)&from, fromlen, ntop, sizeof(ntop),
|
||||||
NULL, 0, NI_NUMERICHOST) != 0)
|
NULL, 0, NI_NUMERICHOST) != 0)
|
||||||
fatal("get_remote_hostname: getnameinfo NI_NUMERICHOST failed");
|
fatal("get_remote_hostname: getnameinfo NI_NUMERICHOST failed");
|
||||||
|
|
||||||
debug3("Trying to reverse map address %.100s.", ntop);
|
debug3("Trying to reverse map address %.100s.", ntop);
|
||||||
/* Map the IP address to a host name. */
|
/* Map the IP address to a host name. */
|
||||||
if (getnameinfo((struct sockaddr *)&from, fromlen, name, sizeof(name),
|
if (getnameinfo((struct sockaddr *)&from, fromlen, name, sizeof(name),
|
||||||
NULL, 0, NI_NAMEREQD) != 0) {
|
NULL, 0, NI_NAMEREQD) != 0) {
|
||||||
/* Host name not found. Use ip address. */
|
/* Host name not found. Use ip address. */
|
||||||
log("Could not reverse map address %.100s.", ntop);
|
log("Could not reverse map address %.100s.", ntop);
|
||||||
return xstrdup(ntop);
|
return xstrdup(ntop);
|
||||||
@ -230,7 +230,7 @@ get_socket_address(int socket, int remote, int flags)
|
|||||||
}
|
}
|
||||||
/* Get the address in ascii. */
|
/* Get the address in ascii. */
|
||||||
if (getnameinfo((struct sockaddr *)&addr, addrlen, ntop, sizeof(ntop),
|
if (getnameinfo((struct sockaddr *)&addr, addrlen, ntop, sizeof(ntop),
|
||||||
NULL, 0, flags) != 0) {
|
NULL, 0, flags) != 0) {
|
||||||
error("get_socket_ipaddr: getnameinfo %d failed", flags);
|
error("get_socket_ipaddr: getnameinfo %d failed", flags);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
@ -316,7 +316,7 @@ get_sock_port(int sock, int local)
|
|||||||
}
|
}
|
||||||
/* Return port number. */
|
/* Return port number. */
|
||||||
if (getnameinfo((struct sockaddr *)&from, fromlen, NULL, 0,
|
if (getnameinfo((struct sockaddr *)&from, fromlen, NULL, 0,
|
||||||
strport, sizeof(strport), NI_NUMERICSERV) != 0)
|
strport, sizeof(strport), NI_NUMERICSERV) != 0)
|
||||||
fatal("get_sock_port: getnameinfo NI_NUMERICSERV failed");
|
fatal("get_sock_port: getnameinfo NI_NUMERICSERV failed");
|
||||||
return atoi(strport);
|
return atoi(strport);
|
||||||
}
|
}
|
||||||
|
|||||||
16
channels.c
16
channels.c
@ -39,7 +39,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "includes.h"
|
#include "includes.h"
|
||||||
RCSID("$OpenBSD: channels.c,v 1.147 2001/12/08 17:49:28 stevesk Exp $");
|
RCSID("$OpenBSD: channels.c,v 1.148 2001/12/19 07:18:56 deraadt Exp $");
|
||||||
|
|
||||||
#include "ssh.h"
|
#include "ssh.h"
|
||||||
#include "ssh1.h"
|
#include "ssh1.h"
|
||||||
@ -794,7 +794,7 @@ x11_open_helper(Buffer *b)
|
|||||||
data_len = ucp[8] + 256 * ucp[9];
|
data_len = ucp[8] + 256 * ucp[9];
|
||||||
} else {
|
} else {
|
||||||
debug("Initial X11 packet contains bad byte order byte: 0x%x",
|
debug("Initial X11 packet contains bad byte order byte: 0x%x",
|
||||||
ucp[0]);
|
ucp[0]);
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1373,7 +1373,7 @@ channel_handle_efd(Channel *c, fd_set * readset, fd_set * writeset)
|
|||||||
FD_ISSET(c->efd, readset)) {
|
FD_ISSET(c->efd, readset)) {
|
||||||
len = read(c->efd, buf, sizeof(buf));
|
len = read(c->efd, buf, sizeof(buf));
|
||||||
debug2("channel %d: read %d from efd %d",
|
debug2("channel %d: read %d from efd %d",
|
||||||
c->self, len, c->efd);
|
c->self, len, c->efd);
|
||||||
if (len < 0 && (errno == EINTR || errno == EAGAIN))
|
if (len < 0 && (errno == EINTR || errno == EAGAIN))
|
||||||
return 1;
|
return 1;
|
||||||
if (len <= 0) {
|
if (len <= 0) {
|
||||||
@ -1509,7 +1509,7 @@ static void
|
|||||||
channel_handler_init(void)
|
channel_handler_init(void)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
for(i = 0; i < SSH_CHANNEL_MAX_TYPE; i++) {
|
for (i = 0; i < SSH_CHANNEL_MAX_TYPE; i++) {
|
||||||
channel_pre[i] = NULL;
|
channel_pre[i] = NULL;
|
||||||
channel_post[i] = NULL;
|
channel_post[i] = NULL;
|
||||||
}
|
}
|
||||||
@ -2414,8 +2414,8 @@ x11_create_display_inet(int x11_display_offset, int gateway_ports)
|
|||||||
int gaierr, n, num_socks = 0, socks[NUM_SOCKS];
|
int gaierr, n, num_socks = 0, socks[NUM_SOCKS];
|
||||||
|
|
||||||
for (display_number = x11_display_offset;
|
for (display_number = x11_display_offset;
|
||||||
display_number < MAX_DISPLAYS;
|
display_number < MAX_DISPLAYS;
|
||||||
display_number++) {
|
display_number++) {
|
||||||
port = 6000 + display_number;
|
port = 6000 + display_number;
|
||||||
memset(&hints, 0, sizeof(hints));
|
memset(&hints, 0, sizeof(hints));
|
||||||
hints.ai_family = IPv4or6;
|
hints.ai_family = IPv4or6;
|
||||||
@ -2541,7 +2541,7 @@ x11_connect_display(void)
|
|||||||
/* Connect to the unix domain socket. */
|
/* Connect to the unix domain socket. */
|
||||||
if (sscanf(strrchr(display, ':') + 1, "%d", &display_number) != 1) {
|
if (sscanf(strrchr(display, ':') + 1, "%d", &display_number) != 1) {
|
||||||
error("Could not parse display number from DISPLAY: %.100s",
|
error("Could not parse display number from DISPLAY: %.100s",
|
||||||
display);
|
display);
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
/* Create a socket. */
|
/* Create a socket. */
|
||||||
@ -2566,7 +2566,7 @@ x11_connect_display(void)
|
|||||||
/* buf now contains the host name. But first we parse the display number. */
|
/* buf now contains the host name. But first we parse the display number. */
|
||||||
if (sscanf(cp + 1, "%d", &display_number) != 1) {
|
if (sscanf(cp + 1, "%d", &display_number) != 1) {
|
||||||
error("Could not parse display number from DISPLAY: %.100s",
|
error("Could not parse display number from DISPLAY: %.100s",
|
||||||
display);
|
display);
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
10
cipher.c
10
cipher.c
@ -35,7 +35,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "includes.h"
|
#include "includes.h"
|
||||||
RCSID("$OpenBSD: cipher.c,v 1.47 2001/08/23 11:31:59 markus Exp $");
|
RCSID("$OpenBSD: cipher.c,v 1.48 2001/12/19 07:18:56 deraadt Exp $");
|
||||||
|
|
||||||
#include "xmalloc.h"
|
#include "xmalloc.h"
|
||||||
#include "log.h"
|
#include "log.h"
|
||||||
@ -184,14 +184,14 @@ blowfish_setiv(CipherContext *cc, const u_char *iv, u_int ivlen)
|
|||||||
}
|
}
|
||||||
static void
|
static void
|
||||||
blowfish_cbc_encrypt(CipherContext *cc, u_char *dest, const u_char *src,
|
blowfish_cbc_encrypt(CipherContext *cc, u_char *dest, const u_char *src,
|
||||||
u_int len)
|
u_int len)
|
||||||
{
|
{
|
||||||
BF_cbc_encrypt((void *)src, dest, len, &cc->u.bf.key, cc->u.bf.iv,
|
BF_cbc_encrypt((void *)src, dest, len, &cc->u.bf.key, cc->u.bf.iv,
|
||||||
BF_ENCRYPT);
|
BF_ENCRYPT);
|
||||||
}
|
}
|
||||||
static void
|
static void
|
||||||
blowfish_cbc_decrypt(CipherContext *cc, u_char *dest, const u_char *src,
|
blowfish_cbc_decrypt(CipherContext *cc, u_char *dest, const u_char *src,
|
||||||
u_int len)
|
u_int len)
|
||||||
{
|
{
|
||||||
BF_cbc_encrypt((void *)src, dest, len, &cc->u.bf.key, cc->u.bf.iv,
|
BF_cbc_encrypt((void *)src, dest, len, &cc->u.bf.key, cc->u.bf.iv,
|
||||||
BF_DECRYPT);
|
BF_DECRYPT);
|
||||||
@ -417,7 +417,7 @@ u_int
|
|||||||
cipher_mask_ssh1(int client)
|
cipher_mask_ssh1(int client)
|
||||||
{
|
{
|
||||||
u_int mask = 0;
|
u_int mask = 0;
|
||||||
mask |= 1 << SSH_CIPHER_3DES; /* Mandatory */
|
mask |= 1 << SSH_CIPHER_3DES; /* Mandatory */
|
||||||
mask |= 1 << SSH_CIPHER_BLOWFISH;
|
mask |= 1 << SSH_CIPHER_BLOWFISH;
|
||||||
if (client) {
|
if (client) {
|
||||||
mask |= 1 << SSH_CIPHER_DES;
|
mask |= 1 << SSH_CIPHER_DES;
|
||||||
@ -457,7 +457,7 @@ ciphers_valid(const char *names)
|
|||||||
return 0;
|
return 0;
|
||||||
ciphers = cp = xstrdup(names);
|
ciphers = cp = xstrdup(names);
|
||||||
for ((p = strsep(&cp, CIPHER_SEP)); p && *p != '\0';
|
for ((p = strsep(&cp, CIPHER_SEP)); p && *p != '\0';
|
||||||
(p = strsep(&cp, CIPHER_SEP))) {
|
(p = strsep(&cp, CIPHER_SEP))) {
|
||||||
c = cipher_by_name(p);
|
c = cipher_by_name(p);
|
||||||
if (c == NULL || c->number != SSH_CIPHER_SSH2) {
|
if (c == NULL || c->number != SSH_CIPHER_SSH2) {
|
||||||
debug("bad cipher %s [%s]", p, names);
|
debug("bad cipher %s [%s]", p, names);
|
||||||
|
|||||||
16
clientloop.c
16
clientloop.c
@ -59,7 +59,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "includes.h"
|
#include "includes.h"
|
||||||
RCSID("$OpenBSD: clientloop.c,v 1.89 2001/12/05 03:50:01 itojun Exp $");
|
RCSID("$OpenBSD: clientloop.c,v 1.90 2001/12/19 07:18:56 deraadt Exp $");
|
||||||
|
|
||||||
#include "ssh.h"
|
#include "ssh.h"
|
||||||
#include "ssh1.h"
|
#include "ssh1.h"
|
||||||
@ -254,7 +254,7 @@ client_make_packets_from_stdin_data(void)
|
|||||||
|
|
||||||
/* Send buffered stdin data to the server. */
|
/* Send buffered stdin data to the server. */
|
||||||
while (buffer_len(&stdin_buffer) > 0 &&
|
while (buffer_len(&stdin_buffer) > 0 &&
|
||||||
packet_not_very_much_data_to_write()) {
|
packet_not_very_much_data_to_write()) {
|
||||||
len = buffer_len(&stdin_buffer);
|
len = buffer_len(&stdin_buffer);
|
||||||
/* Keep the packets at reasonable size. */
|
/* Keep the packets at reasonable size. */
|
||||||
if (len > packet_get_maxsize())
|
if (len > packet_get_maxsize())
|
||||||
@ -417,9 +417,9 @@ client_suspend_self(Buffer *bin, Buffer *bout, Buffer *berr)
|
|||||||
/* Check if the window size has changed. */
|
/* Check if the window size has changed. */
|
||||||
if (ioctl(fileno(stdin), TIOCGWINSZ, &newws) >= 0 &&
|
if (ioctl(fileno(stdin), TIOCGWINSZ, &newws) >= 0 &&
|
||||||
(oldws.ws_row != newws.ws_row ||
|
(oldws.ws_row != newws.ws_row ||
|
||||||
oldws.ws_col != newws.ws_col ||
|
oldws.ws_col != newws.ws_col ||
|
||||||
oldws.ws_xpixel != newws.ws_xpixel ||
|
oldws.ws_xpixel != newws.ws_xpixel ||
|
||||||
oldws.ws_ypixel != newws.ws_ypixel))
|
oldws.ws_ypixel != newws.ws_ypixel))
|
||||||
received_window_change_signal = 1;
|
received_window_change_signal = 1;
|
||||||
|
|
||||||
/* OK, we have been continued by the user. Reinitialize buffers. */
|
/* OK, we have been continued by the user. Reinitialize buffers. */
|
||||||
@ -994,11 +994,11 @@ client_loop(int have_pty, int escape_char_arg, int ssh2_chan_id)
|
|||||||
/* Report bytes transferred, and transfer rates. */
|
/* Report bytes transferred, and transfer rates. */
|
||||||
total_time = get_current_time() - start_time;
|
total_time = get_current_time() - start_time;
|
||||||
debug("Transferred: stdin %lu, stdout %lu, stderr %lu bytes in %.1f seconds",
|
debug("Transferred: stdin %lu, stdout %lu, stderr %lu bytes in %.1f seconds",
|
||||||
stdin_bytes, stdout_bytes, stderr_bytes, total_time);
|
stdin_bytes, stdout_bytes, stderr_bytes, total_time);
|
||||||
if (total_time > 0)
|
if (total_time > 0)
|
||||||
debug("Bytes per second: stdin %.1f, stdout %.1f, stderr %.1f",
|
debug("Bytes per second: stdin %.1f, stdout %.1f, stderr %.1f",
|
||||||
stdin_bytes / total_time, stdout_bytes / total_time,
|
stdin_bytes / total_time, stdout_bytes / total_time,
|
||||||
stderr_bytes / total_time);
|
stderr_bytes / total_time);
|
||||||
|
|
||||||
/* Return the exit status of the program. */
|
/* Return the exit status of the program. */
|
||||||
debug("Exit status %d", exit_status);
|
debug("Exit status %d", exit_status);
|
||||||
|
|||||||
2
compat.c
2
compat.c
@ -23,7 +23,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "includes.h"
|
#include "includes.h"
|
||||||
RCSID("$OpenBSD: compat.c,v 1.55 2001/12/05 16:54:51 markus Exp $");
|
RCSID("$OpenBSD: compat.c,v 1.56 2001/12/19 07:18:56 deraadt Exp $");
|
||||||
|
|
||||||
#include "packet.h"
|
#include "packet.h"
|
||||||
#include "xmalloc.h"
|
#include "xmalloc.h"
|
||||||
|
|||||||
14
compress.c
14
compress.c
@ -12,7 +12,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "includes.h"
|
#include "includes.h"
|
||||||
RCSID("$OpenBSD: compress.c,v 1.15 2001/09/27 11:58:16 markus Exp $");
|
RCSID("$OpenBSD: compress.c,v 1.16 2001/12/19 07:18:56 deraadt Exp $");
|
||||||
|
|
||||||
#include "log.h"
|
#include "log.h"
|
||||||
#include "buffer.h"
|
#include "buffer.h"
|
||||||
@ -55,13 +55,13 @@ void
|
|||||||
buffer_compress_uninit(void)
|
buffer_compress_uninit(void)
|
||||||
{
|
{
|
||||||
debug("compress outgoing: raw data %lu, compressed %lu, factor %.2f",
|
debug("compress outgoing: raw data %lu, compressed %lu, factor %.2f",
|
||||||
outgoing_stream.total_in, outgoing_stream.total_out,
|
outgoing_stream.total_in, outgoing_stream.total_out,
|
||||||
outgoing_stream.total_in == 0 ? 0.0 :
|
outgoing_stream.total_in == 0 ? 0.0 :
|
||||||
(double) outgoing_stream.total_out / outgoing_stream.total_in);
|
(double) outgoing_stream.total_out / outgoing_stream.total_in);
|
||||||
debug("compress incoming: raw data %lu, compressed %lu, factor %.2f",
|
debug("compress incoming: raw data %lu, compressed %lu, factor %.2f",
|
||||||
incoming_stream.total_out, incoming_stream.total_in,
|
incoming_stream.total_out, incoming_stream.total_in,
|
||||||
incoming_stream.total_out == 0 ? 0.0 :
|
incoming_stream.total_out == 0 ? 0.0 :
|
||||||
(double) incoming_stream.total_in / incoming_stream.total_out);
|
(double) incoming_stream.total_in / incoming_stream.total_out);
|
||||||
if (compress_init_recv_called == 1)
|
if (compress_init_recv_called == 1)
|
||||||
inflateEnd(&incoming_stream);
|
inflateEnd(&incoming_stream);
|
||||||
if (compress_init_send_called == 1)
|
if (compress_init_send_called == 1)
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
/* $OpenBSD: deattack.c,v 1.16 2001/12/05 03:56:39 itojun Exp $ */
|
/* $OpenBSD: deattack.c,v 1.17 2001/12/19 07:18:56 deraadt Exp $ */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Cryptographic attack detector for ssh - source code
|
* Cryptographic attack detector for ssh - source code
|
||||||
@ -37,7 +37,7 @@
|
|||||||
#define HASH_FACTOR(x) ((x)*3/2)
|
#define HASH_FACTOR(x) ((x)*3/2)
|
||||||
#define HASH_UNUSEDCHAR (0xff)
|
#define HASH_UNUSEDCHAR (0xff)
|
||||||
#define HASH_UNUSED (0xffff)
|
#define HASH_UNUSED (0xffff)
|
||||||
#define HASH_IV (0xfffe)
|
#define HASH_IV (0xfffe)
|
||||||
|
|
||||||
#define HASH_MINBLOCKS (7*SSH_BLOCKSIZE)
|
#define HASH_MINBLOCKS (7*SSH_BLOCKSIZE)
|
||||||
|
|
||||||
@ -135,7 +135,7 @@ detect_attack(u_char *buf, u_int32_t len, u_char *IV)
|
|||||||
|
|
||||||
for (c = buf, j = 0; c < (buf + len); c += SSH_BLOCKSIZE, j++) {
|
for (c = buf, j = 0; c < (buf + len); c += SSH_BLOCKSIZE, j++) {
|
||||||
for (i = HASH(c) & (n - 1); h[i] != HASH_UNUSED;
|
for (i = HASH(c) & (n - 1); h[i] != HASH_UNUSED;
|
||||||
i = (i + 1) & (n - 1)) {
|
i = (i + 1) & (n - 1)) {
|
||||||
if (h[i] == HASH_IV) {
|
if (h[i] == HASH_IV) {
|
||||||
if (!CMP(c, IV)) {
|
if (!CMP(c, IV)) {
|
||||||
if (check_crc(c, buf, len, IV))
|
if (check_crc(c, buf, len, IV))
|
||||||
|
|||||||
6
key.c
6
key.c
@ -32,7 +32,7 @@
|
|||||||
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
*/
|
*/
|
||||||
#include "includes.h"
|
#include "includes.h"
|
||||||
RCSID("$OpenBSD: key.c,v 1.35 2001/12/05 10:06:12 deraadt Exp $");
|
RCSID("$OpenBSD: key.c,v 1.36 2001/12/19 07:18:56 deraadt Exp $");
|
||||||
|
|
||||||
#include <openssl/evp.h>
|
#include <openssl/evp.h>
|
||||||
|
|
||||||
@ -219,7 +219,7 @@ key_fingerprint_hex(u_char* dgst_raw, size_t dgst_raw_len)
|
|||||||
|
|
||||||
retval = xmalloc(dgst_raw_len * 3 + 1);
|
retval = xmalloc(dgst_raw_len * 3 + 1);
|
||||||
retval[0] = '\0';
|
retval[0] = '\0';
|
||||||
for(i = 0; i < dgst_raw_len; i++) {
|
for (i = 0; i < dgst_raw_len; i++) {
|
||||||
char hex[4];
|
char hex[4];
|
||||||
snprintf(hex, sizeof(hex), "%02x:", dgst_raw[i]);
|
snprintf(hex, sizeof(hex), "%02x:", dgst_raw[i]);
|
||||||
strlcat(retval, hex, dgst_raw_len * 3);
|
strlcat(retval, hex, dgst_raw_len * 3);
|
||||||
@ -641,7 +641,7 @@ key_names_valid2(const char *names)
|
|||||||
return 0;
|
return 0;
|
||||||
s = cp = xstrdup(names);
|
s = cp = xstrdup(names);
|
||||||
for ((p = strsep(&cp, ",")); p && *p != '\0';
|
for ((p = strsep(&cp, ",")); p && *p != '\0';
|
||||||
(p = strsep(&cp, ","))) {
|
(p = strsep(&cp, ","))) {
|
||||||
switch (key_type_from_name(p)) {
|
switch (key_type_from_name(p)) {
|
||||||
case KEY_RSA1:
|
case KEY_RSA1:
|
||||||
case KEY_UNSPEC:
|
case KEY_UNSPEC:
|
||||||
|
|||||||
4
log.c
4
log.c
@ -34,7 +34,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "includes.h"
|
#include "includes.h"
|
||||||
RCSID("$OpenBSD: log.c,v 1.18 2001/06/26 17:27:23 markus Exp $");
|
RCSID("$OpenBSD: log.c,v 1.19 2001/12/19 07:18:56 deraadt Exp $");
|
||||||
|
|
||||||
#include "log.h"
|
#include "log.h"
|
||||||
#include "xmalloc.h"
|
#include "xmalloc.h"
|
||||||
@ -242,7 +242,7 @@ fatal_cleanup(void)
|
|||||||
for (cu = fatal_cleanups; cu; cu = next_cu) {
|
for (cu = fatal_cleanups; cu; cu = next_cu) {
|
||||||
next_cu = cu->next;
|
next_cu = cu->next;
|
||||||
debug("Calling cleanup 0x%lx(0x%lx)",
|
debug("Calling cleanup 0x%lx(0x%lx)",
|
||||||
(u_long) cu->proc, (u_long) cu->context);
|
(u_long) cu->proc, (u_long) cu->context);
|
||||||
(*cu->proc) (cu->context);
|
(*cu->proc) (cu->context);
|
||||||
}
|
}
|
||||||
exit(255);
|
exit(255);
|
||||||
|
|||||||
4
mac.c
4
mac.c
@ -23,7 +23,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "includes.h"
|
#include "includes.h"
|
||||||
RCSID("$OpenBSD: mac.c,v 1.2 2001/04/05 10:42:51 markus Exp $");
|
RCSID("$OpenBSD: mac.c,v 1.3 2001/12/19 07:18:56 deraadt Exp $");
|
||||||
|
|
||||||
#include <openssl/hmac.h>
|
#include <openssl/hmac.h>
|
||||||
|
|
||||||
@ -99,7 +99,7 @@ mac_valid(const char *names)
|
|||||||
return (0);
|
return (0);
|
||||||
maclist = cp = xstrdup(names);
|
maclist = cp = xstrdup(names);
|
||||||
for ((p = strsep(&cp, MAC_SEP)); p && *p != '\0';
|
for ((p = strsep(&cp, MAC_SEP)); p && *p != '\0';
|
||||||
(p = strsep(&cp, MAC_SEP))) {
|
(p = strsep(&cp, MAC_SEP))) {
|
||||||
if (mac_init(NULL, p) < 0) {
|
if (mac_init(NULL, p) < 0) {
|
||||||
debug("bad mac %s [%s]", p, names);
|
debug("bad mac %s [%s]", p, names);
|
||||||
xfree(maclist);
|
xfree(maclist);
|
||||||
|
|||||||
12
match.c
12
match.c
@ -35,7 +35,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "includes.h"
|
#include "includes.h"
|
||||||
RCSID("$OpenBSD: match.c,v 1.15 2001/12/05 16:54:51 markus Exp $");
|
RCSID("$OpenBSD: match.c,v 1.16 2001/12/19 07:18:56 deraadt Exp $");
|
||||||
|
|
||||||
#include "match.h"
|
#include "match.h"
|
||||||
#include "xmalloc.h"
|
#include "xmalloc.h"
|
||||||
@ -133,10 +133,10 @@ match_pattern_list(const char *string, const char *pattern, u_int len,
|
|||||||
* subpattern to lowercase.
|
* subpattern to lowercase.
|
||||||
*/
|
*/
|
||||||
for (subi = 0;
|
for (subi = 0;
|
||||||
i < len && subi < sizeof(sub) - 1 && pattern[i] != ',';
|
i < len && subi < sizeof(sub) - 1 && pattern[i] != ',';
|
||||||
subi++, i++)
|
subi++, i++)
|
||||||
sub[subi] = dolower && isupper(pattern[i]) ?
|
sub[subi] = dolower && isupper(pattern[i]) ?
|
||||||
tolower(pattern[i]) : pattern[i];
|
tolower(pattern[i]) : pattern[i];
|
||||||
/* If subpattern too long, return failure (no match). */
|
/* If subpattern too long, return failure (no match). */
|
||||||
if (subi >= sizeof(sub) - 1)
|
if (subi >= sizeof(sub) - 1)
|
||||||
return 0;
|
return 0;
|
||||||
@ -239,7 +239,7 @@ match_list(const char *client, const char *server, u_int *next)
|
|||||||
s = sp = xstrdup(server);
|
s = sp = xstrdup(server);
|
||||||
|
|
||||||
for ((p = strsep(&sp, SEP)), i=0; p && *p != '\0';
|
for ((p = strsep(&sp, SEP)), i=0; p && *p != '\0';
|
||||||
(p = strsep(&sp, SEP)), i++) {
|
(p = strsep(&sp, SEP)), i++) {
|
||||||
if (i < MAX_PROP)
|
if (i < MAX_PROP)
|
||||||
sproposals[i] = p;
|
sproposals[i] = p;
|
||||||
else
|
else
|
||||||
@ -248,7 +248,7 @@ match_list(const char *client, const char *server, u_int *next)
|
|||||||
nproposals = i;
|
nproposals = i;
|
||||||
|
|
||||||
for ((p = strsep(&cp, SEP)), i=0; p && *p != '\0';
|
for ((p = strsep(&cp, SEP)), i=0; p && *p != '\0';
|
||||||
(p = strsep(&cp, SEP)), i++) {
|
(p = strsep(&cp, SEP)), i++) {
|
||||||
for (j = 0; j < nproposals; j++) {
|
for (j = 0; j < nproposals; j++) {
|
||||||
if (strcmp(p, sproposals[j]) == 0) {
|
if (strcmp(p, sproposals[j]) == 0) {
|
||||||
ret = xstrdup(p);
|
ret = xstrdup(p);
|
||||||
|
|||||||
4
misc.c
4
misc.c
@ -1,4 +1,4 @@
|
|||||||
/* $OpenBSD: misc.c,v 1.13 2001/12/05 10:06:12 deraadt Exp $ */
|
/* $OpenBSD: misc.c,v 1.14 2001/12/19 07:18:56 deraadt Exp $ */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2000 Markus Friedl. All rights reserved.
|
* Copyright (c) 2000 Markus Friedl. All rights reserved.
|
||||||
@ -25,7 +25,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "includes.h"
|
#include "includes.h"
|
||||||
RCSID("$OpenBSD: misc.c,v 1.13 2001/12/05 10:06:12 deraadt Exp $");
|
RCSID("$OpenBSD: misc.c,v 1.14 2001/12/19 07:18:56 deraadt Exp $");
|
||||||
|
|
||||||
#include "misc.h"
|
#include "misc.h"
|
||||||
#include "log.h"
|
#include "log.h"
|
||||||
|
|||||||
10
nchan.c
10
nchan.c
@ -23,7 +23,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "includes.h"
|
#include "includes.h"
|
||||||
RCSID("$OpenBSD: nchan.c,v 1.32 2001/10/10 22:18:47 markus Exp $");
|
RCSID("$OpenBSD: nchan.c,v 1.33 2001/12/19 07:18:56 deraadt Exp $");
|
||||||
|
|
||||||
#include "ssh1.h"
|
#include "ssh1.h"
|
||||||
#include "ssh2.h"
|
#include "ssh2.h"
|
||||||
@ -273,7 +273,7 @@ chan_send_oclose1(Channel *c)
|
|||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
error("channel %d: cannot send oclose for ostate %d",
|
error("channel %d: cannot send oclose for ostate %d",
|
||||||
c->self, c->ostate);
|
c->self, c->ostate);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -322,7 +322,7 @@ chan_ibuf_empty2(Channel *c)
|
|||||||
debug("channel %d: ibuf empty", c->self);
|
debug("channel %d: ibuf empty", c->self);
|
||||||
if (buffer_len(&c->input)) {
|
if (buffer_len(&c->input)) {
|
||||||
error("channel %d: chan_ibuf_empty for non empty buffer",
|
error("channel %d: chan_ibuf_empty for non empty buffer",
|
||||||
c->self);
|
c->self);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
switch (c->istate) {
|
switch (c->istate) {
|
||||||
@ -334,7 +334,7 @@ chan_ibuf_empty2(Channel *c)
|
|||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
error("channel %d: chan_ibuf_empty for istate %d",
|
error("channel %d: chan_ibuf_empty for istate %d",
|
||||||
c->self, c->istate);
|
c->self, c->istate);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -458,7 +458,7 @@ chan_is_dead(Channel *c, int send)
|
|||||||
debug2("channel %d: active efd: %d len %d type %s",
|
debug2("channel %d: active efd: %d len %d type %s",
|
||||||
c->self, c->efd, buffer_len(&c->extended),
|
c->self, c->efd, buffer_len(&c->extended),
|
||||||
c->extended_usage==CHAN_EXTENDED_READ ?
|
c->extended_usage==CHAN_EXTENDED_READ ?
|
||||||
"read": "write");
|
"read": "write");
|
||||||
} else {
|
} else {
|
||||||
if (!(c->flags & CHAN_CLOSE_SENT)) {
|
if (!(c->flags & CHAN_CLOSE_SENT)) {
|
||||||
if (send) {
|
if (send) {
|
||||||
|
|||||||
8
packet.c
8
packet.c
@ -37,7 +37,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "includes.h"
|
#include "includes.h"
|
||||||
RCSID("$OpenBSD: packet.c,v 1.74 2001/12/05 10:06:12 deraadt Exp $");
|
RCSID("$OpenBSD: packet.c,v 1.75 2001/12/19 07:18:56 deraadt Exp $");
|
||||||
|
|
||||||
#include "xmalloc.h"
|
#include "xmalloc.h"
|
||||||
#include "buffer.h"
|
#include "buffer.h"
|
||||||
@ -380,7 +380,7 @@ packet_send1(void)
|
|||||||
buffer_compress(&outgoing_packet, &compression_buffer);
|
buffer_compress(&outgoing_packet, &compression_buffer);
|
||||||
buffer_clear(&outgoing_packet);
|
buffer_clear(&outgoing_packet);
|
||||||
buffer_append(&outgoing_packet, buffer_ptr(&compression_buffer),
|
buffer_append(&outgoing_packet, buffer_ptr(&compression_buffer),
|
||||||
buffer_len(&compression_buffer));
|
buffer_len(&compression_buffer));
|
||||||
}
|
}
|
||||||
/* Compute packet length without padding (add checksum, remove padding). */
|
/* Compute packet length without padding (add checksum, remove padding). */
|
||||||
len = buffer_len(&outgoing_packet) + 4 - 8;
|
len = buffer_len(&outgoing_packet) + 4 - 8;
|
||||||
@ -414,7 +414,7 @@ packet_send1(void)
|
|||||||
buffer_append(&output, buf, 4);
|
buffer_append(&output, buf, 4);
|
||||||
buffer_append_space(&output, &cp, buffer_len(&outgoing_packet));
|
buffer_append_space(&output, &cp, buffer_len(&outgoing_packet));
|
||||||
cipher_encrypt(&send_context, cp, buffer_ptr(&outgoing_packet),
|
cipher_encrypt(&send_context, cp, buffer_ptr(&outgoing_packet),
|
||||||
buffer_len(&outgoing_packet));
|
buffer_len(&outgoing_packet));
|
||||||
|
|
||||||
#ifdef PACKET_DEBUG
|
#ifdef PACKET_DEBUG
|
||||||
fprintf(stderr, "encrypted: ");
|
fprintf(stderr, "encrypted: ");
|
||||||
@ -1277,7 +1277,7 @@ packet_send_ignore(int nbytes)
|
|||||||
|
|
||||||
packet_start(compat20 ? SSH2_MSG_IGNORE : SSH_MSG_IGNORE);
|
packet_start(compat20 ? SSH2_MSG_IGNORE : SSH_MSG_IGNORE);
|
||||||
packet_put_int(nbytes);
|
packet_put_int(nbytes);
|
||||||
for(i = 0; i < nbytes; i++) {
|
for (i = 0; i < nbytes; i++) {
|
||||||
if (i % 4 == 0)
|
if (i % 4 == 0)
|
||||||
rand = arc4random();
|
rand = arc4random();
|
||||||
packet_put_char(rand & 0xff);
|
packet_put_char(rand & 0xff);
|
||||||
|
|||||||
26
readconf.c
26
readconf.c
@ -12,7 +12,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "includes.h"
|
#include "includes.h"
|
||||||
RCSID("$OpenBSD: readconf.c,v 1.92 2001/11/17 19:14:34 stevesk Exp $");
|
RCSID("$OpenBSD: readconf.c,v 1.93 2001/12/19 07:18:56 deraadt Exp $");
|
||||||
|
|
||||||
#include "ssh.h"
|
#include "ssh.h"
|
||||||
#include "xmalloc.h"
|
#include "xmalloc.h"
|
||||||
@ -225,7 +225,7 @@ add_remote_forward(Options *options, u_short port, const char *host,
|
|||||||
Forward *fwd;
|
Forward *fwd;
|
||||||
if (options->num_remote_forwards >= SSH_MAX_FORWARDS_PER_DIRECTION)
|
if (options->num_remote_forwards >= SSH_MAX_FORWARDS_PER_DIRECTION)
|
||||||
fatal("Too many remote forwards (max %d).",
|
fatal("Too many remote forwards (max %d).",
|
||||||
SSH_MAX_FORWARDS_PER_DIRECTION);
|
SSH_MAX_FORWARDS_PER_DIRECTION);
|
||||||
fwd = &options->remote_forwards[options->num_remote_forwards++];
|
fwd = &options->remote_forwards[options->num_remote_forwards++];
|
||||||
fwd->port = port;
|
fwd->port = port;
|
||||||
fwd->host = xstrdup(host);
|
fwd->host = xstrdup(host);
|
||||||
@ -394,7 +394,7 @@ parse_flag:
|
|||||||
arg = strdelim(&s);
|
arg = strdelim(&s);
|
||||||
if (!arg || *arg == '\0')
|
if (!arg || *arg == '\0')
|
||||||
fatal("%.200s line %d: Missing yes/no/ask argument.",
|
fatal("%.200s line %d: Missing yes/no/ask argument.",
|
||||||
filename, linenum);
|
filename, linenum);
|
||||||
value = 0; /* To avoid compiler warning... */
|
value = 0; /* To avoid compiler warning... */
|
||||||
if (strcmp(arg, "yes") == 0 || strcmp(arg, "true") == 0)
|
if (strcmp(arg, "yes") == 0 || strcmp(arg, "true") == 0)
|
||||||
value = 1;
|
value = 1;
|
||||||
@ -436,7 +436,7 @@ parse_flag:
|
|||||||
intptr = &options->num_identity_files;
|
intptr = &options->num_identity_files;
|
||||||
if (*intptr >= SSH_MAX_IDENTITY_FILES)
|
if (*intptr >= SSH_MAX_IDENTITY_FILES)
|
||||||
fatal("%.200s line %d: Too many identity files specified (max %d).",
|
fatal("%.200s line %d: Too many identity files specified (max %d).",
|
||||||
filename, linenum, SSH_MAX_IDENTITY_FILES);
|
filename, linenum, SSH_MAX_IDENTITY_FILES);
|
||||||
charptr = &options->identity_files[*intptr];
|
charptr = &options->identity_files[*intptr];
|
||||||
*charptr = xstrdup(arg);
|
*charptr = xstrdup(arg);
|
||||||
*intptr = *intptr + 1;
|
*intptr = *intptr + 1;
|
||||||
@ -536,7 +536,7 @@ parse_int:
|
|||||||
value = cipher_number(arg);
|
value = cipher_number(arg);
|
||||||
if (value == -1)
|
if (value == -1)
|
||||||
fatal("%.200s line %d: Bad cipher '%s'.",
|
fatal("%.200s line %d: Bad cipher '%s'.",
|
||||||
filename, linenum, arg ? arg : "<NONE>");
|
filename, linenum, arg ? arg : "<NONE>");
|
||||||
if (*activep && *intptr == -1)
|
if (*activep && *intptr == -1)
|
||||||
*intptr = value;
|
*intptr = value;
|
||||||
break;
|
break;
|
||||||
@ -547,7 +547,7 @@ parse_int:
|
|||||||
fatal("%.200s line %d: Missing argument.", filename, linenum);
|
fatal("%.200s line %d: Missing argument.", filename, linenum);
|
||||||
if (!ciphers_valid(arg))
|
if (!ciphers_valid(arg))
|
||||||
fatal("%.200s line %d: Bad SSH2 cipher spec '%s'.",
|
fatal("%.200s line %d: Bad SSH2 cipher spec '%s'.",
|
||||||
filename, linenum, arg ? arg : "<NONE>");
|
filename, linenum, arg ? arg : "<NONE>");
|
||||||
if (*activep && options->ciphers == NULL)
|
if (*activep && options->ciphers == NULL)
|
||||||
options->ciphers = xstrdup(arg);
|
options->ciphers = xstrdup(arg);
|
||||||
break;
|
break;
|
||||||
@ -558,7 +558,7 @@ parse_int:
|
|||||||
fatal("%.200s line %d: Missing argument.", filename, linenum);
|
fatal("%.200s line %d: Missing argument.", filename, linenum);
|
||||||
if (!mac_valid(arg))
|
if (!mac_valid(arg))
|
||||||
fatal("%.200s line %d: Bad SSH2 Mac spec '%s'.",
|
fatal("%.200s line %d: Bad SSH2 Mac spec '%s'.",
|
||||||
filename, linenum, arg ? arg : "<NONE>");
|
filename, linenum, arg ? arg : "<NONE>");
|
||||||
if (*activep && options->macs == NULL)
|
if (*activep && options->macs == NULL)
|
||||||
options->macs = xstrdup(arg);
|
options->macs = xstrdup(arg);
|
||||||
break;
|
break;
|
||||||
@ -569,7 +569,7 @@ parse_int:
|
|||||||
fatal("%.200s line %d: Missing argument.", filename, linenum);
|
fatal("%.200s line %d: Missing argument.", filename, linenum);
|
||||||
if (!key_names_valid2(arg))
|
if (!key_names_valid2(arg))
|
||||||
fatal("%.200s line %d: Bad protocol 2 host key algorithms '%s'.",
|
fatal("%.200s line %d: Bad protocol 2 host key algorithms '%s'.",
|
||||||
filename, linenum, arg ? arg : "<NONE>");
|
filename, linenum, arg ? arg : "<NONE>");
|
||||||
if (*activep && options->hostkeyalgorithms == NULL)
|
if (*activep && options->hostkeyalgorithms == NULL)
|
||||||
options->hostkeyalgorithms = xstrdup(arg);
|
options->hostkeyalgorithms = xstrdup(arg);
|
||||||
break;
|
break;
|
||||||
@ -582,7 +582,7 @@ parse_int:
|
|||||||
value = proto_spec(arg);
|
value = proto_spec(arg);
|
||||||
if (value == SSH_PROTO_UNKNOWN)
|
if (value == SSH_PROTO_UNKNOWN)
|
||||||
fatal("%.200s line %d: Bad protocol spec '%s'.",
|
fatal("%.200s line %d: Bad protocol spec '%s'.",
|
||||||
filename, linenum, arg ? arg : "<NONE>");
|
filename, linenum, arg ? arg : "<NONE>");
|
||||||
if (*activep && *intptr == SSH_PROTO_UNKNOWN)
|
if (*activep && *intptr == SSH_PROTO_UNKNOWN)
|
||||||
*intptr = value;
|
*intptr = value;
|
||||||
break;
|
break;
|
||||||
@ -593,7 +593,7 @@ parse_int:
|
|||||||
value = log_level_number(arg);
|
value = log_level_number(arg);
|
||||||
if (value == (LogLevel) - 1)
|
if (value == (LogLevel) - 1)
|
||||||
fatal("%.200s line %d: unsupported log level '%s'",
|
fatal("%.200s line %d: unsupported log level '%s'",
|
||||||
filename, linenum, arg ? arg : "<NONE>");
|
filename, linenum, arg ? arg : "<NONE>");
|
||||||
if (*activep && (LogLevel) * intptr == -1)
|
if (*activep && (LogLevel) * intptr == -1)
|
||||||
*intptr = (LogLevel) value;
|
*intptr = (LogLevel) value;
|
||||||
break;
|
break;
|
||||||
@ -670,7 +670,7 @@ parse_int:
|
|||||||
value = SSH_ESCAPECHAR_NONE;
|
value = SSH_ESCAPECHAR_NONE;
|
||||||
else {
|
else {
|
||||||
fatal("%.200s line %d: Bad escape character.",
|
fatal("%.200s line %d: Bad escape character.",
|
||||||
filename, linenum);
|
filename, linenum);
|
||||||
/* NOTREACHED */
|
/* NOTREACHED */
|
||||||
value = 0; /* Avoid compiler warning. */
|
value = 0; /* Avoid compiler warning. */
|
||||||
}
|
}
|
||||||
@ -685,7 +685,7 @@ parse_int:
|
|||||||
/* Check that there is no garbage at end of line. */
|
/* Check that there is no garbage at end of line. */
|
||||||
if ((arg = strdelim(&s)) != NULL && *arg != '\0') {
|
if ((arg = strdelim(&s)) != NULL && *arg != '\0') {
|
||||||
fatal("%.200s line %d: garbage at end of line; \"%.200s\".",
|
fatal("%.200s line %d: garbage at end of line; \"%.200s\".",
|
||||||
filename, linenum, arg);
|
filename, linenum, arg);
|
||||||
}
|
}
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@ -727,7 +727,7 @@ read_config_file(const char *filename, const char *host, Options *options)
|
|||||||
fclose(f);
|
fclose(f);
|
||||||
if (bad_options > 0)
|
if (bad_options > 0)
|
||||||
fatal("%s: terminating, %d bad configuration options",
|
fatal("%s: terminating, %d bad configuration options",
|
||||||
filename, bad_options);
|
filename, bad_options);
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
351
rijndael.c
351
rijndael.c
@ -1,4 +1,4 @@
|
|||||||
/* $OpenBSD: rijndael.c,v 1.12 2001/09/13 09:48:39 markus Exp $ */
|
/* $OpenBSD: rijndael.c,v 1.13 2001/12/19 07:18:56 deraadt Exp $ */
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* rijndael-alg-fst.c
|
* rijndael-alg-fst.c
|
||||||
@ -775,32 +775,31 @@ static int rijndaelKeySetupEnc(u32 rk[/*4*(Nr + 1)*/], const u8 cipherKey[], int
|
|||||||
rk[6] = GETU32(cipherKey + 24);
|
rk[6] = GETU32(cipherKey + 24);
|
||||||
rk[7] = GETU32(cipherKey + 28);
|
rk[7] = GETU32(cipherKey + 28);
|
||||||
if (keyBits == 256) {
|
if (keyBits == 256) {
|
||||||
for (;;) {
|
for (;;) {
|
||||||
temp = rk[ 7];
|
temp = rk[ 7];
|
||||||
rk[ 8] = rk[ 0] ^
|
rk[ 8] = rk[ 0] ^
|
||||||
(Te4[(temp >> 16) & 0xff] & 0xff000000) ^
|
(Te4[(temp >> 16) & 0xff] & 0xff000000) ^
|
||||||
(Te4[(temp >> 8) & 0xff] & 0x00ff0000) ^
|
(Te4[(temp >> 8) & 0xff] & 0x00ff0000) ^
|
||||||
(Te4[(temp ) & 0xff] & 0x0000ff00) ^
|
(Te4[(temp ) & 0xff] & 0x0000ff00) ^
|
||||||
(Te4[(temp >> 24) ] & 0x000000ff) ^
|
(Te4[(temp >> 24) ] & 0x000000ff) ^
|
||||||
rcon[i];
|
rcon[i];
|
||||||
rk[ 9] = rk[ 1] ^ rk[ 8];
|
rk[ 9] = rk[ 1] ^ rk[ 8];
|
||||||
rk[10] = rk[ 2] ^ rk[ 9];
|
rk[10] = rk[ 2] ^ rk[ 9];
|
||||||
rk[11] = rk[ 3] ^ rk[10];
|
rk[11] = rk[ 3] ^ rk[10];
|
||||||
if (++i == 7) {
|
if (++i == 7) {
|
||||||
return 14;
|
return 14;
|
||||||
}
|
}
|
||||||
temp = rk[11];
|
temp = rk[11];
|
||||||
rk[12] = rk[ 4] ^
|
rk[12] = rk[ 4] ^
|
||||||
(Te4[(temp >> 24) ] & 0xff000000) ^
|
(Te4[(temp >> 24) ] & 0xff000000) ^
|
||||||
(Te4[(temp >> 16) & 0xff] & 0x00ff0000) ^
|
(Te4[(temp >> 16) & 0xff] & 0x00ff0000) ^
|
||||||
(Te4[(temp >> 8) & 0xff] & 0x0000ff00) ^
|
(Te4[(temp >> 8) & 0xff] & 0x0000ff00) ^
|
||||||
(Te4[(temp ) & 0xff] & 0x000000ff);
|
(Te4[(temp ) & 0xff] & 0x000000ff);
|
||||||
rk[13] = rk[ 5] ^ rk[12];
|
rk[13] = rk[ 5] ^ rk[12];
|
||||||
rk[14] = rk[ 6] ^ rk[13];
|
rk[14] = rk[ 6] ^ rk[13];
|
||||||
rk[15] = rk[ 7] ^ rk[14];
|
rk[15] = rk[ 7] ^ rk[14];
|
||||||
|
|
||||||
rk += 8;
|
rk += 8;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@ -917,28 +916,28 @@ static void rijndaelEncrypt(const u32 rk[/*4*(Nr + 1)*/], int Nr, const u8 pt[16
|
|||||||
t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >> 8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[38];
|
t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >> 8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[38];
|
||||||
t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >> 8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[39];
|
t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >> 8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[39];
|
||||||
if (Nr > 10) {
|
if (Nr > 10) {
|
||||||
/* round 10: */
|
/* round 10: */
|
||||||
s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >> 8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[40];
|
s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >> 8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[40];
|
||||||
s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >> 8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[41];
|
s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >> 8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[41];
|
||||||
s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >> 8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[42];
|
s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >> 8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[42];
|
||||||
s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >> 8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[43];
|
s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >> 8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[43];
|
||||||
/* round 11: */
|
/* round 11: */
|
||||||
t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >> 8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[44];
|
t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >> 8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[44];
|
||||||
t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >> 8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[45];
|
t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >> 8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[45];
|
||||||
t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >> 8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[46];
|
t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >> 8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[46];
|
||||||
t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >> 8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[47];
|
t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >> 8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[47];
|
||||||
if (Nr > 12) {
|
if (Nr > 12) {
|
||||||
/* round 12: */
|
/* round 12: */
|
||||||
s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >> 8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[48];
|
s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >> 8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[48];
|
||||||
s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >> 8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[49];
|
s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >> 8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[49];
|
||||||
s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >> 8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[50];
|
s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >> 8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[50];
|
||||||
s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >> 8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[51];
|
s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >> 8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[51];
|
||||||
/* round 13: */
|
/* round 13: */
|
||||||
t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >> 8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[52];
|
t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >> 8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[52];
|
||||||
t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >> 8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[53];
|
t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >> 8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[53];
|
||||||
t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >> 8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[54];
|
t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >> 8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[54];
|
||||||
t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >> 8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[55];
|
t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >> 8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[55];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
rk += Nr << 2;
|
rk += Nr << 2;
|
||||||
#else /* !FULL_UNROLL */
|
#else /* !FULL_UNROLL */
|
||||||
@ -947,60 +946,60 @@ static void rijndaelEncrypt(const u32 rk[/*4*(Nr + 1)*/], int Nr, const u8 pt[16
|
|||||||
*/
|
*/
|
||||||
r = Nr >> 1;
|
r = Nr >> 1;
|
||||||
for (;;) {
|
for (;;) {
|
||||||
t0 =
|
t0 =
|
||||||
Te0[(s0 >> 24) ] ^
|
Te0[(s0 >> 24) ] ^
|
||||||
Te1[(s1 >> 16) & 0xff] ^
|
Te1[(s1 >> 16) & 0xff] ^
|
||||||
Te2[(s2 >> 8) & 0xff] ^
|
Te2[(s2 >> 8) & 0xff] ^
|
||||||
Te3[(s3 ) & 0xff] ^
|
Te3[(s3 ) & 0xff] ^
|
||||||
rk[4];
|
rk[4];
|
||||||
t1 =
|
t1 =
|
||||||
Te0[(s1 >> 24) ] ^
|
Te0[(s1 >> 24) ] ^
|
||||||
Te1[(s2 >> 16) & 0xff] ^
|
Te1[(s2 >> 16) & 0xff] ^
|
||||||
Te2[(s3 >> 8) & 0xff] ^
|
Te2[(s3 >> 8) & 0xff] ^
|
||||||
Te3[(s0 ) & 0xff] ^
|
Te3[(s0 ) & 0xff] ^
|
||||||
rk[5];
|
rk[5];
|
||||||
t2 =
|
t2 =
|
||||||
Te0[(s2 >> 24) ] ^
|
Te0[(s2 >> 24) ] ^
|
||||||
Te1[(s3 >> 16) & 0xff] ^
|
Te1[(s3 >> 16) & 0xff] ^
|
||||||
Te2[(s0 >> 8) & 0xff] ^
|
Te2[(s0 >> 8) & 0xff] ^
|
||||||
Te3[(s1 ) & 0xff] ^
|
Te3[(s1 ) & 0xff] ^
|
||||||
rk[6];
|
rk[6];
|
||||||
t3 =
|
t3 =
|
||||||
Te0[(s3 >> 24) ] ^
|
Te0[(s3 >> 24) ] ^
|
||||||
Te1[(s0 >> 16) & 0xff] ^
|
Te1[(s0 >> 16) & 0xff] ^
|
||||||
Te2[(s1 >> 8) & 0xff] ^
|
Te2[(s1 >> 8) & 0xff] ^
|
||||||
Te3[(s2 ) & 0xff] ^
|
Te3[(s2 ) & 0xff] ^
|
||||||
rk[7];
|
rk[7];
|
||||||
|
|
||||||
rk += 8;
|
rk += 8;
|
||||||
if (--r == 0) {
|
if (--r == 0) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
s0 =
|
s0 =
|
||||||
Te0[(t0 >> 24) ] ^
|
Te0[(t0 >> 24) ] ^
|
||||||
Te1[(t1 >> 16) & 0xff] ^
|
Te1[(t1 >> 16) & 0xff] ^
|
||||||
Te2[(t2 >> 8) & 0xff] ^
|
Te2[(t2 >> 8) & 0xff] ^
|
||||||
Te3[(t3 ) & 0xff] ^
|
Te3[(t3 ) & 0xff] ^
|
||||||
rk[0];
|
rk[0];
|
||||||
s1 =
|
s1 =
|
||||||
Te0[(t1 >> 24) ] ^
|
Te0[(t1 >> 24) ] ^
|
||||||
Te1[(t2 >> 16) & 0xff] ^
|
Te1[(t2 >> 16) & 0xff] ^
|
||||||
Te2[(t3 >> 8) & 0xff] ^
|
Te2[(t3 >> 8) & 0xff] ^
|
||||||
Te3[(t0 ) & 0xff] ^
|
Te3[(t0 ) & 0xff] ^
|
||||||
rk[1];
|
rk[1];
|
||||||
s2 =
|
s2 =
|
||||||
Te0[(t2 >> 24) ] ^
|
Te0[(t2 >> 24) ] ^
|
||||||
Te1[(t3 >> 16) & 0xff] ^
|
Te1[(t3 >> 16) & 0xff] ^
|
||||||
Te2[(t0 >> 8) & 0xff] ^
|
Te2[(t0 >> 8) & 0xff] ^
|
||||||
Te3[(t1 ) & 0xff] ^
|
Te3[(t1 ) & 0xff] ^
|
||||||
rk[2];
|
rk[2];
|
||||||
s3 =
|
s3 =
|
||||||
Te0[(t3 >> 24) ] ^
|
Te0[(t3 >> 24) ] ^
|
||||||
Te1[(t0 >> 16) & 0xff] ^
|
Te1[(t0 >> 16) & 0xff] ^
|
||||||
Te2[(t1 >> 8) & 0xff] ^
|
Te2[(t1 >> 8) & 0xff] ^
|
||||||
Te3[(t2 ) & 0xff] ^
|
Te3[(t2 ) & 0xff] ^
|
||||||
rk[3];
|
rk[3];
|
||||||
}
|
}
|
||||||
#endif /* ?FULL_UNROLL */
|
#endif /* ?FULL_UNROLL */
|
||||||
/*
|
/*
|
||||||
@ -1098,28 +1097,28 @@ static void rijndaelDecrypt(const u32 rk[/*4*(Nr + 1)*/], int Nr, const u8 ct[16
|
|||||||
t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >> 8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[38];
|
t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >> 8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[38];
|
||||||
t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >> 8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[39];
|
t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >> 8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[39];
|
||||||
if (Nr > 10) {
|
if (Nr > 10) {
|
||||||
/* round 10: */
|
/* round 10: */
|
||||||
s0 = Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >> 8) & 0xff] ^ Td3[t1 & 0xff] ^ rk[40];
|
s0 = Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >> 8) & 0xff] ^ Td3[t1 & 0xff] ^ rk[40];
|
||||||
s1 = Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >> 8) & 0xff] ^ Td3[t2 & 0xff] ^ rk[41];
|
s1 = Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >> 8) & 0xff] ^ Td3[t2 & 0xff] ^ rk[41];
|
||||||
s2 = Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >> 8) & 0xff] ^ Td3[t3 & 0xff] ^ rk[42];
|
s2 = Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >> 8) & 0xff] ^ Td3[t3 & 0xff] ^ rk[42];
|
||||||
s3 = Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >> 8) & 0xff] ^ Td3[t0 & 0xff] ^ rk[43];
|
s3 = Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >> 8) & 0xff] ^ Td3[t0 & 0xff] ^ rk[43];
|
||||||
/* round 11: */
|
/* round 11: */
|
||||||
t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >> 8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[44];
|
t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >> 8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[44];
|
||||||
t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >> 8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[45];
|
t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >> 8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[45];
|
||||||
t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >> 8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[46];
|
t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >> 8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[46];
|
||||||
t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >> 8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[47];
|
t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >> 8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[47];
|
||||||
if (Nr > 12) {
|
if (Nr > 12) {
|
||||||
/* round 12: */
|
/* round 12: */
|
||||||
s0 = Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >> 8) & 0xff] ^ Td3[t1 & 0xff] ^ rk[48];
|
s0 = Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >> 8) & 0xff] ^ Td3[t1 & 0xff] ^ rk[48];
|
||||||
s1 = Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >> 8) & 0xff] ^ Td3[t2 & 0xff] ^ rk[49];
|
s1 = Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >> 8) & 0xff] ^ Td3[t2 & 0xff] ^ rk[49];
|
||||||
s2 = Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >> 8) & 0xff] ^ Td3[t3 & 0xff] ^ rk[50];
|
s2 = Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >> 8) & 0xff] ^ Td3[t3 & 0xff] ^ rk[50];
|
||||||
s3 = Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >> 8) & 0xff] ^ Td3[t0 & 0xff] ^ rk[51];
|
s3 = Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >> 8) & 0xff] ^ Td3[t0 & 0xff] ^ rk[51];
|
||||||
/* round 13: */
|
/* round 13: */
|
||||||
t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >> 8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[52];
|
t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >> 8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[52];
|
||||||
t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >> 8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[53];
|
t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >> 8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[53];
|
||||||
t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >> 8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[54];
|
t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >> 8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[54];
|
||||||
t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >> 8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[55];
|
t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >> 8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[55];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
rk += Nr << 2;
|
rk += Nr << 2;
|
||||||
#else /* !FULL_UNROLL */
|
#else /* !FULL_UNROLL */
|
||||||
@ -1128,60 +1127,60 @@ static void rijndaelDecrypt(const u32 rk[/*4*(Nr + 1)*/], int Nr, const u8 ct[16
|
|||||||
*/
|
*/
|
||||||
r = Nr >> 1;
|
r = Nr >> 1;
|
||||||
for (;;) {
|
for (;;) {
|
||||||
t0 =
|
t0 =
|
||||||
Td0[(s0 >> 24) ] ^
|
Td0[(s0 >> 24) ] ^
|
||||||
Td1[(s3 >> 16) & 0xff] ^
|
Td1[(s3 >> 16) & 0xff] ^
|
||||||
Td2[(s2 >> 8) & 0xff] ^
|
Td2[(s2 >> 8) & 0xff] ^
|
||||||
Td3[(s1 ) & 0xff] ^
|
Td3[(s1 ) & 0xff] ^
|
||||||
rk[4];
|
rk[4];
|
||||||
t1 =
|
t1 =
|
||||||
Td0[(s1 >> 24) ] ^
|
Td0[(s1 >> 24) ] ^
|
||||||
Td1[(s0 >> 16) & 0xff] ^
|
Td1[(s0 >> 16) & 0xff] ^
|
||||||
Td2[(s3 >> 8) & 0xff] ^
|
Td2[(s3 >> 8) & 0xff] ^
|
||||||
Td3[(s2 ) & 0xff] ^
|
Td3[(s2 ) & 0xff] ^
|
||||||
rk[5];
|
rk[5];
|
||||||
t2 =
|
t2 =
|
||||||
Td0[(s2 >> 24) ] ^
|
Td0[(s2 >> 24) ] ^
|
||||||
Td1[(s1 >> 16) & 0xff] ^
|
Td1[(s1 >> 16) & 0xff] ^
|
||||||
Td2[(s0 >> 8) & 0xff] ^
|
Td2[(s0 >> 8) & 0xff] ^
|
||||||
Td3[(s3 ) & 0xff] ^
|
Td3[(s3 ) & 0xff] ^
|
||||||
rk[6];
|
rk[6];
|
||||||
t3 =
|
t3 =
|
||||||
Td0[(s3 >> 24) ] ^
|
Td0[(s3 >> 24) ] ^
|
||||||
Td1[(s2 >> 16) & 0xff] ^
|
Td1[(s2 >> 16) & 0xff] ^
|
||||||
Td2[(s1 >> 8) & 0xff] ^
|
Td2[(s1 >> 8) & 0xff] ^
|
||||||
Td3[(s0 ) & 0xff] ^
|
Td3[(s0 ) & 0xff] ^
|
||||||
rk[7];
|
rk[7];
|
||||||
|
|
||||||
rk += 8;
|
rk += 8;
|
||||||
if (--r == 0) {
|
if (--r == 0) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
s0 =
|
s0 =
|
||||||
Td0[(t0 >> 24) ] ^
|
Td0[(t0 >> 24) ] ^
|
||||||
Td1[(t3 >> 16) & 0xff] ^
|
Td1[(t3 >> 16) & 0xff] ^
|
||||||
Td2[(t2 >> 8) & 0xff] ^
|
Td2[(t2 >> 8) & 0xff] ^
|
||||||
Td3[(t1 ) & 0xff] ^
|
Td3[(t1 ) & 0xff] ^
|
||||||
rk[0];
|
rk[0];
|
||||||
s1 =
|
s1 =
|
||||||
Td0[(t1 >> 24) ] ^
|
Td0[(t1 >> 24) ] ^
|
||||||
Td1[(t0 >> 16) & 0xff] ^
|
Td1[(t0 >> 16) & 0xff] ^
|
||||||
Td2[(t3 >> 8) & 0xff] ^
|
Td2[(t3 >> 8) & 0xff] ^
|
||||||
Td3[(t2 ) & 0xff] ^
|
Td3[(t2 ) & 0xff] ^
|
||||||
rk[1];
|
rk[1];
|
||||||
s2 =
|
s2 =
|
||||||
Td0[(t2 >> 24) ] ^
|
Td0[(t2 >> 24) ] ^
|
||||||
Td1[(t1 >> 16) & 0xff] ^
|
Td1[(t1 >> 16) & 0xff] ^
|
||||||
Td2[(t0 >> 8) & 0xff] ^
|
Td2[(t0 >> 8) & 0xff] ^
|
||||||
Td3[(t3 ) & 0xff] ^
|
Td3[(t3 ) & 0xff] ^
|
||||||
rk[2];
|
rk[2];
|
||||||
s3 =
|
s3 =
|
||||||
Td0[(t3 >> 24) ] ^
|
Td0[(t3 >> 24) ] ^
|
||||||
Td1[(t2 >> 16) & 0xff] ^
|
Td1[(t2 >> 16) & 0xff] ^
|
||||||
Td2[(t1 >> 8) & 0xff] ^
|
Td2[(t1 >> 8) & 0xff] ^
|
||||||
Td3[(t0 ) & 0xff] ^
|
Td3[(t0 ) & 0xff] ^
|
||||||
rk[3];
|
rk[3];
|
||||||
}
|
}
|
||||||
#endif /* ?FULL_UNROLL */
|
#endif /* ?FULL_UNROLL */
|
||||||
/*
|
/*
|
||||||
@ -1222,13 +1221,13 @@ void
|
|||||||
rijndael_set_key(rijndael_ctx *ctx, u_char *key, int bits, int encrypt)
|
rijndael_set_key(rijndael_ctx *ctx, u_char *key, int bits, int encrypt)
|
||||||
{
|
{
|
||||||
ctx->Nr = rijndaelKeySetupEnc(ctx->ek, key, bits);
|
ctx->Nr = rijndaelKeySetupEnc(ctx->ek, key, bits);
|
||||||
if (encrypt) {
|
if (encrypt) {
|
||||||
ctx->decrypt = 0;
|
ctx->decrypt = 0;
|
||||||
memset(ctx->dk, 0, sizeof(ctx->dk));
|
memset(ctx->dk, 0, sizeof(ctx->dk));
|
||||||
} else {
|
} else {
|
||||||
ctx->decrypt = 1;
|
ctx->decrypt = 1;
|
||||||
memcpy(ctx->dk, ctx->ek, sizeof(ctx->ek));
|
memcpy(ctx->dk, ctx->ek, sizeof(ctx->ek));
|
||||||
rijndaelKeySetupDec(ctx->dk, key, bits, ctx->Nr);
|
rijndaelKeySetupDec(ctx->dk, key, bits, ctx->Nr);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
/* $OpenBSD: rijndael.h,v 1.11 2001/09/13 09:48:39 markus Exp $ */
|
/* $OpenBSD: rijndael.h,v 1.12 2001/12/19 07:18:56 deraadt Exp $ */
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* rijndael-alg-fst.h
|
* rijndael-alg-fst.h
|
||||||
|
|||||||
8
scard.c
8
scard.c
@ -24,7 +24,7 @@
|
|||||||
|
|
||||||
#include "includes.h"
|
#include "includes.h"
|
||||||
#ifdef SMARTCARD
|
#ifdef SMARTCARD
|
||||||
RCSID("$OpenBSD: scard.c,v 1.15 2001/09/28 09:49:31 djm Exp $");
|
RCSID("$OpenBSD: scard.c,v 1.16 2001/12/19 07:18:56 deraadt Exp $");
|
||||||
|
|
||||||
#include <openssl/engine.h>
|
#include <openssl/engine.h>
|
||||||
#include <sectok.h>
|
#include <sectok.h>
|
||||||
@ -133,7 +133,7 @@ sc_read_pubkey(Key * k)
|
|||||||
|
|
||||||
/* get key size */
|
/* get key size */
|
||||||
sectok_apdu(sc_fd, CLA_SSH, INS_GET_KEYLENGTH, 0, 0, 0, NULL,
|
sectok_apdu(sc_fd, CLA_SSH, INS_GET_KEYLENGTH, 0, 0, 0, NULL,
|
||||||
sizeof(buf), buf, &sw);
|
sizeof(buf), buf, &sw);
|
||||||
if (!sectok_swOK(sw)) {
|
if (!sectok_swOK(sw)) {
|
||||||
error("could not obtain key length: %s", sectok_get_sw(sw));
|
error("could not obtain key length: %s", sectok_get_sw(sw));
|
||||||
goto err;
|
goto err;
|
||||||
@ -204,7 +204,7 @@ sc_private_decrypt(int flen, u_char *from, u_char *to, RSA *rsa, int padding)
|
|||||||
goto err;
|
goto err;
|
||||||
}
|
}
|
||||||
sectok_apdu(sc_fd, CLA_SSH, INS_GET_RESPONSE, 0, 0, 0, NULL,
|
sectok_apdu(sc_fd, CLA_SSH, INS_GET_RESPONSE, 0, 0, 0, NULL,
|
||||||
len, padded, &sw);
|
len, padded, &sw);
|
||||||
if (!sectok_swOK(sw)) {
|
if (!sectok_swOK(sw)) {
|
||||||
error("sc_private_decrypt: INS_GET_RESPONSE failed: %s",
|
error("sc_private_decrypt: INS_GET_RESPONSE failed: %s",
|
||||||
sectok_get_sw(sw));
|
sectok_get_sw(sw));
|
||||||
@ -249,7 +249,7 @@ sc_private_encrypt(int flen, u_char *from, u_char *to, RSA *rsa, int padding)
|
|||||||
goto err;
|
goto err;
|
||||||
}
|
}
|
||||||
sectok_apdu(sc_fd, CLA_SSH, INS_GET_RESPONSE, 0, 0, 0, NULL,
|
sectok_apdu(sc_fd, CLA_SSH, INS_GET_RESPONSE, 0, 0, 0, NULL,
|
||||||
len, to, &sw);
|
len, to, &sw);
|
||||||
if (!sectok_swOK(sw)) {
|
if (!sectok_swOK(sw)) {
|
||||||
error("sc_private_decrypt: INS_GET_RESPONSE failed: %s",
|
error("sc_private_decrypt: INS_GET_RESPONSE failed: %s",
|
||||||
sectok_get_sw(sw));
|
sectok_get_sw(sw));
|
||||||
|
|||||||
14
servconf.c
14
servconf.c
@ -10,7 +10,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "includes.h"
|
#include "includes.h"
|
||||||
RCSID("$OpenBSD: servconf.c,v 1.94 2001/12/06 13:30:05 markus Exp $");
|
RCSID("$OpenBSD: servconf.c,v 1.95 2001/12/19 07:18:56 deraadt Exp $");
|
||||||
|
|
||||||
#if defined(KRB4) || defined(KRB5)
|
#if defined(KRB4) || defined(KRB5)
|
||||||
#include <krb.h>
|
#include <krb.h>
|
||||||
@ -772,7 +772,7 @@ parse_flag:
|
|||||||
value = proto_spec(arg);
|
value = proto_spec(arg);
|
||||||
if (value == SSH_PROTO_UNKNOWN)
|
if (value == SSH_PROTO_UNKNOWN)
|
||||||
fatal("%s line %d: Bad protocol spec '%s'.",
|
fatal("%s line %d: Bad protocol spec '%s'.",
|
||||||
filename, linenum, arg ? arg : "<NONE>");
|
filename, linenum, arg ? arg : "<NONE>");
|
||||||
if (*intptr == SSH_PROTO_UNKNOWN)
|
if (*intptr == SSH_PROTO_UNKNOWN)
|
||||||
*intptr = value;
|
*intptr = value;
|
||||||
break;
|
break;
|
||||||
@ -780,21 +780,21 @@ parse_flag:
|
|||||||
case sSubsystem:
|
case sSubsystem:
|
||||||
if (options->num_subsystems >= MAX_SUBSYSTEMS) {
|
if (options->num_subsystems >= MAX_SUBSYSTEMS) {
|
||||||
fatal("%s line %d: too many subsystems defined.",
|
fatal("%s line %d: too many subsystems defined.",
|
||||||
filename, linenum);
|
filename, linenum);
|
||||||
}
|
}
|
||||||
arg = strdelim(&cp);
|
arg = strdelim(&cp);
|
||||||
if (!arg || *arg == '\0')
|
if (!arg || *arg == '\0')
|
||||||
fatal("%s line %d: Missing subsystem name.",
|
fatal("%s line %d: Missing subsystem name.",
|
||||||
filename, linenum);
|
filename, linenum);
|
||||||
for (i = 0; i < options->num_subsystems; i++)
|
for (i = 0; i < options->num_subsystems; i++)
|
||||||
if (strcmp(arg, options->subsystem_name[i]) == 0)
|
if (strcmp(arg, options->subsystem_name[i]) == 0)
|
||||||
fatal("%s line %d: Subsystem '%s' already defined.",
|
fatal("%s line %d: Subsystem '%s' already defined.",
|
||||||
filename, linenum, arg);
|
filename, linenum, arg);
|
||||||
options->subsystem_name[options->num_subsystems] = xstrdup(arg);
|
options->subsystem_name[options->num_subsystems] = xstrdup(arg);
|
||||||
arg = strdelim(&cp);
|
arg = strdelim(&cp);
|
||||||
if (!arg || *arg == '\0')
|
if (!arg || *arg == '\0')
|
||||||
fatal("%s line %d: Missing subsystem command.",
|
fatal("%s line %d: Missing subsystem command.",
|
||||||
filename, linenum);
|
filename, linenum);
|
||||||
options->subsystem_command[options->num_subsystems] = xstrdup(arg);
|
options->subsystem_command[options->num_subsystems] = xstrdup(arg);
|
||||||
options->num_subsystems++;
|
options->num_subsystems++;
|
||||||
break;
|
break;
|
||||||
@ -803,7 +803,7 @@ parse_flag:
|
|||||||
arg = strdelim(&cp);
|
arg = strdelim(&cp);
|
||||||
if (!arg || *arg == '\0')
|
if (!arg || *arg == '\0')
|
||||||
fatal("%s line %d: Missing MaxStartups spec.",
|
fatal("%s line %d: Missing MaxStartups spec.",
|
||||||
filename, linenum);
|
filename, linenum);
|
||||||
if ((n = sscanf(arg, "%d:%d:%d",
|
if ((n = sscanf(arg, "%d:%d:%d",
|
||||||
&options->max_startups_begin,
|
&options->max_startups_begin,
|
||||||
&options->max_startups_rate,
|
&options->max_startups_rate,
|
||||||
|
|||||||
@ -11,7 +11,7 @@
|
|||||||
* called by a name other than "ssh" or "Secure Shell".
|
* called by a name other than "ssh" or "Secure Shell".
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/* RCSID("$OpenBSD: servconf.h,v 1.50 2001/12/06 13:30:05 markus Exp $"); */
|
/* RCSID("$OpenBSD: servconf.h,v 1.51 2001/12/19 07:18:56 deraadt Exp $"); */
|
||||||
|
|
||||||
#ifndef SERVCONF_H
|
#ifndef SERVCONF_H
|
||||||
#define SERVCONF_H
|
#define SERVCONF_H
|
||||||
|
|||||||
@ -35,7 +35,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "includes.h"
|
#include "includes.h"
|
||||||
RCSID("$OpenBSD: serverloop.c,v 1.85 2001/12/05 03:50:01 itojun Exp $");
|
RCSID("$OpenBSD: serverloop.c,v 1.86 2001/12/19 07:18:56 deraadt Exp $");
|
||||||
|
|
||||||
#include "xmalloc.h"
|
#include "xmalloc.h"
|
||||||
#include "packet.h"
|
#include "packet.h"
|
||||||
@ -598,7 +598,7 @@ server_loop(pid_t pid, int fdin_arg, int fdout_arg, int fderr_arg)
|
|||||||
drain_output();
|
drain_output();
|
||||||
|
|
||||||
debug("End of interactive session; stdin %ld, stdout (read %ld, sent %ld), stderr %ld bytes.",
|
debug("End of interactive session; stdin %ld, stdout (read %ld, sent %ld), stderr %ld bytes.",
|
||||||
stdin_bytes, fdout_bytes, stdout_bytes, stderr_bytes);
|
stdin_bytes, fdout_bytes, stdout_bytes, stderr_bytes);
|
||||||
|
|
||||||
/* Free and clear the buffers. */
|
/* Free and clear the buffers. */
|
||||||
buffer_free(&stdin_buffer);
|
buffer_free(&stdin_buffer);
|
||||||
|
|||||||
30
session.c
30
session.c
@ -33,7 +33,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "includes.h"
|
#include "includes.h"
|
||||||
RCSID("$OpenBSD: session.c,v 1.111 2001/12/06 18:09:23 stevesk Exp $");
|
RCSID("$OpenBSD: session.c,v 1.112 2001/12/19 07:18:56 deraadt Exp $");
|
||||||
|
|
||||||
#include "ssh.h"
|
#include "ssh.h"
|
||||||
#include "ssh1.h"
|
#include "ssh1.h"
|
||||||
@ -258,7 +258,7 @@ do_authenticated1(Authctxt *authctxt)
|
|||||||
compression_level = packet_get_int();
|
compression_level = packet_get_int();
|
||||||
if (compression_level < 1 || compression_level > 9) {
|
if (compression_level < 1 || compression_level > 9) {
|
||||||
packet_send_debug("Received illegal compression level %d.",
|
packet_send_debug("Received illegal compression level %d.",
|
||||||
compression_level);
|
compression_level);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
/* Enable compression after we have responded with SUCCESS. */
|
/* Enable compression after we have responded with SUCCESS. */
|
||||||
@ -649,7 +649,7 @@ do_pre_login(Session *s)
|
|||||||
if (packet_connection_is_on_socket()) {
|
if (packet_connection_is_on_socket()) {
|
||||||
fromlen = sizeof(from);
|
fromlen = sizeof(from);
|
||||||
if (getpeername(packet_get_connection_in(),
|
if (getpeername(packet_get_connection_in(),
|
||||||
(struct sockaddr *) & from, &fromlen) < 0) {
|
(struct sockaddr *) & from, &fromlen) < 0) {
|
||||||
debug("getpeername: %.100s", strerror(errno));
|
debug("getpeername: %.100s", strerror(errno));
|
||||||
fatal_cleanup();
|
fatal_cleanup();
|
||||||
}
|
}
|
||||||
@ -811,7 +811,7 @@ check_quietlogin(Session *s, const char *command)
|
|||||||
*/
|
*/
|
||||||
static void
|
static void
|
||||||
child_set_env(char ***envp, u_int *envsizep, const char *name,
|
child_set_env(char ***envp, u_int *envsizep, const char *name,
|
||||||
const char *value)
|
const char *value)
|
||||||
{
|
{
|
||||||
u_int i, namelen;
|
u_int i, namelen;
|
||||||
char **env;
|
char **env;
|
||||||
@ -852,7 +852,7 @@ child_set_env(char ***envp, u_int *envsizep, const char *name,
|
|||||||
*/
|
*/
|
||||||
static void
|
static void
|
||||||
read_environment_file(char ***env, u_int *envsize,
|
read_environment_file(char ***env, u_int *envsize,
|
||||||
const char *filename)
|
const char *filename)
|
||||||
{
|
{
|
||||||
FILE *f;
|
FILE *f;
|
||||||
char buf[4096];
|
char buf[4096];
|
||||||
@ -1304,7 +1304,7 @@ do_child(Session *s, const char *command)
|
|||||||
|
|
||||||
if (auth_get_socket_name() != NULL)
|
if (auth_get_socket_name() != NULL)
|
||||||
child_set_env(&env, &envsize, SSH_AUTHSOCKET_ENV_NAME,
|
child_set_env(&env, &envsize, SSH_AUTHSOCKET_ENV_NAME,
|
||||||
auth_get_socket_name());
|
auth_get_socket_name());
|
||||||
|
|
||||||
/* read $HOME/.ssh/environment. */
|
/* read $HOME/.ssh/environment. */
|
||||||
if (!options.use_login) {
|
if (!options.use_login) {
|
||||||
@ -1487,9 +1487,9 @@ do_child(Session *s, const char *command)
|
|||||||
|
|
||||||
execl(LOGIN_PROGRAM, "login", "-h", hostname,
|
execl(LOGIN_PROGRAM, "login", "-h", hostname,
|
||||||
#ifdef LOGIN_NEEDS_TERM
|
#ifdef LOGIN_NEEDS_TERM
|
||||||
s->term? s->term : "unknown",
|
s->term? s->term : "unknown",
|
||||||
#endif
|
#endif
|
||||||
"-p", "-f", "--", pw->pw_name, (char *)NULL);
|
"-p", "-f", "--", pw->pw_name, (char *)NULL);
|
||||||
|
|
||||||
/* Login couldn't be executed, die. */
|
/* Login couldn't be executed, die. */
|
||||||
|
|
||||||
@ -1517,12 +1517,12 @@ session_new(void)
|
|||||||
static int did_init = 0;
|
static int did_init = 0;
|
||||||
if (!did_init) {
|
if (!did_init) {
|
||||||
debug("session_new: init");
|
debug("session_new: init");
|
||||||
for(i = 0; i < MAX_SESSIONS; i++) {
|
for (i = 0; i < MAX_SESSIONS; i++) {
|
||||||
sessions[i].used = 0;
|
sessions[i].used = 0;
|
||||||
}
|
}
|
||||||
did_init = 1;
|
did_init = 1;
|
||||||
}
|
}
|
||||||
for(i = 0; i < MAX_SESSIONS; i++) {
|
for (i = 0; i < MAX_SESSIONS; i++) {
|
||||||
Session *s = &sessions[i];
|
Session *s = &sessions[i];
|
||||||
if (! s->used) {
|
if (! s->used) {
|
||||||
memset(s, 0, sizeof(*s));
|
memset(s, 0, sizeof(*s));
|
||||||
@ -1542,7 +1542,7 @@ static void
|
|||||||
session_dump(void)
|
session_dump(void)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
for(i = 0; i < MAX_SESSIONS; i++) {
|
for (i = 0; i < MAX_SESSIONS; i++) {
|
||||||
Session *s = &sessions[i];
|
Session *s = &sessions[i];
|
||||||
debug("dump: used %d session %d %p channel %d pid %d",
|
debug("dump: used %d session %d %p channel %d pid %d",
|
||||||
s->used,
|
s->used,
|
||||||
@ -1575,7 +1575,7 @@ static Session *
|
|||||||
session_by_channel(int id)
|
session_by_channel(int id)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
for(i = 0; i < MAX_SESSIONS; i++) {
|
for (i = 0; i < MAX_SESSIONS; i++) {
|
||||||
Session *s = &sessions[i];
|
Session *s = &sessions[i];
|
||||||
if (s->used && s->chanid == id) {
|
if (s->used && s->chanid == id) {
|
||||||
debug("session_by_channel: session %d channel %d", i, id);
|
debug("session_by_channel: session %d channel %d", i, id);
|
||||||
@ -1592,7 +1592,7 @@ session_by_pid(pid_t pid)
|
|||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
debug("session_by_pid: pid %d", pid);
|
debug("session_by_pid: pid %d", pid);
|
||||||
for(i = 0; i < MAX_SESSIONS; i++) {
|
for (i = 0; i < MAX_SESSIONS; i++) {
|
||||||
Session *s = &sessions[i];
|
Session *s = &sessions[i];
|
||||||
if (s->used && s->pid == pid)
|
if (s->used && s->pid == pid)
|
||||||
return s;
|
return s;
|
||||||
@ -2001,7 +2001,7 @@ void
|
|||||||
session_destroy_all(void)
|
session_destroy_all(void)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
for(i = 0; i < MAX_SESSIONS; i++) {
|
for (i = 0; i < MAX_SESSIONS; i++) {
|
||||||
Session *s = &sessions[i];
|
Session *s = &sessions[i];
|
||||||
if (s->used)
|
if (s->used)
|
||||||
session_close(s);
|
session_close(s);
|
||||||
@ -2014,7 +2014,7 @@ session_tty_list(void)
|
|||||||
static char buf[1024];
|
static char buf[1024];
|
||||||
int i;
|
int i;
|
||||||
buf[0] = '\0';
|
buf[0] = '\0';
|
||||||
for(i = 0; i < MAX_SESSIONS; i++) {
|
for (i = 0; i < MAX_SESSIONS; i++) {
|
||||||
Session *s = &sessions[i];
|
Session *s = &sessions[i];
|
||||||
if (s->used && s->ttyfd != -1) {
|
if (s->used && s->ttyfd != -1) {
|
||||||
if (buf[0] != '\0')
|
if (buf[0] != '\0')
|
||||||
|
|||||||
@ -29,7 +29,7 @@
|
|||||||
/* XXX: copy between two remote sites */
|
/* XXX: copy between two remote sites */
|
||||||
|
|
||||||
#include "includes.h"
|
#include "includes.h"
|
||||||
RCSID("$OpenBSD: sftp-client.c,v 1.18 2001/07/14 15:10:16 stevesk Exp $");
|
RCSID("$OpenBSD: sftp-client.c,v 1.19 2001/12/19 07:18:56 deraadt Exp $");
|
||||||
|
|
||||||
#include "buffer.h"
|
#include "buffer.h"
|
||||||
#include "bufaux.h"
|
#include "bufaux.h"
|
||||||
@ -309,8 +309,7 @@ do_lsreaddir(int fd_in, int fd_out, char *path, int printflag,
|
|||||||
(*dir)[0] = NULL;
|
(*dir)[0] = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
for (;;) {
|
||||||
for(;;) {
|
|
||||||
int count;
|
int count;
|
||||||
|
|
||||||
id = expected_id = msg_id++;
|
id = expected_id = msg_id++;
|
||||||
@ -356,7 +355,7 @@ do_lsreaddir(int fd_in, int fd_out, char *path, int printflag,
|
|||||||
if (count == 0)
|
if (count == 0)
|
||||||
break;
|
break;
|
||||||
debug3("Received %d SSH2_FXP_NAME responses", count);
|
debug3("Received %d SSH2_FXP_NAME responses", count);
|
||||||
for(i = 0; i < count; i++) {
|
for (i = 0; i < count; i++) {
|
||||||
char *filename, *longname;
|
char *filename, *longname;
|
||||||
Attrib *a;
|
Attrib *a;
|
||||||
|
|
||||||
@ -405,7 +404,7 @@ void free_sftp_dirents(SFTP_DIRENT **s)
|
|||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
for(i = 0; s[i]; i++) {
|
for (i = 0; s[i]; i++) {
|
||||||
xfree(s[i]->filename);
|
xfree(s[i]->filename);
|
||||||
xfree(s[i]->longname);
|
xfree(s[i]->longname);
|
||||||
xfree(s[i]);
|
xfree(s[i]);
|
||||||
@ -726,7 +725,7 @@ do_download(int fd_in, int fd_out, char *remote_path, char *local_path,
|
|||||||
|
|
||||||
/* Read from remote and write to local */
|
/* Read from remote and write to local */
|
||||||
offset = 0;
|
offset = 0;
|
||||||
for(;;) {
|
for (;;) {
|
||||||
u_int len;
|
u_int len;
|
||||||
char *data;
|
char *data;
|
||||||
|
|
||||||
@ -758,7 +757,7 @@ do_download(int fd_in, int fd_out, char *remote_path, char *local_path,
|
|||||||
else {
|
else {
|
||||||
error("Couldn't read from remote "
|
error("Couldn't read from remote "
|
||||||
"file \"%s\" : %s", remote_path,
|
"file \"%s\" : %s", remote_path,
|
||||||
fx2txt(status));
|
fx2txt(status));
|
||||||
do_close(fd_in, fd_out, handle, handle_len);
|
do_close(fd_in, fd_out, handle, handle_len);
|
||||||
goto done;
|
goto done;
|
||||||
}
|
}
|
||||||
@ -868,7 +867,7 @@ do_upload(int fd_in, int fd_out, char *local_path, char *remote_path,
|
|||||||
|
|
||||||
/* Read from local and write to remote */
|
/* Read from local and write to remote */
|
||||||
offset = 0;
|
offset = 0;
|
||||||
for(;;) {
|
for (;;) {
|
||||||
int len;
|
int len;
|
||||||
char data[COPY_SIZE];
|
char data[COPY_SIZE];
|
||||||
|
|
||||||
|
|||||||
@ -23,7 +23,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "includes.h"
|
#include "includes.h"
|
||||||
RCSID("$OpenBSD: sftp-glob.c,v 1.8 2001/07/14 15:10:17 stevesk Exp $");
|
RCSID("$OpenBSD: sftp-glob.c,v 1.9 2001/12/19 07:18:56 deraadt Exp $");
|
||||||
|
|
||||||
#include "buffer.h"
|
#include "buffer.h"
|
||||||
#include "bufaux.h"
|
#include "bufaux.h"
|
||||||
|
|||||||
18
sftp-int.c
18
sftp-int.c
@ -26,7 +26,7 @@
|
|||||||
/* XXX: recursive operations */
|
/* XXX: recursive operations */
|
||||||
|
|
||||||
#include "includes.h"
|
#include "includes.h"
|
||||||
RCSID("$OpenBSD: sftp-int.c,v 1.40 2001/08/14 09:23:02 markus Exp $");
|
RCSID("$OpenBSD: sftp-int.c,v 1.41 2001/12/19 07:18:56 deraadt Exp $");
|
||||||
|
|
||||||
#include "buffer.h"
|
#include "buffer.h"
|
||||||
#include "xmalloc.h"
|
#include "xmalloc.h"
|
||||||
@ -393,7 +393,7 @@ process_get(int in, int out, char *src, char *dst, char *pwd, int pflag)
|
|||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
|
|
||||||
for(i = 0; g.gl_pathv[i]; i++) {
|
for (i = 0; g.gl_pathv[i]; i++) {
|
||||||
if (infer_path(g.gl_pathv[i], &tmp)) {
|
if (infer_path(g.gl_pathv[i], &tmp)) {
|
||||||
err = -1;
|
err = -1;
|
||||||
goto out;
|
goto out;
|
||||||
@ -475,7 +475,7 @@ process_put(int in, int out, char *src, char *dst, char *pwd, int pflag)
|
|||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
|
|
||||||
for(i = 0; g.gl_pathv[i]; i++) {
|
for (i = 0; g.gl_pathv[i]; i++) {
|
||||||
if (infer_path(g.gl_pathv[i], &tmp)) {
|
if (infer_path(g.gl_pathv[i], &tmp)) {
|
||||||
err = -1;
|
err = -1;
|
||||||
goto out;
|
goto out;
|
||||||
@ -517,7 +517,7 @@ parse_args(const char **cpp, int *pflag, unsigned long *n_arg,
|
|||||||
return(-1);
|
return(-1);
|
||||||
|
|
||||||
/* Figure out which command we have */
|
/* Figure out which command we have */
|
||||||
for(i = 0; cmds[i].c; i++) {
|
for (i = 0; cmds[i].c; i++) {
|
||||||
int cmdlen = strlen(cmds[i].c);
|
int cmdlen = strlen(cmds[i].c);
|
||||||
|
|
||||||
/* Check for command followed by whitespace */
|
/* Check for command followed by whitespace */
|
||||||
@ -688,7 +688,7 @@ parse_dispatch_command(int in, int out, const char *cmd, char **pwd)
|
|||||||
case I_RM:
|
case I_RM:
|
||||||
path1 = make_absolute(path1, *pwd);
|
path1 = make_absolute(path1, *pwd);
|
||||||
remote_glob(in, out, path1, GLOB_NOCHECK, NULL, &g);
|
remote_glob(in, out, path1, GLOB_NOCHECK, NULL, &g);
|
||||||
for(i = 0; g.gl_pathv[i]; i++) {
|
for (i = 0; g.gl_pathv[i]; i++) {
|
||||||
printf("Removing %s\n", g.gl_pathv[i]);
|
printf("Removing %s\n", g.gl_pathv[i]);
|
||||||
if (do_rm(in, out, g.gl_pathv[i]) == -1)
|
if (do_rm(in, out, g.gl_pathv[i]) == -1)
|
||||||
err = -1;
|
err = -1;
|
||||||
@ -781,7 +781,7 @@ parse_dispatch_command(int in, int out, const char *cmd, char **pwd)
|
|||||||
a.flags |= SSH2_FILEXFER_ATTR_PERMISSIONS;
|
a.flags |= SSH2_FILEXFER_ATTR_PERMISSIONS;
|
||||||
a.perm = n_arg;
|
a.perm = n_arg;
|
||||||
remote_glob(in, out, path1, GLOB_NOCHECK, NULL, &g);
|
remote_glob(in, out, path1, GLOB_NOCHECK, NULL, &g);
|
||||||
for(i = 0; g.gl_pathv[i]; i++) {
|
for (i = 0; g.gl_pathv[i]; i++) {
|
||||||
printf("Changing mode on %s\n", g.gl_pathv[i]);
|
printf("Changing mode on %s\n", g.gl_pathv[i]);
|
||||||
do_setstat(in, out, g.gl_pathv[i], &a);
|
do_setstat(in, out, g.gl_pathv[i], &a);
|
||||||
}
|
}
|
||||||
@ -789,7 +789,7 @@ parse_dispatch_command(int in, int out, const char *cmd, char **pwd)
|
|||||||
case I_CHOWN:
|
case I_CHOWN:
|
||||||
path1 = make_absolute(path1, *pwd);
|
path1 = make_absolute(path1, *pwd);
|
||||||
remote_glob(in, out, path1, GLOB_NOCHECK, NULL, &g);
|
remote_glob(in, out, path1, GLOB_NOCHECK, NULL, &g);
|
||||||
for(i = 0; g.gl_pathv[i]; i++) {
|
for (i = 0; g.gl_pathv[i]; i++) {
|
||||||
if (!(aa = do_stat(in, out, g.gl_pathv[i], 0)))
|
if (!(aa = do_stat(in, out, g.gl_pathv[i], 0)))
|
||||||
continue;
|
continue;
|
||||||
if (!(aa->flags & SSH2_FILEXFER_ATTR_UIDGID)) {
|
if (!(aa->flags & SSH2_FILEXFER_ATTR_UIDGID)) {
|
||||||
@ -806,7 +806,7 @@ parse_dispatch_command(int in, int out, const char *cmd, char **pwd)
|
|||||||
case I_CHGRP:
|
case I_CHGRP:
|
||||||
path1 = make_absolute(path1, *pwd);
|
path1 = make_absolute(path1, *pwd);
|
||||||
remote_glob(in, out, path1, GLOB_NOCHECK, NULL, &g);
|
remote_glob(in, out, path1, GLOB_NOCHECK, NULL, &g);
|
||||||
for(i = 0; g.gl_pathv[i]; i++) {
|
for (i = 0; g.gl_pathv[i]; i++) {
|
||||||
if (!(aa = do_stat(in, out, g.gl_pathv[i], 0)))
|
if (!(aa = do_stat(in, out, g.gl_pathv[i], 0)))
|
||||||
continue;
|
continue;
|
||||||
if (!(aa->flags & SSH2_FILEXFER_ATTR_UIDGID)) {
|
if (!(aa->flags & SSH2_FILEXFER_ATTR_UIDGID)) {
|
||||||
@ -899,7 +899,7 @@ interactive_loop(int fd_in, int fd_out, char *file1, char *file2)
|
|||||||
setlinebuf(infile);
|
setlinebuf(infile);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
for(;;) {
|
for (;;) {
|
||||||
char *cp;
|
char *cp;
|
||||||
|
|
||||||
printf("sftp> ");
|
printf("sftp> ");
|
||||||
|
|||||||
@ -22,7 +22,7 @@
|
|||||||
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
*/
|
*/
|
||||||
#include "includes.h"
|
#include "includes.h"
|
||||||
RCSID("$OpenBSD: sftp-server.c,v 1.30 2001/07/31 12:42:50 jakob Exp $");
|
RCSID("$OpenBSD: sftp-server.c,v 1.31 2001/12/19 07:18:56 deraadt Exp $");
|
||||||
|
|
||||||
#include "buffer.h"
|
#include "buffer.h"
|
||||||
#include "bufaux.h"
|
#include "bufaux.h"
|
||||||
@ -144,7 +144,7 @@ handle_init(void)
|
|||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
for(i = 0; i < sizeof(handles)/sizeof(Handle); i++)
|
for (i = 0; i < sizeof(handles)/sizeof(Handle); i++)
|
||||||
handles[i].use = HANDLE_UNUSED;
|
handles[i].use = HANDLE_UNUSED;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -153,7 +153,7 @@ handle_new(int use, char *name, int fd, DIR *dirp)
|
|||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
for(i = 0; i < sizeof(handles)/sizeof(Handle); i++) {
|
for (i = 0; i < sizeof(handles)/sizeof(Handle); i++) {
|
||||||
if (handles[i].use == HANDLE_UNUSED) {
|
if (handles[i].use == HANDLE_UNUSED) {
|
||||||
handles[i].use = use;
|
handles[i].use = use;
|
||||||
handles[i].dirp = dirp;
|
handles[i].dirp = dirp;
|
||||||
@ -771,7 +771,7 @@ process_readdir(void)
|
|||||||
}
|
}
|
||||||
if (count > 0) {
|
if (count > 0) {
|
||||||
send_names(id, count, stats);
|
send_names(id, count, stats);
|
||||||
for(i = 0; i < count; i++) {
|
for (i = 0; i < count; i++) {
|
||||||
xfree(stats[i].name);
|
xfree(stats[i].name);
|
||||||
xfree(stats[i].long_name);
|
xfree(stats[i].long_name);
|
||||||
}
|
}
|
||||||
|
|||||||
4
sftp.c
4
sftp.c
@ -24,7 +24,7 @@
|
|||||||
|
|
||||||
#include "includes.h"
|
#include "includes.h"
|
||||||
|
|
||||||
RCSID("$OpenBSD: sftp.c,v 1.21 2001/09/19 19:24:19 stevesk Exp $");
|
RCSID("$OpenBSD: sftp.c,v 1.22 2001/12/19 07:18:56 deraadt Exp $");
|
||||||
|
|
||||||
/* XXX: commandline mode */
|
/* XXX: commandline mode */
|
||||||
/* XXX: short-form remote directory listings (like 'ls -C') */
|
/* XXX: short-form remote directory listings (like 'ls -C') */
|
||||||
@ -114,7 +114,7 @@ main(int argc, char **argv)
|
|||||||
|
|
||||||
__progname = get_progname(argv[0]);
|
__progname = get_progname(argv[0]);
|
||||||
args.list = NULL;
|
args.list = NULL;
|
||||||
addargs(&args, "ssh"); /* overwritten with ssh_program */
|
addargs(&args, "ssh"); /* overwritten with ssh_program */
|
||||||
addargs(&args, "-oFallBackToRsh no");
|
addargs(&args, "-oFallBackToRsh no");
|
||||||
addargs(&args, "-oForwardX11 no");
|
addargs(&args, "-oForwardX11 no");
|
||||||
addargs(&args, "-oForwardAgent no");
|
addargs(&args, "-oForwardAgent no");
|
||||||
|
|||||||
12
ssh-add.c
12
ssh-add.c
@ -35,7 +35,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "includes.h"
|
#include "includes.h"
|
||||||
RCSID("$OpenBSD: ssh-add.c,v 1.46 2001/10/02 08:38:50 djm Exp $");
|
RCSID("$OpenBSD: ssh-add.c,v 1.47 2001/12/19 07:18:56 deraadt Exp $");
|
||||||
|
|
||||||
#include <openssl/evp.h>
|
#include <openssl/evp.h>
|
||||||
|
|
||||||
@ -169,11 +169,11 @@ update_card(AuthenticationConnection *ac, int add, const char *id)
|
|||||||
{
|
{
|
||||||
if (ssh_update_card(ac, add, id)) {
|
if (ssh_update_card(ac, add, id)) {
|
||||||
fprintf(stderr, "Card %s: %s\n",
|
fprintf(stderr, "Card %s: %s\n",
|
||||||
add ? "added" : "removed", id);
|
add ? "added" : "removed", id);
|
||||||
return 0;
|
return 0;
|
||||||
} else {
|
} else {
|
||||||
fprintf(stderr, "Could not %s card: %s\n",
|
fprintf(stderr, "Could not %s card: %s\n",
|
||||||
add ? "add" : "remove", id);
|
add ? "add" : "remove", id);
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -188,8 +188,8 @@ list_identities(AuthenticationConnection *ac, int do_fp)
|
|||||||
|
|
||||||
for (version = 1; version <= 2; version++) {
|
for (version = 1; version <= 2; version++) {
|
||||||
for (key = ssh_get_first_identity(ac, &comment, version);
|
for (key = ssh_get_first_identity(ac, &comment, version);
|
||||||
key != NULL;
|
key != NULL;
|
||||||
key = ssh_get_next_identity(ac, &comment, version)) {
|
key = ssh_get_next_identity(ac, &comment, version)) {
|
||||||
had_identities = 1;
|
had_identities = 1;
|
||||||
if (do_fp) {
|
if (do_fp) {
|
||||||
fp = key_fingerprint(key, SSH_FP_MD5,
|
fp = key_fingerprint(key, SSH_FP_MD5,
|
||||||
@ -248,7 +248,7 @@ main(int argc, char **argv)
|
|||||||
fprintf(stderr, "Could not open a connection to your authentication agent.\n");
|
fprintf(stderr, "Could not open a connection to your authentication agent.\n");
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
while ((ch = getopt(argc, argv, "lLdDe:s:")) != -1) {
|
while ((ch = getopt(argc, argv, "lLdDe:s:")) != -1) {
|
||||||
switch (ch) {
|
switch (ch) {
|
||||||
case 'l':
|
case 'l':
|
||||||
case 'L':
|
case 'L':
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
/* $OpenBSD: ssh-agent.c,v 1.74 2001/12/05 10:06:12 deraadt Exp $ */
|
/* $OpenBSD: ssh-agent.c,v 1.75 2001/12/19 07:18:56 deraadt Exp $ */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Author: Tatu Ylonen <ylo@cs.hut.fi>
|
* Author: Tatu Ylonen <ylo@cs.hut.fi>
|
||||||
@ -36,7 +36,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "includes.h"
|
#include "includes.h"
|
||||||
RCSID("$OpenBSD: ssh-agent.c,v 1.74 2001/12/05 10:06:12 deraadt Exp $");
|
RCSID("$OpenBSD: ssh-agent.c,v 1.75 2001/12/19 07:18:56 deraadt Exp $");
|
||||||
|
|
||||||
#include <openssl/evp.h>
|
#include <openssl/evp.h>
|
||||||
#include <openssl/md5.h>
|
#include <openssl/md5.h>
|
||||||
|
|||||||
@ -12,7 +12,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "includes.h"
|
#include "includes.h"
|
||||||
RCSID("$OpenBSD: ssh-keygen.c,v 1.85 2001/12/05 10:06:12 deraadt Exp $");
|
RCSID("$OpenBSD: ssh-keygen.c,v 1.86 2001/12/19 07:18:56 deraadt Exp $");
|
||||||
|
|
||||||
#include <openssl/evp.h>
|
#include <openssl/evp.h>
|
||||||
#include <openssl/pem.h>
|
#include <openssl/pem.h>
|
||||||
@ -670,7 +670,7 @@ do_change_passphrase(struct passwd *pw)
|
|||||||
read_passphrase("Enter new passphrase (empty for no "
|
read_passphrase("Enter new passphrase (empty for no "
|
||||||
"passphrase): ", RP_ALLOW_STDIN);
|
"passphrase): ", RP_ALLOW_STDIN);
|
||||||
passphrase2 = read_passphrase("Enter same passphrase again: ",
|
passphrase2 = read_passphrase("Enter same passphrase again: ",
|
||||||
RP_ALLOW_STDIN);
|
RP_ALLOW_STDIN);
|
||||||
|
|
||||||
/* Verify that they are the same. */
|
/* Verify that they are the same. */
|
||||||
if (strcmp(passphrase1, passphrase2) != 0) {
|
if (strcmp(passphrase1, passphrase2) != 0) {
|
||||||
|
|||||||
8
ssh.c
8
ssh.c
@ -39,7 +39,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "includes.h"
|
#include "includes.h"
|
||||||
RCSID("$OpenBSD: ssh.c,v 1.150 2001/11/30 20:39:28 stevesk Exp $");
|
RCSID("$OpenBSD: ssh.c,v 1.151 2001/12/19 07:18:56 deraadt Exp $");
|
||||||
|
|
||||||
#include <openssl/evp.h>
|
#include <openssl/evp.h>
|
||||||
#include <openssl/err.h>
|
#include <openssl/err.h>
|
||||||
@ -485,7 +485,7 @@ again:
|
|||||||
fwd_host_port);
|
fwd_host_port);
|
||||||
else if (opt == 'R')
|
else if (opt == 'R')
|
||||||
add_remote_forward(&options, fwd_port, buf,
|
add_remote_forward(&options, fwd_port, buf,
|
||||||
fwd_host_port);
|
fwd_host_port);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 'D':
|
case 'D':
|
||||||
@ -1150,8 +1150,8 @@ ssh_session2_open(void)
|
|||||||
channel_send_open(c->self);
|
channel_send_open(c->self);
|
||||||
if (!no_shell_flag)
|
if (!no_shell_flag)
|
||||||
channel_register_callback(c->self,
|
channel_register_callback(c->self,
|
||||||
SSH2_MSG_CHANNEL_OPEN_CONFIRMATION,
|
SSH2_MSG_CHANNEL_OPEN_CONFIRMATION,
|
||||||
ssh_session2_setup, (void *)0);
|
ssh_session2_setup, (void *)0);
|
||||||
|
|
||||||
return c->self;
|
return c->self;
|
||||||
}
|
}
|
||||||
|
|||||||
14
sshconnect.c
14
sshconnect.c
@ -13,7 +13,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "includes.h"
|
#include "includes.h"
|
||||||
RCSID("$OpenBSD: sshconnect.c,v 1.117 2001/12/06 18:02:32 stevesk Exp $");
|
RCSID("$OpenBSD: sshconnect.c,v 1.118 2001/12/19 07:18:56 deraadt Exp $");
|
||||||
|
|
||||||
#include <openssl/bn.h>
|
#include <openssl/bn.h>
|
||||||
|
|
||||||
@ -109,7 +109,7 @@ ssh_proxy_connect(const char *host, u_short port, struct passwd *pw,
|
|||||||
/* Create pipes for communicating with the proxy. */
|
/* Create pipes for communicating with the proxy. */
|
||||||
if (pipe(pin) < 0 || pipe(pout) < 0)
|
if (pipe(pin) < 0 || pipe(pout) < 0)
|
||||||
fatal("Could not create pipes to communicate with the proxy: %.100s",
|
fatal("Could not create pipes to communicate with the proxy: %.100s",
|
||||||
strerror(errno));
|
strerror(errno));
|
||||||
|
|
||||||
debug("Executing proxy command: %.500s", command_string);
|
debug("Executing proxy command: %.500s", command_string);
|
||||||
|
|
||||||
@ -258,7 +258,7 @@ ssh_connect(const char *host, struct sockaddr_storage * hostaddr,
|
|||||||
int full_failure = 1;
|
int full_failure = 1;
|
||||||
|
|
||||||
debug("ssh_connect: getuid %u geteuid %u anon %d",
|
debug("ssh_connect: getuid %u geteuid %u anon %d",
|
||||||
(u_int) getuid(), (u_int) geteuid(), anonymous);
|
(u_int) getuid(), (u_int) geteuid(), anonymous);
|
||||||
|
|
||||||
/* Get default port if port has not been set. */
|
/* Get default port if port has not been set. */
|
||||||
if (port == 0) {
|
if (port == 0) {
|
||||||
@ -428,7 +428,7 @@ ssh_exchange_identification(void)
|
|||||||
&remote_major, &remote_minor, remote_version) != 3)
|
&remote_major, &remote_minor, remote_version) != 3)
|
||||||
fatal("Bad remote protocol version identification: '%.100s'", buf);
|
fatal("Bad remote protocol version identification: '%.100s'", buf);
|
||||||
debug("Remote protocol version %d.%d, remote software version %.100s",
|
debug("Remote protocol version %d.%d, remote software version %.100s",
|
||||||
remote_major, remote_minor, remote_version);
|
remote_major, remote_minor, remote_version);
|
||||||
|
|
||||||
compat_datafellows(remote_version);
|
compat_datafellows(remote_version);
|
||||||
mismatch = 0;
|
mismatch = 0;
|
||||||
@ -620,7 +620,7 @@ check_host_key(char *host, struct sockaddr *hostaddr, Key *host_key,
|
|||||||
*/
|
*/
|
||||||
host_file = user_hostfile;
|
host_file = user_hostfile;
|
||||||
host_status = check_host_in_hostfile(host_file, host, host_key,
|
host_status = check_host_in_hostfile(host_file, host, host_key,
|
||||||
file_key, &host_line);
|
file_key, &host_line);
|
||||||
if (host_status == HOST_NEW) {
|
if (host_status == HOST_NEW) {
|
||||||
host_file = system_hostfile;
|
host_file = system_hostfile;
|
||||||
host_status = check_host_in_hostfile(host_file, host, host_key,
|
host_status = check_host_in_hostfile(host_file, host, host_key,
|
||||||
@ -663,7 +663,7 @@ check_host_key(char *host, struct sockaddr *hostaddr, Key *host_key,
|
|||||||
"'%.128s' not in list of known hosts.",
|
"'%.128s' not in list of known hosts.",
|
||||||
type, ip);
|
type, ip);
|
||||||
else if (!add_host_to_hostfile(user_hostfile, ip,
|
else if (!add_host_to_hostfile(user_hostfile, ip,
|
||||||
host_key))
|
host_key))
|
||||||
log("Failed to add the %s host key for IP "
|
log("Failed to add the %s host key for IP "
|
||||||
"address '%.128s' to the list of known "
|
"address '%.128s' to the list of known "
|
||||||
"hosts (%.30s).", type, ip, user_hostfile);
|
"hosts (%.30s).", type, ip, user_hostfile);
|
||||||
@ -789,7 +789,7 @@ check_host_key(char *host, struct sockaddr *hostaddr, Key *host_key,
|
|||||||
error("Port forwarding is disabled to avoid "
|
error("Port forwarding is disabled to avoid "
|
||||||
"man-in-the-middle attacks.");
|
"man-in-the-middle attacks.");
|
||||||
options.num_local_forwards =
|
options.num_local_forwards =
|
||||||
options.num_remote_forwards = 0;
|
options.num_remote_forwards = 0;
|
||||||
}
|
}
|
||||||
/*
|
/*
|
||||||
* XXX Should permit the user to change to use the new id.
|
* XXX Should permit the user to change to use the new id.
|
||||||
|
|||||||
@ -13,7 +13,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "includes.h"
|
#include "includes.h"
|
||||||
RCSID("$OpenBSD: sshconnect1.c,v 1.41 2001/10/06 11:18:19 markus Exp $");
|
RCSID("$OpenBSD: sshconnect1.c,v 1.42 2001/12/19 07:18:56 deraadt Exp $");
|
||||||
|
|
||||||
#include <openssl/bn.h>
|
#include <openssl/bn.h>
|
||||||
#include <openssl/evp.h>
|
#include <openssl/evp.h>
|
||||||
@ -80,8 +80,8 @@ try_agent_authentication(void)
|
|||||||
|
|
||||||
/* Loop through identities served by the agent. */
|
/* Loop through identities served by the agent. */
|
||||||
for (key = ssh_get_first_identity(auth, &comment, 1);
|
for (key = ssh_get_first_identity(auth, &comment, 1);
|
||||||
key != NULL;
|
key != NULL;
|
||||||
key = ssh_get_next_identity(auth, &comment, 1)) {
|
key = ssh_get_next_identity(auth, &comment, 1)) {
|
||||||
|
|
||||||
/* Try this identity. */
|
/* Try this identity. */
|
||||||
debug("Trying RSA authentication via agent with '%.100s'", comment);
|
debug("Trying RSA authentication via agent with '%.100s'", comment);
|
||||||
@ -562,24 +562,24 @@ try_krb5_authentication(krb5_context *context, krb5_auth_context *auth_context)
|
|||||||
|
|
||||||
type = packet_read(&payload_len);
|
type = packet_read(&payload_len);
|
||||||
switch (type) {
|
switch (type) {
|
||||||
case SSH_SMSG_FAILURE:
|
case SSH_SMSG_FAILURE:
|
||||||
/* Should really be SSH_SMSG_AUTH_KERBEROS_FAILURE */
|
/* Should really be SSH_SMSG_AUTH_KERBEROS_FAILURE */
|
||||||
debug("Kerberos v5 authentication failed.");
|
debug("Kerberos v5 authentication failed.");
|
||||||
ret = 0;
|
ret = 0;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case SSH_SMSG_AUTH_KERBEROS_RESPONSE:
|
case SSH_SMSG_AUTH_KERBEROS_RESPONSE:
|
||||||
/* SSH_SMSG_AUTH_KERBEROS_SUCCESS */
|
/* SSH_SMSG_AUTH_KERBEROS_SUCCESS */
|
||||||
debug("Kerberos v5 authentication accepted.");
|
debug("Kerberos v5 authentication accepted.");
|
||||||
|
|
||||||
/* Get server's response. */
|
/* Get server's response. */
|
||||||
ap.data = packet_get_string((unsigned int *) &ap.length);
|
ap.data = packet_get_string((unsigned int *) &ap.length);
|
||||||
|
|
||||||
packet_integrity_check(payload_len, 4 + ap.length, type);
|
packet_integrity_check(payload_len, 4 + ap.length, type);
|
||||||
/* XXX je to dobre? */
|
/* XXX je to dobre? */
|
||||||
|
|
||||||
problem = krb5_rd_rep(*context, *auth_context, &ap, &reply);
|
problem = krb5_rd_rep(*context, *auth_context, &ap, &reply);
|
||||||
if (problem) {
|
if (problem) {
|
||||||
ret = 0;
|
ret = 0;
|
||||||
}
|
}
|
||||||
ret = 1;
|
ret = 1;
|
||||||
@ -842,7 +842,7 @@ try_challenge_response_authentication(void)
|
|||||||
challenge = packet_get_string(&clen);
|
challenge = packet_get_string(&clen);
|
||||||
packet_integrity_check(payload_len, (4 + clen), type);
|
packet_integrity_check(payload_len, (4 + clen), type);
|
||||||
snprintf(prompt, sizeof prompt, "%s%s", challenge,
|
snprintf(prompt, sizeof prompt, "%s%s", challenge,
|
||||||
strchr(challenge, '\n') ? "" : "\nResponse: ");
|
strchr(challenge, '\n') ? "" : "\nResponse: ");
|
||||||
xfree(challenge);
|
xfree(challenge);
|
||||||
if (i != 0)
|
if (i != 0)
|
||||||
error("Permission denied, please try again.");
|
error("Permission denied, please try again.");
|
||||||
@ -974,11 +974,11 @@ ssh_kex(char *host, struct sockaddr *hostaddr)
|
|||||||
supported_authentications = packet_get_int();
|
supported_authentications = packet_get_int();
|
||||||
|
|
||||||
debug("Received server public key (%d bits) and host key (%d bits).",
|
debug("Received server public key (%d bits) and host key (%d bits).",
|
||||||
BN_num_bits(public_key->n), BN_num_bits(host_key->n));
|
BN_num_bits(public_key->n), BN_num_bits(host_key->n));
|
||||||
|
|
||||||
packet_integrity_check(payload_len,
|
packet_integrity_check(payload_len,
|
||||||
8 + 4 + sum_len + 0 + 4 + 0 + 0 + 4 + 4 + 4,
|
8 + 4 + sum_len + 0 + 4 + 0 + 0 + 4 + 4 + 4,
|
||||||
SSH_SMSG_PUBLIC_KEY);
|
SSH_SMSG_PUBLIC_KEY);
|
||||||
k.type = KEY_RSA1;
|
k.type = KEY_RSA1;
|
||||||
k.rsa = host_key;
|
k.rsa = host_key;
|
||||||
if (verify_host_key(host, hostaddr, &k) == -1)
|
if (verify_host_key(host, hostaddr, &k) == -1)
|
||||||
@ -1027,10 +1027,10 @@ ssh_kex(char *host, struct sockaddr *hostaddr)
|
|||||||
if (BN_num_bits(host_key->n) <
|
if (BN_num_bits(host_key->n) <
|
||||||
BN_num_bits(public_key->n) + SSH_KEY_BITS_RESERVED) {
|
BN_num_bits(public_key->n) + SSH_KEY_BITS_RESERVED) {
|
||||||
fatal("respond_to_rsa_challenge: host_key %d < public_key %d + "
|
fatal("respond_to_rsa_challenge: host_key %d < public_key %d + "
|
||||||
"SSH_KEY_BITS_RESERVED %d",
|
"SSH_KEY_BITS_RESERVED %d",
|
||||||
BN_num_bits(host_key->n),
|
BN_num_bits(host_key->n),
|
||||||
BN_num_bits(public_key->n),
|
BN_num_bits(public_key->n),
|
||||||
SSH_KEY_BITS_RESERVED);
|
SSH_KEY_BITS_RESERVED);
|
||||||
}
|
}
|
||||||
rsa_public_encrypt(key, key, public_key);
|
rsa_public_encrypt(key, key, public_key);
|
||||||
rsa_public_encrypt(key, key, host_key);
|
rsa_public_encrypt(key, key, host_key);
|
||||||
@ -1039,10 +1039,10 @@ ssh_kex(char *host, struct sockaddr *hostaddr)
|
|||||||
if (BN_num_bits(public_key->n) <
|
if (BN_num_bits(public_key->n) <
|
||||||
BN_num_bits(host_key->n) + SSH_KEY_BITS_RESERVED) {
|
BN_num_bits(host_key->n) + SSH_KEY_BITS_RESERVED) {
|
||||||
fatal("respond_to_rsa_challenge: public_key %d < host_key %d + "
|
fatal("respond_to_rsa_challenge: public_key %d < host_key %d + "
|
||||||
"SSH_KEY_BITS_RESERVED %d",
|
"SSH_KEY_BITS_RESERVED %d",
|
||||||
BN_num_bits(public_key->n),
|
BN_num_bits(public_key->n),
|
||||||
BN_num_bits(host_key->n),
|
BN_num_bits(host_key->n),
|
||||||
SSH_KEY_BITS_RESERVED);
|
SSH_KEY_BITS_RESERVED);
|
||||||
}
|
}
|
||||||
rsa_public_encrypt(key, key, host_key);
|
rsa_public_encrypt(key, key, host_key);
|
||||||
rsa_public_encrypt(key, key, public_key);
|
rsa_public_encrypt(key, key, public_key);
|
||||||
@ -1064,7 +1064,7 @@ ssh_kex(char *host, struct sockaddr *hostaddr)
|
|||||||
/* Check that the selected cipher is supported. */
|
/* Check that the selected cipher is supported. */
|
||||||
if (!(supported_ciphers & (1 << options.cipher)))
|
if (!(supported_ciphers & (1 << options.cipher)))
|
||||||
fatal("Selected cipher type %.100s not supported by server.",
|
fatal("Selected cipher type %.100s not supported by server.",
|
||||||
cipher_name(options.cipher));
|
cipher_name(options.cipher));
|
||||||
|
|
||||||
debug("Encryption type: %.100s", cipher_name(options.cipher));
|
debug("Encryption type: %.100s", cipher_name(options.cipher));
|
||||||
|
|
||||||
@ -1142,7 +1142,7 @@ ssh_userauth1(const char *local_user, const char *server_user, char *host,
|
|||||||
|
|
||||||
#ifdef KRB5
|
#ifdef KRB5
|
||||||
if ((supported_authentications & (1 << SSH_AUTH_KERBEROS)) &&
|
if ((supported_authentications & (1 << SSH_AUTH_KERBEROS)) &&
|
||||||
options.kerberos_authentication) {
|
options.kerberos_authentication) {
|
||||||
debug("Trying Kerberos v5 authentication.");
|
debug("Trying Kerberos v5 authentication.");
|
||||||
|
|
||||||
if (try_krb5_authentication(&context, &auth_context)) {
|
if (try_krb5_authentication(&context, &auth_context)) {
|
||||||
|
|||||||
@ -23,7 +23,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "includes.h"
|
#include "includes.h"
|
||||||
RCSID("$OpenBSD: sshconnect2.c,v 1.87 2001/12/05 10:06:13 deraadt Exp $");
|
RCSID("$OpenBSD: sshconnect2.c,v 1.88 2001/12/19 07:18:56 deraadt Exp $");
|
||||||
|
|
||||||
#include <openssl/bn.h>
|
#include <openssl/bn.h>
|
||||||
#include <openssl/md5.h>
|
#include <openssl/md5.h>
|
||||||
@ -111,7 +111,7 @@ ssh_kex2(char *host, struct sockaddr *hostaddr)
|
|||||||
myproposal[PROPOSAL_MAC_ALGS_STOC] = options.macs;
|
myproposal[PROPOSAL_MAC_ALGS_STOC] = options.macs;
|
||||||
}
|
}
|
||||||
if (options.hostkeyalgorithms != NULL)
|
if (options.hostkeyalgorithms != NULL)
|
||||||
myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] =
|
myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] =
|
||||||
options.hostkeyalgorithms;
|
options.hostkeyalgorithms;
|
||||||
|
|
||||||
/* start key exchange */
|
/* start key exchange */
|
||||||
@ -613,7 +613,7 @@ load_identity_file(char *filename)
|
|||||||
if (options.batch_mode)
|
if (options.batch_mode)
|
||||||
return NULL;
|
return NULL;
|
||||||
snprintf(prompt, sizeof prompt,
|
snprintf(prompt, sizeof prompt,
|
||||||
"Enter passphrase for key '%.100s': ", filename);
|
"Enter passphrase for key '%.100s': ", filename);
|
||||||
for (i = 0; i < options.number_of_password_prompts; i++) {
|
for (i = 0; i < options.number_of_password_prompts; i++) {
|
||||||
passphrase = read_passphrase(prompt, 0);
|
passphrase = read_passphrase(prompt, 0);
|
||||||
if (strcmp(passphrase, "") != 0) {
|
if (strcmp(passphrase, "") != 0) {
|
||||||
|
|||||||
2
sshd.8
2
sshd.8
@ -34,7 +34,7 @@
|
|||||||
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
||||||
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
.\"
|
.\"
|
||||||
.\" $OpenBSD: sshd.8,v 1.156 2001/12/06 13:30:06 markus Exp $
|
.\" $OpenBSD: sshd.8,v 1.157 2001/12/19 07:18:56 deraadt Exp $
|
||||||
.Dd September 25, 1999
|
.Dd September 25, 1999
|
||||||
.Dt SSHD 8
|
.Dt SSHD 8
|
||||||
.Os
|
.Os
|
||||||
|
|||||||
18
sshd.c
18
sshd.c
@ -40,7 +40,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "includes.h"
|
#include "includes.h"
|
||||||
RCSID("$OpenBSD: sshd.c,v 1.216 2001/12/10 16:45:04 stevesk Exp $");
|
RCSID("$OpenBSD: sshd.c,v 1.217 2001/12/19 07:18:56 deraadt Exp $");
|
||||||
|
|
||||||
#include <openssl/dh.h>
|
#include <openssl/dh.h>
|
||||||
#include <openssl/bn.h>
|
#include <openssl/bn.h>
|
||||||
@ -399,7 +399,7 @@ sshd_exchange_identification(int sock_in, int sock_out)
|
|||||||
fatal_cleanup();
|
fatal_cleanup();
|
||||||
}
|
}
|
||||||
debug("Client protocol version %d.%d; client software version %.100s",
|
debug("Client protocol version %d.%d; client software version %.100s",
|
||||||
remote_major, remote_minor, remote_version);
|
remote_major, remote_minor, remote_version);
|
||||||
|
|
||||||
compat_datafellows(remote_version);
|
compat_datafellows(remote_version);
|
||||||
|
|
||||||
@ -467,7 +467,7 @@ destroy_sensitive_data(void)
|
|||||||
key_free(sensitive_data.server_key);
|
key_free(sensitive_data.server_key);
|
||||||
sensitive_data.server_key = NULL;
|
sensitive_data.server_key = NULL;
|
||||||
}
|
}
|
||||||
for(i = 0; i < options.num_host_key_files; i++) {
|
for (i = 0; i < options.num_host_key_files; i++) {
|
||||||
if (sensitive_data.host_keys[i]) {
|
if (sensitive_data.host_keys[i]) {
|
||||||
key_free(sensitive_data.host_keys[i]);
|
key_free(sensitive_data.host_keys[i]);
|
||||||
sensitive_data.host_keys[i] = NULL;
|
sensitive_data.host_keys[i] = NULL;
|
||||||
@ -483,7 +483,7 @@ list_hostkey_types(void)
|
|||||||
static char buf[1024];
|
static char buf[1024];
|
||||||
int i;
|
int i;
|
||||||
buf[0] = '\0';
|
buf[0] = '\0';
|
||||||
for(i = 0; i < options.num_host_key_files; i++) {
|
for (i = 0; i < options.num_host_key_files; i++) {
|
||||||
Key *key = sensitive_data.host_keys[i];
|
Key *key = sensitive_data.host_keys[i];
|
||||||
if (key == NULL)
|
if (key == NULL)
|
||||||
continue;
|
continue;
|
||||||
@ -506,7 +506,7 @@ static Key *
|
|||||||
get_hostkey_by_type(int type)
|
get_hostkey_by_type(int type)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
for(i = 0; i < options.num_host_key_files; i++) {
|
for (i = 0; i < options.num_host_key_files; i++) {
|
||||||
Key *key = sensitive_data.host_keys[i];
|
Key *key = sensitive_data.host_keys[i];
|
||||||
if (key != NULL && key->type == type)
|
if (key != NULL && key->type == type)
|
||||||
return key;
|
return key;
|
||||||
@ -687,9 +687,9 @@ main(int ac, char **av)
|
|||||||
utmp_len = atoi(optarg);
|
utmp_len = atoi(optarg);
|
||||||
break;
|
break;
|
||||||
case 'o':
|
case 'o':
|
||||||
if (process_server_config_line(&options, optarg,
|
if (process_server_config_line(&options, optarg,
|
||||||
"command-line", 0) != 0)
|
"command-line", 0) != 0)
|
||||||
exit(1);
|
exit(1);
|
||||||
break;
|
break;
|
||||||
case '?':
|
case '?':
|
||||||
default:
|
default:
|
||||||
@ -734,14 +734,14 @@ main(int ac, char **av)
|
|||||||
|
|
||||||
/* load private host keys */
|
/* load private host keys */
|
||||||
sensitive_data.host_keys = xmalloc(options.num_host_key_files*sizeof(Key*));
|
sensitive_data.host_keys = xmalloc(options.num_host_key_files*sizeof(Key*));
|
||||||
for(i = 0; i < options.num_host_key_files; i++)
|
for (i = 0; i < options.num_host_key_files; i++)
|
||||||
sensitive_data.host_keys[i] = NULL;
|
sensitive_data.host_keys[i] = NULL;
|
||||||
sensitive_data.server_key = NULL;
|
sensitive_data.server_key = NULL;
|
||||||
sensitive_data.ssh1_host_key = NULL;
|
sensitive_data.ssh1_host_key = NULL;
|
||||||
sensitive_data.have_ssh1_key = 0;
|
sensitive_data.have_ssh1_key = 0;
|
||||||
sensitive_data.have_ssh2_key = 0;
|
sensitive_data.have_ssh2_key = 0;
|
||||||
|
|
||||||
for(i = 0; i < options.num_host_key_files; i++) {
|
for (i = 0; i < options.num_host_key_files; i++) {
|
||||||
key = key_load_private(options.host_key_files[i], "", NULL);
|
key = key_load_private(options.host_key_files[i], "", NULL);
|
||||||
sensitive_data.host_keys[i] = key;
|
sensitive_data.host_keys[i] = key;
|
||||||
if (key == NULL) {
|
if (key == NULL) {
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
# $OpenBSD: sshd_config,v 1.42 2001/09/20 20:57:51 mouring Exp $
|
# $OpenBSD: sshd_config,v 1.43 2001/12/19 07:18:56 deraadt Exp $
|
||||||
|
|
||||||
# This sshd was compiled with PATH=/usr/bin:/bin:/usr/sbin:/sbin
|
# This sshd was compiled with PATH=/usr/bin:/bin:/usr/sbin:/sbin
|
||||||
|
|
||||||
|
|||||||
@ -39,7 +39,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "includes.h"
|
#include "includes.h"
|
||||||
RCSID("$OpenBSD: sshlogin.c,v 1.2 2001/03/24 16:43:27 stevesk Exp $");
|
RCSID("$OpenBSD: sshlogin.c,v 1.3 2001/12/19 07:18:56 deraadt Exp $");
|
||||||
|
|
||||||
#include "loginrec.h"
|
#include "loginrec.h"
|
||||||
|
|
||||||
@ -67,7 +67,7 @@ get_last_login_time(uid_t uid, const char *logname,
|
|||||||
|
|
||||||
void
|
void
|
||||||
record_login(pid_t pid, const char *ttyname, const char *user, uid_t uid,
|
record_login(pid_t pid, const char *ttyname, const char *user, uid_t uid,
|
||||||
const char *host, struct sockaddr * addr)
|
const char *host, struct sockaddr * addr)
|
||||||
{
|
{
|
||||||
struct logininfo *li;
|
struct logininfo *li;
|
||||||
|
|
||||||
|
|||||||
20
sshpty.c
20
sshpty.c
@ -12,7 +12,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "includes.h"
|
#include "includes.h"
|
||||||
RCSID("$OpenBSD: sshpty.c,v 1.3 2001/07/22 21:32:27 markus Exp $");
|
RCSID("$OpenBSD: sshpty.c,v 1.4 2001/12/19 07:18:56 deraadt Exp $");
|
||||||
|
|
||||||
#ifdef HAVE_UTIL_H
|
#ifdef HAVE_UTIL_H
|
||||||
# include <util.h>
|
# include <util.h>
|
||||||
@ -156,7 +156,7 @@ pty_allocate(int *ptyfd, int *ttyfd, char *namebuf, int namebuflen)
|
|||||||
*ttyfd = open(name, O_RDWR | O_NOCTTY);
|
*ttyfd = open(name, O_RDWR | O_NOCTTY);
|
||||||
if (*ttyfd < 0) {
|
if (*ttyfd < 0) {
|
||||||
error("Could not open pty slave side %.100s: %.100s",
|
error("Could not open pty slave side %.100s: %.100s",
|
||||||
name, strerror(errno));
|
name, strerror(errno));
|
||||||
close(*ptyfd);
|
close(*ptyfd);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@ -328,7 +328,7 @@ pty_make_controlling_tty(int *ttyfd, const char *ttyname)
|
|||||||
fd = open(_PATH_TTY, O_WRONLY);
|
fd = open(_PATH_TTY, O_WRONLY);
|
||||||
if (fd < 0)
|
if (fd < 0)
|
||||||
error("open /dev/tty failed - could not set controlling tty: %.100s",
|
error("open /dev/tty failed - could not set controlling tty: %.100s",
|
||||||
strerror(errno));
|
strerror(errno));
|
||||||
else {
|
else {
|
||||||
close(fd);
|
close(fd);
|
||||||
}
|
}
|
||||||
@ -339,7 +339,7 @@ pty_make_controlling_tty(int *ttyfd, const char *ttyname)
|
|||||||
|
|
||||||
void
|
void
|
||||||
pty_change_window_size(int ptyfd, int row, int col,
|
pty_change_window_size(int ptyfd, int row, int col,
|
||||||
int xpixel, int ypixel)
|
int xpixel, int ypixel)
|
||||||
{
|
{
|
||||||
struct winsize w;
|
struct winsize w;
|
||||||
w.ws_row = row;
|
w.ws_row = row;
|
||||||
@ -381,12 +381,12 @@ pty_setowner(struct passwd *pw, const char *ttyname)
|
|||||||
if (errno == EROFS &&
|
if (errno == EROFS &&
|
||||||
(st.st_uid == pw->pw_uid || st.st_uid == 0))
|
(st.st_uid == pw->pw_uid || st.st_uid == 0))
|
||||||
error("chown(%.100s, %d, %d) failed: %.100s",
|
error("chown(%.100s, %d, %d) failed: %.100s",
|
||||||
ttyname, pw->pw_uid, gid,
|
ttyname, pw->pw_uid, gid,
|
||||||
strerror(errno));
|
strerror(errno));
|
||||||
else
|
else
|
||||||
fatal("chown(%.100s, %d, %d) failed: %.100s",
|
fatal("chown(%.100s, %d, %d) failed: %.100s",
|
||||||
ttyname, pw->pw_uid, gid,
|
ttyname, pw->pw_uid, gid,
|
||||||
strerror(errno));
|
strerror(errno));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -395,10 +395,10 @@ pty_setowner(struct passwd *pw, const char *ttyname)
|
|||||||
if (errno == EROFS &&
|
if (errno == EROFS &&
|
||||||
(st.st_mode & (S_IRGRP | S_IROTH)) == 0)
|
(st.st_mode & (S_IRGRP | S_IROTH)) == 0)
|
||||||
error("chmod(%.100s, 0%o) failed: %.100s",
|
error("chmod(%.100s, 0%o) failed: %.100s",
|
||||||
ttyname, mode, strerror(errno));
|
ttyname, mode, strerror(errno));
|
||||||
else
|
else
|
||||||
fatal("chmod(%.100s, 0%o) failed: %.100s",
|
fatal("chmod(%.100s, 0%o) failed: %.100s",
|
||||||
ttyname, mode, strerror(errno));
|
ttyname, mode, strerror(errno));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
2
sshtty.c
2
sshtty.c
@ -1,4 +1,4 @@
|
|||||||
/* $OpenBSD: sshtty.c,v 1.1 2001/04/14 16:33:20 stevesk Exp $ */
|
/* $OpenBSD: sshtty.c,v 1.2 2001/12/19 07:18:56 deraadt Exp $ */
|
||||||
/*
|
/*
|
||||||
* Author: Tatu Ylonen <ylo@cs.hut.fi>
|
* Author: Tatu Ylonen <ylo@cs.hut.fi>
|
||||||
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
|
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
|
||||||
|
|||||||
@ -43,7 +43,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "includes.h"
|
#include "includes.h"
|
||||||
RCSID("$OpenBSD: ttymodes.c,v 1.14 2001/06/24 17:18:31 markus Exp $");
|
RCSID("$OpenBSD: ttymodes.c,v 1.15 2001/12/19 07:18:56 deraadt Exp $");
|
||||||
|
|
||||||
#include "packet.h"
|
#include "packet.h"
|
||||||
#include "log.h"
|
#include "log.h"
|
||||||
@ -396,7 +396,7 @@ tty_parse_modes(int fd, int *n_bytes_ptr)
|
|||||||
|
|
||||||
default:
|
default:
|
||||||
debug("Ignoring unsupported tty mode opcode %d (0x%x)",
|
debug("Ignoring unsupported tty mode opcode %d (0x%x)",
|
||||||
opcode, opcode);
|
opcode, opcode);
|
||||||
if (!compat20) {
|
if (!compat20) {
|
||||||
/*
|
/*
|
||||||
* SSH1:
|
* SSH1:
|
||||||
|
|||||||
@ -12,7 +12,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "includes.h"
|
#include "includes.h"
|
||||||
RCSID("$OpenBSD: uidswap.c,v 1.18 2001/08/08 21:34:19 markus Exp $");
|
RCSID("$OpenBSD: uidswap.c,v 1.19 2001/12/19 07:18:56 deraadt Exp $");
|
||||||
|
|
||||||
#include "log.h"
|
#include "log.h"
|
||||||
#include "uidswap.h"
|
#include "uidswap.h"
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user