diff options
| author | Damien Miller <djm@mindrot.org> | 2012-12-03 11:25:30 +1100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2012-12-03 11:25:30 +1100 |
| commit | 55aca027ed24f8fdce43bd451ce96b89f979606c (patch) | |
| tree | 0b39e56f5702315259b4a4a787cae53e94240d80 | |
| parent | 999bd2d259c1dacb53a2d8be31d4c1861b58cdb3 (diff) | |
| download | openssh-git-55aca027ed24f8fdce43bd451ce96b89f979606c.tar.gz | |
- djm@cvs.openbsd.org 2012/12/03 00:14:06
[auth2-chall.c ssh-keygen.c]
Fix compilation with -Wall -Werror (trivial type fixes)
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | auth2-chall.c | 5 | ||||
| -rw-r--r-- | ssh-keygen.c | 4 |
3 files changed, 8 insertions, 4 deletions
@@ -30,6 +30,9 @@ - djm@cvs.openbsd.org 2012/12/02 20:47:48 [Makefile regress/forward-control.sh] regress for AllowTcpForwarding local/remote; ok markus@ + - djm@cvs.openbsd.org 2012/12/03 00:14:06 + [auth2-chall.c ssh-keygen.c] + Fix compilation with -Wall -Werror (trivial type fixes) 20121114 - (djm) OpenBSD CVS Sync diff --git a/auth2-chall.c b/auth2-chall.c index 8fdb3349..6505d400 100644 --- a/auth2-chall.c +++ b/auth2-chall.c @@ -1,4 +1,4 @@ -/* $OpenBSD: auth2-chall.c,v 1.35 2012/12/02 20:34:09 djm Exp $ */ +/* $OpenBSD: auth2-chall.c,v 1.36 2012/12/03 00:14:06 djm Exp $ */ /* * Copyright (c) 2001 Markus Friedl. All rights reserved. * Copyright (c) 2001 Per Allansson. All rights reserved. @@ -283,7 +283,8 @@ input_userauth_info_response(int type, u_int32_t seq, void *ctxt) KbdintAuthctxt *kbdintctxt; int authenticated = 0, res; u_int i, nresp; - char *devicename = NULL, **response = NULL; + const char *devicename = NULL; + char **response = NULL; if (authctxt == NULL) fatal("input_userauth_info_response: no authctxt"); diff --git a/ssh-keygen.c b/ssh-keygen.c index 2d8af679..1bbe0b0a 100644 --- a/ssh-keygen.c +++ b/ssh-keygen.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-keygen.c,v 1.219 2012/11/14 02:32:15 djm Exp $ */ +/* $OpenBSD: ssh-keygen.c,v 1.220 2012/12/03 00:14:06 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -104,7 +104,7 @@ char *identity_comment = NULL; char *ca_key_path = NULL; /* Certificate serial number */ -long long cert_serial = 0; +unsigned long long cert_serial = 0; /* Key type when certifying */ u_int cert_key_type = SSH2_CERT_TYPE_USER; |