tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upstream: garbage-collect moribund ssh_new_private() API. 

OpenBSD-Commit-ID: 7c05bf13b094093dfa01848a9306c82eb6e95f6c
This commit is contained in:
djm@openbsd.org 2018-09-14 04:17:44 +00:00 committed by Damien Miller
parent 1f24ac5fc0
commit 6da046f9c3
3 changed files with 10 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ssh-keygen.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: ssh-keygen.c,v 1.320 2018/09/12 01:21:34 djm Exp $ */ /* $OpenBSD: ssh-keygen.c,v 1.322 2018/09/14 04:17:44 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
@ -491,8 +491,8 @@ do_convert_private_ssh2_from_blob(u_char *blob, u_int blen)
free(type); free(type);
return NULL; return NULL;
} }
if ((key = sshkey_new_private(ktype)) == NULL) if ((key = sshkey_new(ktype)) == NULL)
fatal("sshkey_new_private failed"); fatal("sshkey_new failed");
free(type); free(type);
switch (key->type) { switch (key->type) {

23
sshkey.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: sshkey.c,v 1.68 2018/09/12 01:32:54 djm Exp $ */ /* $OpenBSD: sshkey.c,v 1.70 2018/09/14 04:17:44 djm Exp $ */
/* /*
* Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved.
* Copyright (c) 2008 Alexander von Gernler. All rights reserved. * Copyright (c) 2008 Alexander von Gernler. All rights reserved.
@ -557,17 +557,6 @@ sshkey_new(int type)
return k; return k;
} }
/* XXX garbage-collect this API */
struct sshkey *
sshkey_new_private(int type)
{
struct sshkey *k = sshkey_new(type);
if (k == NULL)
return NULL;
return k;
}
void void
sshkey_free(struct sshkey *k) sshkey_free(struct sshkey *k)
{ {
@ -2952,7 +2941,7 @@ sshkey_private_deserialize(struct sshbuf *buf, struct sshkey **kp)
switch (type) { switch (type) {
#ifdef WITH_OPENSSL #ifdef WITH_OPENSSL
case KEY_DSA: case KEY_DSA:
if ((k = sshkey_new_private(type)) == NULL) { if ((k = sshkey_new(type)) == NULL) {
r = SSH_ERR_ALLOC_FAIL; r = SSH_ERR_ALLOC_FAIL;
goto out; goto out;
} }
@ -2997,7 +2986,7 @@ sshkey_private_deserialize(struct sshbuf *buf, struct sshkey **kp)
break; break;
# ifdef OPENSSL_HAS_ECC # ifdef OPENSSL_HAS_ECC
case KEY_ECDSA: case KEY_ECDSA:
if ((k = sshkey_new_private(type)) == NULL) { if ((k = sshkey_new(type)) == NULL) {
r = SSH_ERR_ALLOC_FAIL; r = SSH_ERR_ALLOC_FAIL;
goto out; goto out;
} }
@ -3047,7 +3036,7 @@ sshkey_private_deserialize(struct sshbuf *buf, struct sshkey **kp)
break; break;
# endif /* OPENSSL_HAS_ECC */ # endif /* OPENSSL_HAS_ECC */
case KEY_RSA: case KEY_RSA:
if ((k = sshkey_new_private(type)) == NULL) { if ((k = sshkey_new(type)) == NULL) {
r = SSH_ERR_ALLOC_FAIL; r = SSH_ERR_ALLOC_FAIL;
goto out; goto out;
} }
@ -3113,7 +3102,7 @@ sshkey_private_deserialize(struct sshbuf *buf, struct sshkey **kp)
break; break;
#endif /* WITH_OPENSSL */ #endif /* WITH_OPENSSL */
case KEY_ED25519: case KEY_ED25519:
if ((k = sshkey_new_private(type)) == NULL) { if ((k = sshkey_new(type)) == NULL) {
r = SSH_ERR_ALLOC_FAIL; r = SSH_ERR_ALLOC_FAIL;
goto out; goto out;
} }
@ -3143,7 +3132,7 @@ sshkey_private_deserialize(struct sshbuf *buf, struct sshkey **kp)
break; break;
#ifdef WITH_XMSS #ifdef WITH_XMSS
case KEY_XMSS: case KEY_XMSS:
if ((k = sshkey_new_private(type)) == NULL) { if ((k = sshkey_new(type)) == NULL) {
r = SSH_ERR_ALLOC_FAIL; r = SSH_ERR_ALLOC_FAIL;
goto out; goto out;
} }

3
sshkey.h
View File

@ -1,4 +1,4 @@
/* $OpenBSD: sshkey.h,v 1.28 2018/09/12 01:32:54 djm Exp $ */ /* $OpenBSD: sshkey.h,v 1.30 2018/09/14 04:17:44 djm Exp $ */
/* /*
* Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved.
@ -128,7 +128,6 @@ struct sshkey {
#define ED25519_PK_SZ crypto_sign_ed25519_PUBLICKEYBYTES #define ED25519_PK_SZ crypto_sign_ed25519_PUBLICKEYBYTES
struct sshkey *sshkey_new(int); struct sshkey *sshkey_new(int);
struct sshkey *sshkey_new_private(int); /* XXX garbage collect */
void sshkey_free(struct sshkey *); void sshkey_free(struct sshkey *);
int sshkey_equal_public(const struct sshkey *, int sshkey_equal_public(const struct sshkey *,
const struct sshkey *); const struct sshkey *);