tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-25 14:54:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

- deraadt@cvs.openbsd.org 2002/06/23 03:30:58

Browse Source 
[scard.c ssh-dss.c ssh-rsa.c sshconnect.c sshconnect2.c sshd.c sshlogin.c
      sshpty.c]
     various KNF and %d for unsigned
This commit is contained in:
Ben Lindstrom 2002-06-23 21:23:20 +00:00
parent 836f0e9d9a
commit 5c3855210e
9 changed files with 42 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -6,6 +6,10 @@
- deraadt@cvs.openbsd.org 2002/06/23 03:26:19 - deraadt@cvs.openbsd.org 2002/06/23 03:26:19
[cipher.c key.c] [cipher.c key.c]
KNF KNF
- deraadt@cvs.openbsd.org 2002/06/23 03:30:58
[scard.c ssh-dss.c ssh-rsa.c sshconnect.c sshconnect2.c sshd.c sshlogin.c
sshpty.c]
various KNF and %d for unsigned
20020623 20020623
- (stevesk) [configure.ac] bug #255 LOGIN_NEEDS_UTMPX for AIX. - (stevesk) [configure.ac] bug #255 LOGIN_NEEDS_UTMPX for AIX.
@ -1050,4 +1054,4 @@
- (stevesk) entropy.c: typo in debug message - (stevesk) entropy.c: typo in debug message
- (djm) ssh-keygen -i needs seeded RNG; report from markus@ - (djm) ssh-keygen -i needs seeded RNG; report from markus@
$Id: ChangeLog,v 1.2255 2002/06/23 21:21:30 mouring Exp $ $Id: ChangeLog,v 1.2256 2002/06/23 21:23:20 mouring Exp $

4
scard.c
View File

@ -24,7 +24,7 @@
#include "includes.h" #include "includes.h"
#if defined(SMARTCARD) && defined(USE_SECTOK) #if defined(SMARTCARD) && defined(USE_SECTOK)
RCSID("$OpenBSD: scard.c,v 1.25 2002/03/26 18:46:59 rees Exp $"); RCSID("$OpenBSD: scard.c,v 1.26 2002/06/23 03:30:17 deraadt Exp $");
#include <openssl/evp.h> #include <openssl/evp.h>
#include <sectok.h> #include <sectok.h>
@ -191,7 +191,7 @@ sc_read_pubkey(Key * k)
status = 0; status = 0;
p = key_fingerprint(k, SSH_FP_MD5, SSH_FP_HEX); p = key_fingerprint(k, SSH_FP_MD5, SSH_FP_HEX);
debug("fingerprint %d %s", key_size(k), p); debug("fingerprint %u %s", key_size(k), p);
xfree(p); xfree(p);
err: err:

14
ssh-dss.c
View File

@ -23,7 +23,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: ssh-dss.c,v 1.14 2002/02/28 15:46:33 markus Exp $"); RCSID("$OpenBSD: ssh-dss.c,v 1.15 2002/06/23 03:30:17 deraadt Exp $");
#include <openssl/bn.h> #include <openssl/bn.h>
#include <openssl/evp.h> #include <openssl/evp.h>
@ -40,9 +40,7 @@ RCSID("$OpenBSD: ssh-dss.c,v 1.14 2002/02/28 15:46:33 markus Exp $");
#define SIGBLOB_LEN (2*INTBLOB_LEN) #define SIGBLOB_LEN (2*INTBLOB_LEN)
int int
ssh_dss_sign( ssh_dss_sign(Key *key, u_char **sigp, u_int *lenp,
Key *key,
u_char **sigp, u_int *lenp,
u_char *data, u_int datalen) u_char *data, u_int datalen)
{ {
DSA_SIG *sig; DSA_SIG *sig;
@ -71,7 +69,7 @@ ssh_dss_sign(
rlen = BN_num_bytes(sig->r); rlen = BN_num_bytes(sig->r);
slen = BN_num_bytes(sig->s); slen = BN_num_bytes(sig->s);
if (rlen > INTBLOB_LEN || slen > INTBLOB_LEN) { if (rlen > INTBLOB_LEN || slen > INTBLOB_LEN) {
error("bad sig size %d %d", rlen, slen); error("bad sig size %u %u", rlen, slen);
DSA_SIG_free(sig); DSA_SIG_free(sig);
return -1; return -1;
} }
@ -104,9 +102,7 @@ ssh_dss_sign(
return 0; return 0;
} }
int int
ssh_dss_verify( ssh_dss_verify(Key *key, u_char *signature, u_int signaturelen,
Key *key,
u_char *signature, u_int signaturelen,
u_char *data, u_int datalen) u_char *data, u_int datalen)
{ {
DSA_SIG *sig; DSA_SIG *sig;
@ -151,7 +147,7 @@ ssh_dss_verify(
} }
if (len != SIGBLOB_LEN) { if (len != SIGBLOB_LEN) {
fatal("bad sigbloblen %d != SIGBLOB_LEN", len); fatal("bad sigbloblen %u != SIGBLOB_LEN", len);
} }
/* parse signature */ /* parse signature */

24
ssh-rsa.c
View File

@ -23,7 +23,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: ssh-rsa.c,v 1.20 2002/06/10 16:53:06 stevesk Exp $"); RCSID("$OpenBSD: ssh-rsa.c,v 1.21 2002/06/23 03:30:17 deraadt Exp $");
#include <openssl/evp.h> #include <openssl/evp.h>
#include <openssl/err.h> #include <openssl/err.h>
@ -39,9 +39,7 @@ RCSID("$OpenBSD: ssh-rsa.c,v 1.20 2002/06/10 16:53:06 stevesk Exp $");
/* RSASSA-PKCS1-v1_5 (PKCS #1 v2.0 signature) with SHA1 */ /* RSASSA-PKCS1-v1_5 (PKCS #1 v2.0 signature) with SHA1 */
int int
ssh_rsa_sign( ssh_rsa_sign(Key *key, u_char **sigp, u_int *lenp,
Key *key,
u_char **sigp, u_int *lenp,
u_char *data, u_int datalen) u_char *data, u_int datalen)
{ {
const EVP_MD *evp_md; const EVP_MD *evp_md;
@ -72,17 +70,18 @@ ssh_rsa_sign(
if (ok != 1) { if (ok != 1) {
int ecode = ERR_get_error(); int ecode = ERR_get_error();
error("ssh_rsa_sign: RSA_sign failed: %s", ERR_error_string(ecode, NULL)); error("ssh_rsa_sign: RSA_sign failed: %s",
ERR_error_string(ecode, NULL));
xfree(sig); xfree(sig);
return -1; return -1;
} }
if (len < slen) { if (len < slen) {
int diff = slen - len; int diff = slen - len;
debug("slen %d > len %d", slen, len); debug("slen %u > len %u", slen, len);
memmove(sig + diff, sig, len); memmove(sig + diff, sig, len);
memset(sig, 0, diff); memset(sig, 0, diff);
} else if (len > slen) { } else if (len > slen) {
error("ssh_rsa_sign: slen %d slen2 %d", slen, len); error("ssh_rsa_sign: slen %u slen2 %u", slen, len);
xfree(sig); xfree(sig);
return -1; return -1;
} }
@ -105,9 +104,7 @@ ssh_rsa_sign(
} }
int int
ssh_rsa_verify( ssh_rsa_verify(Key *key, u_char *signature, u_int signaturelen,
Key *key,
u_char *signature, u_int signaturelen,
u_char *data, u_int datalen) u_char *data, u_int datalen)
{ {
Buffer b; Buffer b;
@ -148,12 +145,12 @@ ssh_rsa_verify(
/* RSA_verify expects a signature of RSA_size */ /* RSA_verify expects a signature of RSA_size */
modlen = RSA_size(key->rsa); modlen = RSA_size(key->rsa);
if (len > modlen) { if (len > modlen) {
error("ssh_rsa_verify: len %d > modlen %d", len, modlen); error("ssh_rsa_verify: len %u > modlen %u", len, modlen);
xfree(sigblob); xfree(sigblob);
return -1; return -1;
} else if (len < modlen) { } else if (len < modlen) {
int diff = modlen - len; int diff = modlen - len;
debug("ssh_rsa_verify: add padding: modlen %d > len %d", debug("ssh_rsa_verify: add padding: modlen %u > len %u",
modlen, len); modlen, len);
sigblob = xrealloc(sigblob, modlen); sigblob = xrealloc(sigblob, modlen);
memmove(sigblob + diff, sigblob, len); memmove(sigblob + diff, sigblob, len);
@ -176,7 +173,8 @@ ssh_rsa_verify(
xfree(sigblob); xfree(sigblob);
if (ret == 0) { if (ret == 0) {
int ecode = ERR_get_error(); int ecode = ERR_get_error();
error("ssh_rsa_verify: RSA_verify failed: %s", ERR_error_string(ecode, NULL)); error("ssh_rsa_verify: RSA_verify failed: %s",
ERR_error_string(ecode, NULL));
} }
debug("ssh_rsa_verify: signature %scorrect", (ret==0) ? "in" : ""); debug("ssh_rsa_verify: signature %scorrect", (ret==0) ? "in" : "");
return ret; return ret;

5
sshconnect.c
View File

@ -13,7 +13,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: sshconnect.c,v 1.125 2002/06/19 00:27:55 deraadt Exp $"); RCSID("$OpenBSD: sshconnect.c,v 1.126 2002/06/23 03:30:17 deraadt Exp $");
#include <openssl/bn.h> #include <openssl/bn.h>
@ -266,7 +266,7 @@ ssh_connect(const char *host, struct sockaddr_storage * hostaddr,
memset(&hints, 0, sizeof(hints)); memset(&hints, 0, sizeof(hints));
hints.ai_family = family; hints.ai_family = family;
hints.ai_socktype = SOCK_STREAM; hints.ai_socktype = SOCK_STREAM;
snprintf(strport, sizeof strport, "%d", port); snprintf(strport, sizeof strport, "%u", port);
if ((gaierr = getaddrinfo(host, strport, &hints, &aitop)) != 0) if ((gaierr = getaddrinfo(host, strport, &hints, &aitop)) != 0)
fatal("%s: %.100s: %s", __progname, host, fatal("%s: %.100s: %s", __progname, host,
gai_strerror(gaierr)); gai_strerror(gaierr));
@ -489,7 +489,6 @@ confirm(const char *prompt)
* check whether the supplied host key is valid, return -1 if the key * check whether the supplied host key is valid, return -1 if the key
* is not valid. the user_hostfile will not be updated if 'readonly' is true. * is not valid. the user_hostfile will not be updated if 'readonly' is true.
*/ */
static int static int
check_host_key(char *host, struct sockaddr *hostaddr, Key *host_key, check_host_key(char *host, struct sockaddr *hostaddr, Key *host_key,
int readonly, const char *user_hostfile, const char *system_hostfile) int readonly, const char *user_hostfile, const char *system_hostfile)

13
sshconnect2.c
View File

@ -23,7 +23,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: sshconnect2.c,v 1.104 2002/06/19 00:27:55 deraadt Exp $"); RCSID("$OpenBSD: sshconnect2.c,v 1.105 2002/06/23 03:30:17 deraadt Exp $");
#include "ssh.h" #include "ssh.h"
#include "ssh2.h" #include "ssh2.h"
@ -299,12 +299,14 @@ userauth(Authctxt *authctxt, char *authlist)
} }
} }
} }
void void
input_userauth_error(int type, u_int32_t seq, void *ctxt) input_userauth_error(int type, u_int32_t seq, void *ctxt)
{ {
fatal("input_userauth_error: bad message during authentication: " fatal("input_userauth_error: bad message during authentication: "
"type %d", type); "type %d", type);
} }
void void
input_userauth_banner(int type, u_int32_t seq, void *ctxt) input_userauth_banner(int type, u_int32_t seq, void *ctxt)
{ {
@ -316,6 +318,7 @@ input_userauth_banner(int type, u_int32_t seq, void *ctxt)
xfree(msg); xfree(msg);
xfree(lang); xfree(lang);
} }
void void
input_userauth_success(int type, u_int32_t seq, void *ctxt) input_userauth_success(int type, u_int32_t seq, void *ctxt)
{ {
@ -327,6 +330,7 @@ input_userauth_success(int type, u_int32_t seq, void *ctxt)
clear_auth_state(authctxt); clear_auth_state(authctxt);
authctxt->success = 1; /* break out */ authctxt->success = 1; /* break out */
} }
void void
input_userauth_failure(int type, u_int32_t seq, void *ctxt) input_userauth_failure(int type, u_int32_t seq, void *ctxt)
{ {
@ -375,7 +379,7 @@ input_userauth_pk_ok(int type, u_int32_t seq, void *ctxt)
} }
packet_check_eom(); packet_check_eom();
debug("input_userauth_pk_ok: pkalg %s blen %d lastkey %p hint %d", debug("input_userauth_pk_ok: pkalg %s blen %u lastkey %p hint %d",
pkalg, blen, authctxt->last_key, authctxt->last_key_hint); pkalg, blen, authctxt->last_key, authctxt->last_key_hint);
do { do {
@ -894,9 +898,7 @@ input_userauth_info_req(int type, u_int32_t seq, void *ctxt)
} }
static int static int
ssh_keysign( ssh_keysign(Key *key, u_char **sigp, u_int *lenp,
Key *key,
u_char **sigp, u_int *lenp,
u_char *data, u_int datalen) u_char *data, u_int datalen)
{ {
Buffer b; Buffer b;
@ -1098,6 +1100,7 @@ authmethod_lookup(const char *name)
static Authmethod *current = NULL; static Authmethod *current = NULL;
static char *supported = NULL; static char *supported = NULL;
static char *preferred = NULL; static char *preferred = NULL;
/* /*
* Given the authentication method list sent by the server, return the * Given the authentication method list sent by the server, return the
* next method we should try. If the server initially sends a nil list, * next method we should try. If the server initially sends a nil list,

6
sshd.c
View File

@ -42,7 +42,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: sshd.c,v 1.248 2002/06/22 20:05:27 stevesk Exp $"); RCSID("$OpenBSD: sshd.c,v 1.249 2002/06/23 03:30:17 deraadt Exp $");
#include <openssl/dh.h> #include <openssl/dh.h>
#include <openssl/bn.h> #include <openssl/bn.h>
@ -372,7 +372,8 @@ sshd_exchange_identification(int sock_in, int sock_out)
if (client_version_string == NULL) { if (client_version_string == NULL) {
/* Send our protocol version identification. */ /* Send our protocol version identification. */
if (atomicio(write, sock_out, server_version_string, strlen(server_version_string)) if (atomicio(write, sock_out, server_version_string,
strlen(server_version_string))
!= strlen(server_version_string)) { != strlen(server_version_string)) {
log("Could not write ident string to %s", get_remote_ipaddr()); log("Could not write ident string to %s", get_remote_ipaddr());
fatal_cleanup(); fatal_cleanup();
@ -475,7 +476,6 @@ sshd_exchange_identification(int sock_in, int sock_out)
} }
} }
/* Destroy the host and server keys. They will no longer be needed. */ /* Destroy the host and server keys. They will no longer be needed. */
void void
destroy_sensitive_data(void) destroy_sensitive_data(void)

9
sshlogin.c
View File

@ -39,7 +39,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: sshlogin.c,v 1.3 2001/12/19 07:18:56 deraadt Exp $"); RCSID("$OpenBSD: sshlogin.c,v 1.4 2002/06/23 03:30:17 deraadt Exp $");
#include "loginrec.h" #include "loginrec.h"
@ -48,10 +48,9 @@ RCSID("$OpenBSD: sshlogin.c,v 1.3 2001/12/19 07:18:56 deraadt Exp $");
* information is not available. This must be called before record_login. * information is not available. This must be called before record_login.
* The host the user logged in from will be returned in buf. * The host the user logged in from will be returned in buf.
*/ */
u_long u_long
get_last_login_time(uid_t uid, const char *logname, get_last_login_time(uid_t uid, const char *logname,
char *buf, u_int bufsize) char *buf, u_int bufsize)
{ {
struct logininfo li; struct logininfo li;
@ -64,10 +63,9 @@ get_last_login_time(uid_t uid, const char *logname,
* Records that the user has logged in. I these parts of operating systems * Records that the user has logged in. I these parts of operating systems
* were more standardized. * were more standardized.
*/ */
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;
@ -92,7 +90,6 @@ record_utmp_only(pid_t pid, const char *ttyname, const char *user,
#endif #endif
/* Records that the user has logged out. */ /* Records that the user has logged out. */
void void
record_logout(pid_t pid, const char *ttyname, const char *user) record_logout(pid_t pid, const char *ttyname, const char *user)
{ {

6
sshpty.c
View File

@ -12,7 +12,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: sshpty.c,v 1.4 2001/12/19 07:18:56 deraadt Exp $"); RCSID("$OpenBSD: sshpty.c,v 1.5 2002/06/23 03:30:58 deraadt Exp $");
#ifdef HAVE_UTIL_H #ifdef HAVE_UTIL_H
# include <util.h> # include <util.h>
@ -394,11 +394,11 @@ pty_setowner(struct passwd *pw, const char *ttyname)
if (chown(ttyname, pw->pw_uid, gid) < 0) { if (chown(ttyname, pw->pw_uid, gid) < 0) {
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, %u, %u) 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, %u, %u) failed: %.100s",
ttyname, pw->pw_uid, gid, ttyname, pw->pw_uid, gid,
strerror(errno)); strerror(errno));
} }