openbsd/libopenssh
1
0
Fork 0
mirror of https://github.com/openssh/libopenssh synced 2026-04-25 14:19:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

compat.c: remove dependencies on xmalloc and Buffer

Browse Source
This commit is contained in:
Markus Friedl
2012-01-26 21:15:45 +01:00
parent 9608cea748
commit 03db90e6d7
3 changed files with 30 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
ssh/compat.c
View File

@@ -29,8 +29,6 @@
#include <string.h>
#include <stdarg.h>
#include "xmalloc.h"
#include "buffer.h"
#include "compat.h"
#include "log.h"
#include "match.h"
@@ -184,7 +182,9 @@ proto_spec(const char *spec)
if (spec == NULL)
return ret;
q = s = xstrdup(spec);
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 1:
@@ -200,37 +200,40 @@ proto_spec(const char *spec)
break;
}
}
xfree(s);
free(s);
return ret;
}
char *
compat_cipher_proposal(char *cipher_prop)
{
Buffer b;
char *orig_prop, *fix_ciphers;
char *cp, *tmp;
char *orig_prop, *fix_ciphers, *cp, *tmp;
size_t maxlen;
if (!(datafellows & SSH_BUG_BIGENDIANAES))
return(cipher_prop);
return cipher_prop;
buffer_init(&b);
tmp = orig_prop = xstrdup(cipher_prop);
tmp = orig_prop = strdup(cipher_prop);
if (!tmp)
return NULL;
maxlen = strlen(orig_prop) + 1;
if ((fix_ciphers = calloc(1, maxlen)) == NULL) {
free(orig_prop);
return NULL;
}
while ((cp = strsep(&tmp, ",")) != NULL) {
if (strncmp(cp, "aes", 3) != 0) {
if (buffer_len(&b) > 0)
buffer_append(&b, ",", 1);
buffer_append(&b, cp, strlen(cp));
if (*fix_ciphers != '\0')
strlcat(fix_ciphers, ",", maxlen);
strlcat(fix_ciphers, cp, maxlen);
}
}
buffer_append(&b, "\0", 1);
fix_ciphers = xstrdup(buffer_ptr(&b));
buffer_free(&b);
xfree(orig_prop);
free(orig_prop);
debug2("Original cipher proposal: %s", cipher_prop);
debug2("Compat cipher proposal: %s", fix_ciphers);
if (!*fix_ciphers)
fatal("No available ciphers found.");
return(fix_ciphers);
if (!*fix_ciphers) {
free(fix_ciphers);
return NULL;
}
return fix_ciphers;
}

3
ssh/sshconnect2.c
View File

@@ -169,6 +169,9 @@ ssh_kex2(char *host, struct sockaddr *hostaddr, u_short port)
compat_cipher_proposal(myproposal[PROPOSAL_ENC_ALGS_CTOS]);
myproposal[PROPOSAL_ENC_ALGS_STOC] =
compat_cipher_proposal(myproposal[PROPOSAL_ENC_ALGS_STOC]);
if (myproposal[PROPOSAL_ENC_ALGS_CTOS] == NULL ||
myproposal[PROPOSAL_ENC_ALGS_STOC] == NULL)
fatal("no compatible ciphers found");
if (options.compression) {
myproposal[PROPOSAL_COMP_ALGS_CTOS] =
myproposal[PROPOSAL_COMP_ALGS_STOC] = "zlib@openssh.com,zlib,none";

3
ssh/sshd.c
View File

@@ -2180,6 +2180,9 @@ do_ssh2_kex(void)
compat_cipher_proposal(myproposal[PROPOSAL_ENC_ALGS_CTOS]);
myproposal[PROPOSAL_ENC_ALGS_STOC] =
compat_cipher_proposal(myproposal[PROPOSAL_ENC_ALGS_STOC]);
if (myproposal[PROPOSAL_ENC_ALGS_CTOS] == NULL ||
myproposal[PROPOSAL_ENC_ALGS_STOC] == NULL)
fatal("no compatible ciphers found");
if (options.macs != NULL) {
myproposal[PROPOSAL_MAC_ALGS_CTOS] =