mirror of
git://anongit.mindrot.org/openssh.git
synced 2024-12-22 10:00:14 +00:00
8668706d0f
[Makefile.in auth-bsdauth.c auth-chall.c auth-options.c auth-rsa.c
[auth2-none.c auth2-pubkey.c authfile.c authfile.h cipher-3des1.c
[cipher-chachapoly.c cipher-chachapoly.h cipher.c cipher.h
[digest-libc.c digest-openssl.c digest.h dns.c entropy.c hmac.h
[hostfile.c key.c key.h krl.c monitor.c packet.c rsa.c rsa.h
[ssh-add.c ssh-agent.c ssh-dss.c ssh-ecdsa.c ssh-ed25519.c
[ssh-keygen.c ssh-pkcs11-client.c ssh-pkcs11-helper.c ssh-pkcs11.c
[ssh-rsa.c sshbuf-misc.c sshbuf.h sshconnect.c sshconnect1.c
[sshconnect2.c sshd.c sshkey.c sshkey.h
[openbsd-compat/openssl-compat.c openbsd-compat/openssl-compat.h]
New key API: refactor key-related functions to be more library-like,
existing API is offered as a set of wrappers.
with and ok markus@
Thanks also to Ben Hawkes, David Tomaschik, Ivan Fratric, Matthew
Dempsky and Ron Bowes for a detailed review a few months ago.
NB. This commit also removes portable OpenSSH support for OpenSSL
<0.9.8e.
136 lines
3.0 KiB
C
136 lines
3.0 KiB
C
/* $OpenBSD: sshbuf-misc.c,v 1.2 2014/06/24 01:13:21 djm Exp $ */
|
|
/*
|
|
* Copyright (c) 2011 Damien Miller
|
|
*
|
|
* Permission to use, copy, modify, and distribute this software for any
|
|
* purpose with or without fee is hereby granted, provided that the above
|
|
* copyright notice and this permission notice appear in all copies.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
|
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
|
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
|
|
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
|
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
|
|
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
|
|
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
|
*/
|
|
|
|
#include "includes.h"
|
|
|
|
#include <sys/types.h>
|
|
#include <sys/socket.h>
|
|
#include <netinet/in.h>
|
|
#include <errno.h>
|
|
#include <stdlib.h>
|
|
#include <stdio.h>
|
|
#include <limits.h>
|
|
#include <string.h>
|
|
#include <resolv.h>
|
|
#include <ctype.h>
|
|
|
|
#include "ssherr.h"
|
|
#define SSHBUF_INTERNAL
|
|
#include "sshbuf.h"
|
|
|
|
void
|
|
sshbuf_dump_data(const void *s, size_t len, FILE *f)
|
|
{
|
|
size_t i, j;
|
|
const u_char *p = (const u_char *)s;
|
|
|
|
for (i = 0; i < len; i += 16) {
|
|
fprintf(f, "%.4zd: ", i);
|
|
for (j = i; j < i + 16; j++) {
|
|
if (j < len)
|
|
fprintf(f, "%02x ", p[j]);
|
|
else
|
|
fprintf(f, " ");
|
|
}
|
|
fprintf(f, " ");
|
|
for (j = i; j < i + 16; j++) {
|
|
if (j < len) {
|
|
if (isascii(p[j]) && isprint(p[j]))
|
|
fprintf(f, "%c", p[j]);
|
|
else
|
|
fprintf(f, ".");
|
|
}
|
|
}
|
|
fprintf(f, "\n");
|
|
}
|
|
}
|
|
|
|
void
|
|
sshbuf_dump(struct sshbuf *buf, FILE *f)
|
|
{
|
|
fprintf(f, "buffer %p len = %zu\n", buf, sshbuf_len(buf));
|
|
sshbuf_dump_data(sshbuf_ptr(buf), sshbuf_len(buf), f);
|
|
}
|
|
|
|
char *
|
|
sshbuf_dtob16(struct sshbuf *buf)
|
|
{
|
|
size_t i, j, len = sshbuf_len(buf);
|
|
const u_char *p = sshbuf_ptr(buf);
|
|
char *ret;
|
|
const char hex[] = "0123456789abcdef";
|
|
|
|
if (len == 0)
|
|
return strdup("");
|
|
if (SIZE_MAX / 2 <= len || (ret = malloc(len * 2 + 1)) == NULL)
|
|
return NULL;
|
|
for (i = j = 0; i < len; i++) {
|
|
ret[j++] = hex[(p[i] >> 4) & 0xf];
|
|
ret[j++] = hex[p[i] & 0xf];
|
|
}
|
|
ret[j] = '\0';
|
|
return ret;
|
|
}
|
|
|
|
char *
|
|
sshbuf_dtob64(struct sshbuf *buf)
|
|
{
|
|
size_t len = sshbuf_len(buf), plen;
|
|
const u_char *p = sshbuf_ptr(buf);
|
|
char *ret;
|
|
int r;
|
|
|
|
if (len == 0)
|
|
return strdup("");
|
|
plen = ((len + 2) / 3) * 4 + 1;
|
|
if (SIZE_MAX / 2 <= len || (ret = malloc(plen)) == NULL)
|
|
return NULL;
|
|
if ((r = b64_ntop(p, len, ret, plen)) == -1) {
|
|
bzero(ret, plen);
|
|
free(ret);
|
|
return NULL;
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
int
|
|
sshbuf_b64tod(struct sshbuf *buf, const char *b64)
|
|
{
|
|
size_t plen = strlen(b64);
|
|
int nlen, r;
|
|
u_char *p;
|
|
|
|
if (plen == 0)
|
|
return 0;
|
|
if ((p = malloc(plen)) == NULL)
|
|
return SSH_ERR_ALLOC_FAIL;
|
|
if ((nlen = b64_pton(b64, p, plen)) < 0) {
|
|
bzero(p, plen);
|
|
free(p);
|
|
return SSH_ERR_INVALID_FORMAT;
|
|
}
|
|
if ((r = sshbuf_put(buf, p, nlen)) < 0) {
|
|
bzero(p, plen);
|
|
free(p);
|
|
return r;
|
|
}
|
|
bzero(p, plen);
|
|
free(p);
|
|
return 0;
|
|
}
|
|
|