summaryrefslogtreecommitdiff
path: root/packet.c
diff options
context:
space:
mode:
authormarkus@openbsd.org <markus@openbsd.org>2015-12-04 16:41:28 +0000
committerDamien Miller <djm@mindrot.org>2015-12-07 12:38:58 +1100
commit76c9fbbe35aabc1db977fb78e827644345e9442e (patch)
treee7c85e7e1471f1bd00b3a50a58e315c055f40b86 /packet.c
parent6064a8b8295cb5a17b5ebcfade53053377714f40 (diff)
upstream commit
implement SHA2-{256,512} for RSASSA-PKCS1-v1_5 signatures (user and host auth) based on draft-rsa-dsa-sha2-256-03.txt and draft-ssh-ext-info-04.txt; with & ok djm@ Upstream-ID: cf82ce532b2733e5c4b34bb7b7c94835632db309
Diffstat (limited to 'packet.c')
-rw-r--r--packet.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/packet.c b/packet.c
index 4f6433b47..378906956 100644
--- a/packet.c
+++ b/packet.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: packet.c,v 1.217 2015/11/08 21:59:11 djm Exp $ */ 1/* $OpenBSD: packet.c,v 1.218 2015/12/04 16:41:28 markus Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1215,7 +1215,8 @@ ssh_packet_send2(struct ssh *ssh)
1215 if ((type < SSH2_MSG_TRANSPORT_MIN) || 1215 if ((type < SSH2_MSG_TRANSPORT_MIN) ||
1216 (type > SSH2_MSG_TRANSPORT_MAX) || 1216 (type > SSH2_MSG_TRANSPORT_MAX) ||
1217 (type == SSH2_MSG_SERVICE_REQUEST) || 1217 (type == SSH2_MSG_SERVICE_REQUEST) ||
1218 (type == SSH2_MSG_SERVICE_ACCEPT)) { 1218 (type == SSH2_MSG_SERVICE_ACCEPT) ||
1219 (type == SSH2_MSG_EXT_INFO)) {
1219 debug("enqueue packet: %u", type); 1220 debug("enqueue packet: %u", type);
1220 p = calloc(1, sizeof(*p)); 1221 p = calloc(1, sizeof(*p));
1221 if (p == NULL) 1222 if (p == NULL)