*/
#include "includes.h"
-RCSID("$OpenBSD: ssh-rsa.c,v 1.16 2002/02/24 19:14:59 markus Exp $");
+RCSID("$OpenBSD: ssh-rsa.c,v 1.13 2001/11/10 13:22:42 markus Exp $");
#include <openssl/evp.h>
#include <openssl/err.h>
int
ssh_rsa_sign(
Key *key,
- u_char **sigp, u_int *lenp,
- u_char *data, u_int datalen)
+ u_char **sigp, int *lenp,
+ u_char *data, int datalen)
{
const EVP_MD *evp_md;
EVP_MD_CTX md;
- u_char digest[EVP_MAX_MD_SIZE], *sig, *ret;
+ u_char *digest, *sig, *ret;
u_int slen, dlen, len;
int ok, nid;
Buffer b;
error("ssh_rsa_sign: EVP_get_digestbynid %d failed", nid);
return -1;
}
+ dlen = evp_md->md_size;
+ digest = xmalloc(dlen);
EVP_DigestInit(&md, evp_md);
EVP_DigestUpdate(&md, data, datalen);
- EVP_DigestFinal(&md, digest, &dlen);
+ EVP_DigestFinal(&md, digest, NULL);
slen = RSA_size(key->rsa);
sig = xmalloc(slen);
ok = RSA_sign(nid, digest, dlen, sig, &len, key->rsa);
- memset(digest, 'd', sizeof(digest));
+ memset(digest, 'd', dlen);
+ xfree(digest);
if (ok != 1) {
int ecode = ERR_get_error();
int
ssh_rsa_verify(
Key *key,
- u_char *signature, u_int signaturelen,
- u_char *data, u_int datalen)
+ u_char *signature, int signaturelen,
+ u_char *data, int datalen)
{
Buffer b;
const EVP_MD *evp_md;
EVP_MD_CTX md;
char *ktype;
- u_char digest[EVP_MAX_MD_SIZE], *sigblob;
+ u_char *sigblob, *digest;
u_int len, dlen;
int rlen, ret, nid;
sigblob = buffer_get_string(&b, &len);
rlen = buffer_len(&b);
buffer_free(&b);
- if (rlen != 0) {
+ if(rlen != 0) {
error("ssh_rsa_verify: remaining bytes in signature %d", rlen);
xfree(sigblob);
return -1;
xfree(sigblob);
return -1;
}
+ dlen = evp_md->md_size;
+ digest = xmalloc(dlen);
EVP_DigestInit(&md, evp_md);
EVP_DigestUpdate(&md, data, datalen);
- EVP_DigestFinal(&md, digest, &dlen);
+ EVP_DigestFinal(&md, digest, NULL);
ret = RSA_verify(nid, digest, dlen, sigblob, len, key->rsa);
- memset(digest, 'd', sizeof(digest));
+ memset(digest, 'd', dlen);
+ xfree(digest);
memset(sigblob, 's', len);
xfree(sigblob);
if (ret == 0) {