tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-27 07:44:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

upstream: Remove now-unused proto_spec and associated definitions.

Browse Source 
ok djm@

OpenBSD-Commit-ID: 2e2b18e3aa6ee22a7b69c39f2d3bd679ec35c362
This commit is contained in:
dtucker@openbsd.org 2020-06-01 07:11:38 +00:00 committed by Darren Tucker
parent 5ad3c3a33e
commit b458423a38
2 changed files with 2 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
compat.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: compat.c,v 1.113 2018/08/13 02:41:05 djm Exp $ */ /* $OpenBSD: compat.c,v 1.114 2020/06/01 07:11:38 dtucker Exp $ */
/* /*
* Copyright (c) 1999, 2000, 2001, 2002 Markus Friedl. All rights reserved. * Copyright (c) 1999, 2000, 2001, 2002 Markus Friedl. All rights reserved.
* *
@ -157,32 +157,6 @@ compat_datafellows(const char *version)
return 0; return 0;
} }
#define SEP ","
int
proto_spec(const char *spec)
{
char *s, *p, *q;
int ret = SSH_PROTO_UNKNOWN;
if (spec == NULL)
return ret;
q = s = strdup(spec);
if (s == NULL)
return ret;
for ((p = strsep(&q, SEP)); p && *p != '\0'; (p = strsep(&q, SEP))) {
switch (atoi(p)) {
case 2:
ret |= SSH_PROTO_2;
break;
default:
logit("ignoring bad proto spec: '%s'.", p);
break;
}
}
free(s);
return ret;
}
char * char *
compat_cipher_proposal(char *cipher_prop) compat_cipher_proposal(char *cipher_prop)
{ {

8
compat.h
View File

@ -1,4 +1,4 @@
/* $OpenBSD: compat.h,v 1.54 2018/08/13 02:41:05 djm Exp $ */ /* $OpenBSD: compat.h,v 1.55 2020/06/01 07:11:38 dtucker Exp $ */
/* /*
* Copyright (c) 1999, 2000, 2001 Markus Friedl. All rights reserved. * Copyright (c) 1999, 2000, 2001 Markus Friedl. All rights reserved.
@ -27,11 +27,6 @@
#ifndef COMPAT_H #ifndef COMPAT_H
#define COMPAT_H #define COMPAT_H
#define SSH_PROTO_UNKNOWN 0x00
#define SSH_PROTO_1 0x01
#define SSH_PROTO_1_PREFERRED 0x02
#define SSH_PROTO_2 0x04
#define SSH_BUG_UTF8TTYMODE 0x00000001 #define SSH_BUG_UTF8TTYMODE 0x00000001
#define SSH_BUG_SIGTYPE 0x00000002 #define SSH_BUG_SIGTYPE 0x00000002
/* #define unused 0x00000004 */ /* #define unused 0x00000004 */
@ -64,7 +59,6 @@
#define SSH_BUG_DHGEX_LARGE 0x40000000 #define SSH_BUG_DHGEX_LARGE 0x40000000
u_int compat_datafellows(const char *); u_int compat_datafellows(const char *);
int proto_spec(const char *);
char *compat_cipher_proposal(char *); char *compat_cipher_proposal(char *);
char *compat_pkalg_proposal(char *); char *compat_pkalg_proposal(char *);
char *compat_kex_proposal(char *); char *compat_kex_proposal(char *);