summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--auth2-chall.c5
-rw-r--r--ssh-keygen.c4
3 files changed, 8 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 2e9c4e279..83b13d7d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -30,6 +30,9 @@
30 - djm@cvs.openbsd.org 2012/12/02 20:47:48 30 - djm@cvs.openbsd.org 2012/12/02 20:47:48
31 [Makefile regress/forward-control.sh] 31 [Makefile regress/forward-control.sh]
32 regress for AllowTcpForwarding local/remote; ok markus@ 32 regress for AllowTcpForwarding local/remote; ok markus@
33 - djm@cvs.openbsd.org 2012/12/03 00:14:06
34 [auth2-chall.c ssh-keygen.c]
35 Fix compilation with -Wall -Werror (trivial type fixes)
33 36
3420121114 3720121114
35 - (djm) OpenBSD CVS Sync 38 - (djm) OpenBSD CVS Sync
diff --git a/auth2-chall.c b/auth2-chall.c
index 8fdb33498..6505d4009 100644
--- a/auth2-chall.c
+++ b/auth2-chall.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: auth2-chall.c,v 1.35 2012/12/02 20:34:09 djm Exp $ */ 1/* $OpenBSD: auth2-chall.c,v 1.36 2012/12/03 00:14:06 djm Exp $ */
2/* 2/*
3 * Copyright (c) 2001 Markus Friedl. All rights reserved. 3 * Copyright (c) 2001 Markus Friedl. All rights reserved.
4 * Copyright (c) 2001 Per Allansson. All rights reserved. 4 * Copyright (c) 2001 Per Allansson. All rights reserved.
@@ -283,7 +283,8 @@ input_userauth_info_response(int type, u_int32_t seq, void *ctxt)
283 KbdintAuthctxt *kbdintctxt; 283 KbdintAuthctxt *kbdintctxt;
284 int authenticated = 0, res; 284 int authenticated = 0, res;
285 u_int i, nresp; 285 u_int i, nresp;
286 char *devicename = NULL, **response = NULL; 286 const char *devicename = NULL;
287 char **response = NULL;
287 288
288 if (authctxt == NULL) 289 if (authctxt == NULL)
289 fatal("input_userauth_info_response: no authctxt"); 290 fatal("input_userauth_info_response: no authctxt");
diff --git a/ssh-keygen.c b/ssh-keygen.c
index 2d8af679c..1bbe0b0a8 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh-keygen.c,v 1.219 2012/11/14 02:32:15 djm Exp $ */ 1/* $OpenBSD: ssh-keygen.c,v 1.220 2012/12/03 00:14:06 djm Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -104,7 +104,7 @@ char *identity_comment = NULL;
104char *ca_key_path = NULL; 104char *ca_key_path = NULL;
105 105
106/* Certificate serial number */ 106/* Certificate serial number */
107long long cert_serial = 0; 107unsigned long long cert_serial = 0;
108 108
109/* Key type when certifying */ 109/* Key type when certifying */
110u_int cert_key_type = SSH2_CERT_TYPE_USER; 110u_int cert_key_type = SSH2_CERT_TYPE_USER;