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@cvs.openbsd.org 2013/02/19 02:14:09 

[integrity.sh]
     oops, forgot to increase the output of the ssh command to ensure that
     we actually reach $offset
This commit is contained in:
Damien Miller 2013-02-19 13:15:01 +11:00
parent 0dc3bc908e
commit b3764e1202
4 changed files with 38 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -4,6 +4,10 @@
[integrity.sh] [integrity.sh]
crank the offset yet again; it was still fuzzing KEX one of Darren's crank the offset yet again; it was still fuzzing KEX one of Darren's
portable test hosts at 2800 portable test hosts at 2800
- djm@cvs.openbsd.org 2013/02/19 02:14:09
[integrity.sh]
oops, forgot to increase the output of the ssh command to ensure that
we actually reach $offset
20130217 20130217
- OpenBSD CVS Sync - OpenBSD CVS Sync

2
regress/Makefile
View File

@ -90,6 +90,8 @@ TEST_ENV= "MALLOC_OPTIONS=AFGJPRX"
TEST_SSH_SSHKEYGEN?=ssh-keygen TEST_SSH_SSHKEYGEN?=ssh-keygen
CPPFLAGS=-I..
t1: t1:
${TEST_SSH_SSHKEYGEN} -if ${.CURDIR}/rsa_ssh2.prv | diff - ${.CURDIR}/rsa_openssh.prv ${TEST_SSH_SSHKEYGEN} -if ${.CURDIR}/rsa_ssh2.prv | diff - ${.CURDIR}/rsa_openssh.prv
tr '\n' '\r' <${.CURDIR}/rsa_ssh2.prv > ${.OBJDIR}/rsa_ssh2_cr.prv tr '\n' '\r' <${.CURDIR}/rsa_ssh2.prv > ${.OBJDIR}/rsa_ssh2_cr.prv

4
regress/integrity.sh
View File

@ -1,4 +1,4 @@
# $OpenBSD: integrity.sh,v 1.5 2013/02/18 22:26:47 djm Exp $ # $OpenBSD: integrity.sh,v 1.6 2013/02/19 02:14:09 djm Exp $
# Placed in the Public Domain. # Placed in the Public Domain.
tid="integrity" tid="integrity"
@ -46,7 +46,7 @@ for m in $macs; do
*) macopt="-m $m";; *) macopt="-m $m";;
esac esac
output=$(${SSH} $macopt -2F $OBJ/ssh_proxy -o "$pxy" \ output=$(${SSH} $macopt -2F $OBJ/ssh_proxy -o "$pxy" \
999.999.999.999 'printf "%2048s" " "' 2>&1) 999.999.999.999 'printf "%4096s" " "' 2>&1)
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
fail "ssh -m $m succeeds with bit-flip at $off" fail "ssh -m $m succeeds with bit-flip at $off"
fi fi

32
regress/modpipe.c
View File

@ -14,16 +14,44 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: modpipe.c,v 1.1 2012/12/11 23:54:40 djm Exp $ */ /* $Id: modpipe.c,v 1.2 2013/02/19 02:15:08 djm Exp $ */
#include <sys/types.h> #include <sys/types.h>
#include <unistd.h> #include <unistd.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <stdarg.h>
#include <stdlib.h> #include <stdlib.h>
#include <err.h>
#include <errno.h> #include <errno.h>
static void err(int, const char *, ...) __attribute__((format(printf, 2, 3)));
static void errx(int, const char *, ...) __attribute__((format(printf, 2, 3)));
static void
err(int r, const char *fmt, ...)
{
va_list args;
va_start(args, fmt);
fprintf(stderr, "%s: ", strerror(errno));
vfprintf(stderr, fmt, args);
fputc('\n', stderr);
va_end(args);
exit(r);
}
static void
errx(int r, const char *fmt, ...)
{
va_list args;
va_start(args, fmt);
vfprintf(stderr, fmt, args);
fputc('\n', stderr);
va_end(args);
exit(r);
}
static void static void
usage(void) usage(void)
{ {