- markus@cvs.openbsd.org 2001/04/17 10:53:26

     [key.c key.h readconf.c readconf.h ssh.1 sshconnect2.c]
     add HostKeyAlgorithms; based on patch from res@shore.net; ok provos@

1 files changed, 23 insertions, 1 deletions

diff --git a/key.c b/key.c
index fbd9f4efc..3b9f9f786 100644
--- a/key.c
+++ b/key.c
@@ -32,7 +32,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "includes.h"
-RCSID("$OpenBSD: key.c,v 1.24 2001/04/16 08:26:04 deraadt Exp $");
+RCSID("$OpenBSD: key.c,v 1.25 2001/04/17 10:53:24 markus Exp $");
 
 #include <openssl/evp.h>
 
@@ -629,6 +629,28 @@ key_type_from_name(char *name)
         return KEY_UNSPEC;
 }
 
+int
+key_names_valid2(const char *names)
+{
+        char *s, *cp, *p;
+
+        if (names == NULL || strcmp(names, "") == 0)
+                return 0;
+        s = cp = xstrdup(names);
+        for ((p = strsep(&cp, ",")); p && *p != '\0';
+             (p = strsep(&cp, ","))) {
+                switch (key_type_from_name(p)) {
+                case KEY_RSA1:
+                case KEY_UNSPEC:
+                        xfree(s);
+                        return 0;
+                }
+        }
+        debug3("key names ok: [%s]", names);
+        xfree(s);
+        return 1;
+}
+
 Key *
 key_from_blob(char *blob, int blen)
 {