08fc2550dd
on ssh anyways, but better to make sure). Fixed some
more ssh_*_{en,de}code calls missing necessary casts.
Disabled x11-security extension on x86_64 as it does not
work there (uses xauth instead). Updated pkgrevision.
63 lines
2.9 KiB
Text
63 lines
2.9 KiB
Text
$NetBSD: patch-av,v 1.1 2006/09/22 13:58:46 kivinen Exp $
|
|
|
|
--- apps/ssh/authc-pubkey.c.orig 2003-12-03 15:17:24.000000000 +0200
|
|
+++ apps/ssh/authc-pubkey.c
|
|
@@ -208,7 +208,8 @@ SshBuffer ssh_client_auth_pubkey_try_key
|
|
if (!draft_incompatibility)
|
|
{
|
|
ssh_encode_buffer(b,
|
|
- SSH_FORMAT_BOOLEAN, FALSE,
|
|
+ SSH_FORMAT_BOOLEAN,
|
|
+ (Boolean) FALSE,
|
|
SSH_FORMAT_UINT32_STR, c->pubkey_alg,
|
|
strlen((char *)c->pubkey_alg),
|
|
SSH_FORMAT_UINT32_STR, c->pubkeyblob,
|
|
@@ -219,7 +220,8 @@ SshBuffer ssh_client_auth_pubkey_try_key
|
|
{
|
|
/* Remote end has publickey draft incompatibility bug. */
|
|
ssh_encode_buffer(b,
|
|
- SSH_FORMAT_BOOLEAN, FALSE,
|
|
+ SSH_FORMAT_BOOLEAN,
|
|
+ (Boolean) FALSE,
|
|
/* Against the draft. Here should be string
|
|
'publickey algorithm'*/
|
|
SSH_FORMAT_UINT32_STR, c->pubkeyblob,
|
|
@@ -328,7 +330,8 @@ void ssh_client_auth_pubkey_sign_complet
|
|
)
|
|
{
|
|
ssh_encode_buffer(b,
|
|
- SSH_FORMAT_BOOLEAN, TRUE,
|
|
+ SSH_FORMAT_BOOLEAN,
|
|
+ (Boolean) TRUE,
|
|
SSH_FORMAT_UINT32_STR, c->pubkey_alg,
|
|
strlen((char *)c->pubkey_alg),
|
|
SSH_FORMAT_UINT32_STR, c->pubkeyblob,
|
|
@@ -341,7 +344,8 @@ void ssh_client_auth_pubkey_sign_complet
|
|
{
|
|
/* Remote end has publickey draft incompatibility bug. */
|
|
ssh_encode_buffer(b,
|
|
- SSH_FORMAT_BOOLEAN, TRUE,
|
|
+ SSH_FORMAT_BOOLEAN,
|
|
+ (Boolean) TRUE,
|
|
/* Against the draft. Here should be string
|
|
'publickey algorithm'*/
|
|
SSH_FORMAT_UINT32_STR,
|
|
@@ -702,7 +706,8 @@ Boolean ssh_client_auth_pubkey_send_sign
|
|
strlen(service),
|
|
SSH_FORMAT_UINT32_STR, SSH_AUTH_PUBKEY,
|
|
strlen(SSH_AUTH_PUBKEY),
|
|
- SSH_FORMAT_BOOLEAN, TRUE,
|
|
+ SSH_FORMAT_BOOLEAN,
|
|
+ (Boolean) TRUE,
|
|
SSH_FORMAT_UINT32_STR, c->pubkey_alg,
|
|
strlen(c->pubkey_alg),
|
|
SSH_FORMAT_UINT32_STR, c->pubkeyblob,
|
|
@@ -722,7 +727,7 @@ Boolean ssh_client_auth_pubkey_send_sign
|
|
strlen(service),
|
|
/* against the draft. Here should
|
|
be 'string "publickey"'*/
|
|
- SSH_FORMAT_BOOLEAN, TRUE,
|
|
+ SSH_FORMAT_BOOLEAN, (Boolean) TRUE,
|
|
/* against the draft. Here should
|
|
be 'string public key algorith
|
|
name'*/
|