auth2-hostbased.c (294332) | auth2-hostbased.c (294336) |
---|---|
1/* $OpenBSD: auth2-hostbased.c,v 1.24 2015/01/28 22:36:00 djm Exp $ */ | 1/* $OpenBSD: auth2-hostbased.c,v 1.25 2015/05/04 06:10:48 djm Exp $ */ |
2/* 3 * Copyright (c) 2000 Markus Friedl. All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright 9 * notice, this list of conditions and the following disclaimer. --- 94 unchanged lines hidden (view full) --- 104 } 105 if (key_type_plain(key->type) == KEY_RSA && 106 (datafellows & SSH_BUG_RSASIGMD5) != 0) { 107 error("Refusing RSA key because peer uses unsafe " 108 "signature format"); 109 goto done; 110 } 111 if (match_pattern_list(sshkey_ssh_name(key), | 2/* 3 * Copyright (c) 2000 Markus Friedl. All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright 9 * notice, this list of conditions and the following disclaimer. --- 94 unchanged lines hidden (view full) --- 104 } 105 if (key_type_plain(key->type) == KEY_RSA && 106 (datafellows & SSH_BUG_RSASIGMD5) != 0) { 107 error("Refusing RSA key because peer uses unsafe " 108 "signature format"); 109 goto done; 110 } 111 if (match_pattern_list(sshkey_ssh_name(key), |
112 options.hostbased_key_types, 113 strlen(options.hostbased_key_types), 0) != 1) { | 112 options.hostbased_key_types, 0) != 1) { |
114 logit("%s: key type %s not in HostbasedAcceptedKeyTypes", 115 __func__, sshkey_type(key)); 116 goto done; 117 } 118 119 service = datafellows & SSH_BUG_HBSERVICE ? "ssh-userauth" : 120 authctxt->service; 121 buffer_init(&b); --- 130 unchanged lines hidden --- | 113 logit("%s: key type %s not in HostbasedAcceptedKeyTypes", 114 __func__, sshkey_type(key)); 115 goto done; 116 } 117 118 service = datafellows & SSH_BUG_HBSERVICE ? "ssh-userauth" : 119 authctxt->service; 120 buffer_init(&b); --- 130 unchanged lines hidden --- |