diff options
author | Damien Miller <djm@mindrot.org> | 2000-05-09 11:02:59 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2000-05-09 11:02:59 +1000 |
commit | 30c3d429306bb4afe71c18db92816b981f7b6d9d (patch) | |
tree | a65f45e0073cb55ad42957a36b4636ff21405108 /dsa.c | |
parent | 61e50f10c276009bf9472fdd797bf6be60fc2a83 (diff) |
- OpenBSD CVS update
- markus@cvs.openbsd.org
[cipher.h myproposal.h readconf.c readconf.h servconf.c ssh.1 ssh.c]
[ssh.h sshconnect1.c sshconnect2.c sshd.8]
- complain about invalid ciphers in SSH1 (e.g. arcfour is SSH2 only)
- hugh@cvs.openbsd.org
[ssh.1]
- zap typo
[ssh-keygen.1]
- One last nit fix. (markus approved)
[sshd.8]
- some markus certified spelling adjustments
- markus@cvs.openbsd.org
[auth2.c channels.c clientloop.c compat compat.h dsa.c kex.c]
[sshconnect2.c ]
- bug compat w/ ssh-2.0.13 x11, split out bugs
[nchan.c]
- no drain if ibuf_empty, fixes x11fwd problems; tests by fries@
[ssh-keygen.c]
- handle escapes in real and original key format, ok millert@
[version.h]
- OpenSSH-2.1
Diffstat (limited to 'dsa.c')
-rw-r--r-- | dsa.c | 20 |
1 files changed, 13 insertions, 7 deletions
@@ -28,7 +28,7 @@ | |||
28 | */ | 28 | */ |
29 | 29 | ||
30 | #include "includes.h" | 30 | #include "includes.h" |
31 | RCSID("$Id: dsa.c,v 1.6 2000/05/04 22:37:59 markus Exp $"); | 31 | RCSID("$Id: dsa.c,v 1.7 2000/05/08 17:42:24 markus Exp $"); |
32 | 32 | ||
33 | #include "ssh.h" | 33 | #include "ssh.h" |
34 | #include "xmalloc.h" | 34 | #include "xmalloc.h" |
@@ -162,7 +162,7 @@ dsa_sign( | |||
162 | BN_bn2bin(sig->s, sigblob+ SIGBLOB_LEN - slen); | 162 | BN_bn2bin(sig->s, sigblob+ SIGBLOB_LEN - slen); |
163 | DSA_SIG_free(sig); | 163 | DSA_SIG_free(sig); |
164 | 164 | ||
165 | if (datafellows) { | 165 | if (datafellows & SSH_BUG_SIGBLOB) { |
166 | debug("datafellows"); | 166 | debug("datafellows"); |
167 | ret = xmalloc(SIGBLOB_LEN); | 167 | ret = xmalloc(SIGBLOB_LEN); |
168 | memcpy(ret, sigblob, SIGBLOB_LEN); | 168 | memcpy(ret, sigblob, SIGBLOB_LEN); |
@@ -209,15 +209,20 @@ dsa_verify( | |||
209 | return -1; | 209 | return -1; |
210 | } | 210 | } |
211 | 211 | ||
212 | if (datafellows && signaturelen != SIGBLOB_LEN) { | 212 | if (!(datafellows & SSH_BUG_SIGBLOB) && |
213 | log("heh? datafellows ssh2 complies with ietf-drafts????"); | 213 | signaturelen == SIGBLOB_LEN) { |
214 | datafellows = 0; | 214 | datafellows |= ~SSH_BUG_SIGBLOB; |
215 | log("autodetect SSH_BUG_SIGBLOB"); | ||
216 | } else if ((datafellows & SSH_BUG_SIGBLOB) && | ||
217 | signaturelen != SIGBLOB_LEN) { | ||
218 | log("autoremove SSH_BUG_SIGBLOB"); | ||
219 | datafellows &= ~SSH_BUG_SIGBLOB; | ||
215 | } | 220 | } |
216 | 221 | ||
217 | debug("len %d datafellows %d", signaturelen, datafellows); | 222 | debug("len %d datafellows %d", signaturelen, datafellows); |
218 | 223 | ||
219 | /* fetch signature */ | 224 | /* fetch signature */ |
220 | if (datafellows) { | 225 | if (datafellows & SSH_BUG_SIGBLOB) { |
221 | sigblob = signature; | 226 | sigblob = signature; |
222 | len = signaturelen; | 227 | len = signaturelen; |
223 | } else { | 228 | } else { |
@@ -242,7 +247,8 @@ dsa_verify( | |||
242 | sig->s = BN_new(); | 247 | sig->s = BN_new(); |
243 | BN_bin2bn(sigblob, INTBLOB_LEN, sig->r); | 248 | BN_bin2bn(sigblob, INTBLOB_LEN, sig->r); |
244 | BN_bin2bn(sigblob+ INTBLOB_LEN, INTBLOB_LEN, sig->s); | 249 | BN_bin2bn(sigblob+ INTBLOB_LEN, INTBLOB_LEN, sig->s); |
245 | if (!datafellows) { | 250 | |
251 | if (!(datafellows & SSH_BUG_SIGBLOB)) { | ||
246 | memset(sigblob, 0, len); | 252 | memset(sigblob, 0, len); |
247 | xfree(sigblob); | 253 | xfree(sigblob); |
248 | } | 254 | } |