tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-04-08 18:35:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix outstanding merge conflicts

Browse Source
This commit is contained in:
Tess Gauthier 2023-02-03 11:34:51 -05:00
parent 50c0f38d5a
commit 1035101322
2 changed files with 0 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ssh-keygen.c
View File

@ -1943,11 +1943,7 @@ parse_hex_u64(const char *s, uint64_t *up)
unsigned long long ull;
errno = 0;
<<<<<<< HEAD
ull = strtoull(s, &ep, 16); // CodeQL [SM02313] false positive: strtoull will initialize ep.
=======
ull = strtoull(s, &ep, 16);
>>>>>>> 180f26288108247eb1245be68bf8d0e3fca17c3c
if (*s == '\0' || *ep != '\0')
fatal("Invalid certificate time: not a number");
if (errno == ERANGE && ull == ULONG_MAX)
@ -1999,11 +1995,7 @@ parse_cert_times(char *timespec)
cert_valid_to = parse_relative_time(to, now);
else if (strcmp(to, "forever") == 0)
cert_valid_to = ~(u_int64_t)0;
<<<<<<< HEAD
else if (strncmp(from, "0x", 2) == 0)
=======
else if (strncmp(to, "0x", 2) == 0)
>>>>>>> 180f26288108247eb1245be68bf8d0e3fca17c3c
parse_hex_u64(to, &cert_valid_to);
else if (parse_absolute_time(to, &cert_valid_to) != 0)
fatal("Invalid to time \"%s\"", to);
@ -3861,7 +3853,6 @@ main(int argc, char **argv)
}
if ((attest = sshbuf_new()) == NULL)
fatal("sshbuf_new failed");
<<<<<<< HEAD
#ifndef WINDOWS
if ((sk_flags &
(SSH_SK_USER_VERIFICATION_REQD|SSH_SK_RESIDENT_KEY))) {
@ -3873,12 +3864,8 @@ main(int argc, char **argv)
#else
passphrase = NULL;
#endif
for (i = 0 ; ; i++) {
r = 0;
=======
r = 0;
for (i = 0 ;;) {
>>>>>>> 180f26288108247eb1245be68bf8d0e3fca17c3c
if (!quiet) {
printf("You may need to touch your "
"authenticator%s to authorize key "

20
sshd.c
View File

@ -2020,11 +2020,7 @@ main(int ac, char **av)
/* Parse command-line arguments. */
while ((opt = getopt(ac, av,
<<<<<<< HEAD
"C:E:b:c:f:g:h:k:o:p:u:46DQRTdeiqrtyz")) != -1) {
=======
"C:E:b:c:f:g:h:k:o:p:u:46DQRTdeiqrtV")) != -1) {
>>>>>>> 180f26288108247eb1245be68bf8d0e3fca17c3c
switch (opt) {
case '4':
options.address_family = AF_INET;
@ -2125,26 +2121,10 @@ main(int ac, char **av)
exit(1);
free(line);
break;
<<<<<<< HEAD
case 'y':
privsep_unauth_child = 1;
rexec_flag = 0;
logfile = NULL;
//Sleep(10 * 1000);
break;
case 'z':
privsep_auth_child = 1;
rexec_flag = 0;
logfile = NULL;
//Sleep(10 * 1000);
break;
case '?':
=======
case 'V':
fprintf(stderr, "%s, %s\n",
SSH_VERSION, SSH_OPENSSL_VERSION);
exit(0);
>>>>>>> 180f26288108247eb1245be68bf8d0e3fca17c3c
default:
usage();
break;