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

- dtucker@cvs.openbsd.org 2004/07/03 11:02:25 

[monitor_wrap.c]
     Put s/key functions inside #ifdef SKEY same as monitor.c,
     from des@freebsd via bz #330, ok markus@
This commit is contained in:
Darren Tucker 2004-07-08 23:09:42 +10:00
parent cd99fa0648
commit 042e2e8cbb
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -3,6 +3,10 @@
- dtucker@cvs.openbsd.org 2004/07/03 05:11:33 - dtucker@cvs.openbsd.org 2004/07/03 05:11:33
[sshlogin.c] (RCSID sync only, the corresponding code is not in Portable) [sshlogin.c] (RCSID sync only, the corresponding code is not in Portable)
Use '\0' not 0 for string; ok djm@, deraadt@ Use '\0' not 0 for string; ok djm@, deraadt@
- dtucker@cvs.openbsd.org 2004/07/03 11:02:25
[monitor_wrap.c]
Put s/key functions inside #ifdef SKEY same as monitor.c,
from des@freebsd via bz #330, ok markus@
20040702 20040702
- (dtucker) [mdoc2man.awk] Teach it to ignore .Bk -words, reported by - (dtucker) [mdoc2man.awk] Teach it to ignore .Bk -words, reported by
@ -1487,4 +1491,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
$Id: ChangeLog,v 1.3469 2004/07/08 13:08:26 dtucker Exp $ $Id: ChangeLog,v 1.3470 2004/07/08 13:09:42 dtucker Exp $

4
monitor_wrap.c
View File

@ -25,7 +25,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: monitor_wrap.c,v 1.37 2004/06/22 05:05:45 dtucker Exp $"); RCSID("$OpenBSD: monitor_wrap.c,v 1.38 2004/07/03 11:02:25 dtucker Exp $");
#include <openssl/bn.h> #include <openssl/bn.h>
#include <openssl/dh.h> #include <openssl/dh.h>
@ -914,6 +914,7 @@ mm_bsdauth_respond(void *ctx, u_int numresponses, char **responses)
return ((authok == 0) ? -1 : 0); return ((authok == 0) ? -1 : 0);
} }
#ifdef SKEY
int int
mm_skey_query(void *ctx, char **name, char **infotxt, mm_skey_query(void *ctx, char **name, char **infotxt,
u_int *numprompts, char ***prompts, u_int **echo_on) u_int *numprompts, char ***prompts, u_int **echo_on)
@ -977,6 +978,7 @@ mm_skey_respond(void *ctx, u_int numresponses, char **responses)
return ((authok == 0) ? -1 : 0); return ((authok == 0) ? -1 : 0);
} }
#endif /* SKEY */
void void
mm_ssh1_session_id(u_char session_id[16]) mm_ssh1_session_id(u_char session_id[16])