tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- (djm) Use standard OpenSSL functions in auth-skey.c. Patch from 

Chris, the Young One <cky@pobox.com>
This commit is contained in:
Damien Miller 2000-07-02 19:13:56 +10:00
parent c708843e6a
commit 484118ea0f
3 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -2,6 +2,8 @@
- (djm) Fix brace mismatch from Corinna Vinschen <vinschen@cygnus.com>
- (djm) Stop shadow expiry checking from preventing logins with NIS. Based
on fix from HARUYAMA Seigo <haruyama@nt.phys.s.u-tokyo.ac.jp>
- (djm) Use standard OpenSSL functions in auth-skey.c. Patch from
Chris, the Young One <cky@pobox.com>
20000701
- (djm) Fix Tru64 SIA problems reported by John P Speno <speno@isc.upenn.edu>

9
auth-skey.c
View File

@ -4,7 +4,7 @@ RCSID("$OpenBSD: auth-skey.c,v 1.7 2000/06/20 01:39:38 markus Exp $");
#include "ssh.h"
#include "packet.h"
#include <sha1.h>
#include <openssl/sha.h>
/* from %OpenBSD: skeylogin.c,v 1.32 1999/08/16 14:46:56 millert Exp % */
@ -74,7 +74,6 @@ skey_fake_keyinfo(char *username)
size_t secretlen = 0;
SHA_CTX ctx;
char *p, *u;
char md[SHA_DIGEST_LENGTH];
/*
* Base first 4 chars of seed on hostname.
@ -99,7 +98,7 @@ skey_fake_keyinfo(char *username)
SHA1_Init(&ctx);
SHA1_Update(&ctx, username, strlen(username));
SHA1_End(&ctx, up);
SHA1_Final(up, &ctx);
/* Collapse the hash */
ptr = hash_collapse(up);
@ -133,7 +132,7 @@ skey_fake_keyinfo(char *username)
SHA1_Init(&ctx);
SHA1_Update(&ctx, secret, secretlen);
SHA1_Update(&ctx, username, strlen(username));
SHA1_End(&ctx, up);
SHA1_Final(up, &ctx);
/* Zero out */
memset(secret, 0, secretlen);
@ -141,7 +140,7 @@ skey_fake_keyinfo(char *username)
/* Now hash the hash */
SHA1_Init(&ctx);
SHA1_Update(&ctx, up, strlen(up));
SHA1_End(&ctx, up);
SHA1_Final(up, &ctx);
ptr = hash_collapse(up + 4);

14
scp.c
View File

@ -56,6 +56,14 @@ RCSID("$OpenBSD: scp.c,v 1.32 2000/06/20 01:39:44 markus Exp $");
/* For progressmeter() -- number of seconds before xfer considered "stalled" */
#define STALLTIME 5
/* Progress meter bar */
#define BAR \
"************************************************************"\
"************************************************************"\
"************************************************************"\
"************************************************************"
#define MAX_BARLENGTH (sizeof(BAR) - 1)
/* Visual statistics about files as they are transferred. */
void progressmeter(int);
@ -1172,13 +1180,11 @@ progressmeter(int flag)
snprintf(buf, sizeof(buf), "\r%-20.20s %3d%% ", curfile, ratio);
barlength = getttywidth() - 51;
barlength = (barlength <= MAX_BARLENGTH)?barlength:MAX_BARLENGTH;
if (barlength > 0) {
i = barlength * ratio / 100;
snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf),
"|%.*s%*s|", i,
"*****************************************************************************"
"*****************************************************************************",
barlength - i, "");
"|%.*s%*s|", i, BAR, barlength - i, "");
}
i = 0;
abbrevsize = cursize;