mirror of
https://github.com/PowerShell/openssh-portable.git
synced 2025-07-28 00:04:30 +02:00
- djm@cvs.openbsd.org 2012/11/14 02:32:15
[ssh-keygen.c] allow the full range of unsigned serial numbers; 'fine' deraadt@
This commit is contained in:
parent
1e85469fcb
commit
6f3b362fa8
@ -5,7 +5,9 @@
|
|||||||
fix username passed to helper program
|
fix username passed to helper program
|
||||||
prepare stdio fds before closefrom()
|
prepare stdio fds before closefrom()
|
||||||
spotted by landry@
|
spotted by landry@
|
||||||
|
- djm@cvs.openbsd.org 2012/11/14 02:32:15
|
||||||
|
[ssh-keygen.c]
|
||||||
|
allow the full range of unsigned serial numbers; 'fine' deraadt@
|
||||||
|
|
||||||
20121107
|
20121107
|
||||||
- (djm) OpenBSD CVS Sync
|
- (djm) OpenBSD CVS Sync
|
||||||
|
12
ssh-keygen.c
12
ssh-keygen.c
@ -1,4 +1,4 @@
|
|||||||
/* $OpenBSD: ssh-keygen.c,v 1.218 2012/10/02 07:07:45 djm Exp $ */
|
/* $OpenBSD: ssh-keygen.c,v 1.219 2012/11/14 02:32:15 djm Exp $ */
|
||||||
/*
|
/*
|
||||||
* Author: Tatu Ylonen <ylo@cs.hut.fi>
|
* Author: Tatu Ylonen <ylo@cs.hut.fi>
|
||||||
* Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
|
* Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
|
||||||
@ -1937,7 +1937,7 @@ main(int argc, char **argv)
|
|||||||
{
|
{
|
||||||
char dotsshdir[MAXPATHLEN], comment[1024], *passphrase1, *passphrase2;
|
char dotsshdir[MAXPATHLEN], comment[1024], *passphrase1, *passphrase2;
|
||||||
char *checkpoint = NULL;
|
char *checkpoint = NULL;
|
||||||
char out_file[MAXPATHLEN], *rr_hostname = NULL;
|
char out_file[MAXPATHLEN], *rr_hostname = NULL, *ep;
|
||||||
Key *private, *public;
|
Key *private, *public;
|
||||||
struct passwd *pw;
|
struct passwd *pw;
|
||||||
struct stat st;
|
struct stat st;
|
||||||
@ -2145,9 +2145,11 @@ main(int argc, char **argv)
|
|||||||
parse_cert_times(optarg);
|
parse_cert_times(optarg);
|
||||||
break;
|
break;
|
||||||
case 'z':
|
case 'z':
|
||||||
cert_serial = strtonum(optarg, 0, LLONG_MAX, &errstr);
|
errno = 0;
|
||||||
if (errstr)
|
cert_serial = strtoull(optarg, &ep, 10);
|
||||||
fatal("Invalid serial number: %s", errstr);
|
if (*optarg < '0' || *optarg > '9' || *ep != '\0' ||
|
||||||
|
(errno == ERANGE && cert_serial == ULLONG_MAX))
|
||||||
|
fatal("Invalid serial number \"%s\"", optarg);
|
||||||
break;
|
break;
|
||||||
case '?':
|
case '?':
|
||||||
default:
|
default:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user