diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2002-04-03 03:03:04 +0000 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2002-04-03 03:03:04 +0000 |
commit | 07739fe305472f6755a42d2ab4cd442adf44c8a0 (patch) | |
tree | 475920063146178eaa6a52f5b40477430143d3c6 | |
parent | 2f3d52a2d67b547c5f06676c52396fd8133df32b (diff) |
- markus@cvs.openbsd.org 2002/04/02 20:11:38
[ssh-rsa.c]
ignore SSH_BUG_SIGBLOB for ssh-rsa; #187
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ssh-rsa.c | 10 |
2 files changed, 5 insertions, 10 deletions
@@ -36,6 +36,9 @@ | |||
36 | - markus@cvs.openbsd.org 2002/04/02 17:37:48 | 36 | - markus@cvs.openbsd.org 2002/04/02 17:37:48 |
37 | [sftp.c] | 37 | [sftp.c] |
38 | always call log_init() | 38 | always call log_init() |
39 | - markus@cvs.openbsd.org 2002/04/02 20:11:38 | ||
40 | [ssh-rsa.c] | ||
41 | ignore SSH_BUG_SIGBLOB for ssh-rsa; #187 | ||
39 | 42 | ||
40 | 20020401 | 43 | 20020401 |
41 | - (stevesk) [monitor.c] PAM should work again; will *not* work with | 44 | - (stevesk) [monitor.c] PAM should work again; will *not* work with |
@@ -8143,4 +8146,4 @@ | |||
8143 | - Wrote replacements for strlcpy and mkdtemp | 8146 | - Wrote replacements for strlcpy and mkdtemp |
8144 | - Released 1.0pre1 | 8147 | - Released 1.0pre1 |
8145 | 8148 | ||
8146 | $Id: ChangeLog,v 1.2018 2002/04/02 21:06:18 mouring Exp $ | 8149 | $Id: ChangeLog,v 1.2019 2002/04/03 03:03:04 mouring Exp $ |
@@ -23,7 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | RCSID("$OpenBSD: ssh-rsa.c,v 1.17 2002/03/29 19:18:33 stevesk Exp $"); | 26 | RCSID("$OpenBSD: ssh-rsa.c,v 1.18 2002/04/02 20:11:38 markus Exp $"); |
27 | 27 | ||
28 | #include <openssl/evp.h> | 28 | #include <openssl/evp.h> |
29 | #include <openssl/err.h> | 29 | #include <openssl/err.h> |
@@ -55,10 +55,6 @@ ssh_rsa_sign( | |||
55 | error("ssh_rsa_sign: no RSA key"); | 55 | error("ssh_rsa_sign: no RSA key"); |
56 | return -1; | 56 | return -1; |
57 | } | 57 | } |
58 | if (datafellows & SSH_BUG_SIGBLOB) { | ||
59 | error("ssh_rsa_sign: SSH_BUG_SIGBLOB not supported"); | ||
60 | return -1; | ||
61 | } | ||
62 | nid = (datafellows & SSH_BUG_RSASIGMD5) ? NID_md5 : NID_sha1; | 58 | nid = (datafellows & SSH_BUG_RSASIGMD5) ? NID_md5 : NID_sha1; |
63 | if ((evp_md = EVP_get_digestbynid(nid)) == NULL) { | 59 | if ((evp_md = EVP_get_digestbynid(nid)) == NULL) { |
64 | error("ssh_rsa_sign: EVP_get_digestbynid %d failed", nid); | 60 | error("ssh_rsa_sign: EVP_get_digestbynid %d failed", nid); |
@@ -126,10 +122,6 @@ ssh_rsa_verify( | |||
126 | error("ssh_rsa_verify: no RSA key"); | 122 | error("ssh_rsa_verify: no RSA key"); |
127 | return -1; | 123 | return -1; |
128 | } | 124 | } |
129 | if (datafellows & SSH_BUG_SIGBLOB) { | ||
130 | error("ssh_rsa_verify: SSH_BUG_SIGBLOB not supported"); | ||
131 | return -1; | ||
132 | } | ||
133 | if (BN_num_bits(key->rsa->n) < SSH_RSA_MINIMUM_MODULUS_SIZE) { | 125 | if (BN_num_bits(key->rsa->n) < SSH_RSA_MINIMUM_MODULUS_SIZE) { |
134 | error("ssh_rsa_verify: n too small: %d bits", | 126 | error("ssh_rsa_verify: n too small: %d bits", |
135 | BN_num_bits(key->rsa->n)); | 127 | BN_num_bits(key->rsa->n)); |