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) [regress/modpipe.c regress/rekey.sh] Never intended to commit these

This commit is contained in:
Damien Miller 2013-11-07 12:03:26 +11:00
parent c98319750b
commit a6fd1d3c38
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -2,6 +2,7 @@
- (djm) [ssh-pkcs11.c] Bring back "non-constant initialiser" fix (rev 1.5) - (djm) [ssh-pkcs11.c] Bring back "non-constant initialiser" fix (rev 1.5)
that got lost in recent merge. that got lost in recent merge.
- (djm) [Makefile.in monitor.c] Missed chunks of curve25519 KEX diff - (djm) [Makefile.in monitor.c] Missed chunks of curve25519 KEX diff
- (djm) [regress/modpipe.c regress/rekey.sh] Never intended to commit these
20131104 20131104
- (djm) OpenBSD CVS Sync - (djm) OpenBSD CVS Sync

4
regress/modpipe.c
View File

@ -68,7 +68,7 @@ usage(void)
#define MAX_MODIFICATIONS 256 #define MAX_MODIFICATIONS 256
struct modification { struct modification {
enum { MOD_XOR, MOD_AND_OR } what; enum { MOD_XOR, MOD_AND_OR } what;
unsigned long long offset; u_int64_t offset;
u_int8_t m1, m2; u_int8_t m1, m2;
}; };
@ -79,7 +79,7 @@ parse_modification(const char *s, struct modification *m)
int n, m1, m2; int n, m1, m2;
bzero(m, sizeof(*m)); bzero(m, sizeof(*m));
if ((n = sscanf(s, "%16[^:]%*[:]%llu%*[:]%i%*[:]%i", if ((n = sscanf(s, "%16[^:]%*[:]%lli%*[:]%i%*[:]%i",
what, &m->offset, &m1, &m2)) < 3) what, &m->offset, &m1, &m2)) < 3)
errx(1, "Invalid modification spec \"%s\"", s); errx(1, "Invalid modification spec \"%s\"", s);
if (strcasecmp(what, "xor") == 0) { if (strcasecmp(what, "xor") == 0) {

2
regress/rekey.sh
View File

@ -1,8 +1,6 @@
# $OpenBSD: rekey.sh,v 1.8 2013/05/17 04:29:14 dtucker Exp $ # $OpenBSD: rekey.sh,v 1.8 2013/05/17 04:29:14 dtucker Exp $
# Placed in the Public Domain. # Placed in the Public Domain.
set -x
tid="rekey" tid="rekey"
LOG=${TEST_SSH_LOGFILE} LOG=${TEST_SSH_LOGFILE}