upstream: garbage-collect moribund ssh_new_private() API.

OpenBSD-Commit-ID: 7c05bf13b094093dfa01848a9306c82eb6e95f6c

1 files changed, 6 insertions, 17 deletions

diff --git a/sshkey.c b/sshkey.c
index 6f2c9d44b..4bd975ce9 100644
--- a/sshkey.c
+++ b/sshkey.c
@@ -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) 2008 Alexander von Gernler.  All rights reserved.
@@ -557,17 +557,6 @@ sshkey_new(int type)
         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
 sshkey_free(struct sshkey *k)
 {
@@ -2952,7 +2941,7 @@ sshkey_private_deserialize(struct sshbuf *buf, struct sshkey **kp)
         switch (type) {
 #ifdef WITH_OPENSSL
         case KEY_DSA:
-                if ((k = sshkey_new_private(type)) == NULL) {
+                if ((k = sshkey_new(type)) == NULL) {
                         r = SSH_ERR_ALLOC_FAIL;
                         goto out;
                 }
@@ -2997,7 +2986,7 @@ sshkey_private_deserialize(struct sshbuf *buf, struct sshkey **kp)
                 break;
 # ifdef OPENSSL_HAS_ECC
         case KEY_ECDSA:
-                if ((k = sshkey_new_private(type)) == NULL) {
+                if ((k = sshkey_new(type)) == NULL) {
                         r = SSH_ERR_ALLOC_FAIL;
                         goto out;
                 }
@@ -3047,7 +3036,7 @@ sshkey_private_deserialize(struct sshbuf *buf, struct sshkey **kp)
                 break;
 # endif /* OPENSSL_HAS_ECC */
         case KEY_RSA:
-                if ((k = sshkey_new_private(type)) == NULL) {
+                if ((k = sshkey_new(type)) == NULL) {
                         r = SSH_ERR_ALLOC_FAIL;
                         goto out;
                 }
@@ -3113,7 +3102,7 @@ sshkey_private_deserialize(struct sshbuf *buf, struct sshkey **kp)
                 break;
 #endif /* WITH_OPENSSL */
         case KEY_ED25519:
-                if ((k = sshkey_new_private(type)) == NULL) {
+                if ((k = sshkey_new(type)) == NULL) {
                         r = SSH_ERR_ALLOC_FAIL;
                         goto out;
                 }
@@ -3143,7 +3132,7 @@ sshkey_private_deserialize(struct sshbuf *buf, struct sshkey **kp)
                 break;
 #ifdef WITH_XMSS
         case KEY_XMSS:
-                if ((k = sshkey_new_private(type)) == NULL) {
+                if ((k = sshkey_new(type)) == NULL) {
                         r = SSH_ERR_ALLOC_FAIL;
                         goto out;
                 }