comparison svr-authpubkey.c @ 641:2b1bb792cd4d dropbear-tfm

- Update tfm changes to current default tip
author Matt Johnston <matt@ucc.asn.au>
date Mon, 21 Nov 2011 19:52:28 +0800
parents a98a2138364a
children ac2158e3e403
comparison
equal deleted inserted replaced
640:76097ec1a29a 641:2b1bb792cd4d
133 /* ... and finally verify the signature */ 133 /* ... and finally verify the signature */
134 fp = sign_key_fingerprint(keyblob, keybloblen); 134 fp = sign_key_fingerprint(keyblob, keybloblen);
135 if (buf_verify(ses.payload, key, buf_getptr(signbuf, signbuf->len), 135 if (buf_verify(ses.payload, key, buf_getptr(signbuf, signbuf->len),
136 signbuf->len) == DROPBEAR_SUCCESS) { 136 signbuf->len) == DROPBEAR_SUCCESS) {
137 dropbear_log(LOG_NOTICE, 137 dropbear_log(LOG_NOTICE,
138 "pubkey auth succeeded for '%s' with key %s from %s", 138 "Pubkey auth succeeded for '%s' with key %s from %s",
139 ses.authstate.pw_name, fp, svr_ses.addrstring); 139 ses.authstate.pw_name, fp, svr_ses.addrstring);
140 send_msg_userauth_success(); 140 send_msg_userauth_success();
141 } else { 141 } else {
142 dropbear_log(LOG_WARNING, 142 dropbear_log(LOG_WARNING,
143 "pubkey auth bad signature for '%s' with key %s from %s", 143 "Pubkey auth bad signature for '%s' with key %s from %s",
144 ses.authstate.pw_name, fp, svr_ses.addrstring); 144 ses.authstate.pw_name, fp, svr_ses.addrstring);
145 send_msg_userauth_failure(0, 1); 145 send_msg_userauth_failure(0, 1);
146 } 146 }
147 m_free(fp); 147 m_free(fp);
148 148
196 TRACE(("enter checkpubkey")) 196 TRACE(("enter checkpubkey"))
197 197
198 /* check that we can use the algo */ 198 /* check that we can use the algo */
199 if (have_algo(algo, algolen, sshhostkey) == DROPBEAR_FAILURE) { 199 if (have_algo(algo, algolen, sshhostkey) == DROPBEAR_FAILURE) {
200 dropbear_log(LOG_WARNING, 200 dropbear_log(LOG_WARNING,
201 "pubkey auth attempt with unknown algo for '%s' from %s", 201 "Pubkey auth attempt with unknown algo for '%s' from %s",
202 ses.authstate.pw_name, svr_ses.addrstring); 202 ses.authstate.pw_name, svr_ses.addrstring);
203 goto out; 203 goto out;
204 } 204 }
205 205
206 /* check file permissions, also whether file exists */ 206 /* check file permissions, also whether file exists */