src/usr.bin/ssh/ssh-rsa.c - diff

Return to ssh-rsa.c CVS log

Up to [local] / src / usr.bin / ssh

Diff for /src/usr.bin/ssh/ssh-rsa.c between version 1.6.2.3 and 1.6.2.4

version 1.6.2.3, 2001/03/21 19:46:30

version 1.6.2.4, 2001/05/07 21:09:36

Line 34

#include "bufaux.h"

#include "key.h"

#include "ssh-rsa.h"

#include "compat.h"

/* RSASSA-PKCS1-v1_5 (PKCS #1 v2.0 signature) with SHA1 */

int

Line 42

Line 43

u_char **sigp, int *lenp,

u_char *data, int datalen)

{

EVP_MD *evp_md = EVP_sha1();

const EVP_MD *evp_md;

EVP_MD_CTX md;

u_char *digest, *sig, *ret;

u_int slen, dlen, len;

int ok;

int ok, nid;

Buffer b;

if (key == NULL || key->type != KEY_RSA || key->rsa == NULL) {

error("ssh_rsa_sign: no RSA key");

return -1;

}

slen = RSA_size(key->rsa);

nid = (datafellows & SSH_BUG_RSASIGMD5) ? NID_md5 : NID_sha1;

sig = xmalloc(slen);

if ((evp_md = EVP_get_digestbynid(nid)) == NULL) {

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, NULL);

ok = RSA_sign(NID_sha1, digest, dlen, sig, &len, key->rsa);

slen = RSA_size(key->rsa);

sig = xmalloc(slen);

ok = RSA_sign(nid, digest, dlen, sig, &len, key->rsa);

memset(digest, 'd', dlen);

xfree(digest);

Line 108

Line 114

u_char *data, int datalen)

{

Buffer b;

EVP_MD *evp_md = EVP_sha1();

const EVP_MD *evp_md;

EVP_MD_CTX md;

char *ktype;

u_char *sigblob, *digest;

u_int len, dlen;

int rlen;

int rlen, ret, nid;

int ret;

if (key == NULL || key->type != KEY_RSA || key->rsa == NULL) {

error("ssh_rsa_verify: no RSA key");

Line 139

Line 144

rlen = buffer_len(&b);

buffer_free(&b);

if(rlen != 0) {

xfree(sigblob);

error("ssh_rsa_verify: remaining bytes in signature %d", rlen);

return -1;

}

nid = (datafellows & SSH_BUG_RSASIGMD5) ? NID_md5 : NID_sha1;

if ((evp_md = EVP_get_digestbynid(nid)) == NULL) {

xfree(sigblob);

error("ssh_rsa_verify: 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, NULL);

ret = RSA_verify(NID_sha1, digest, dlen, sigblob, len, key->rsa);

ret = RSA_verify(nid, digest, dlen, sigblob, len, key->rsa);

memset(digest, 'd', dlen);

xfree(digest);

memset(sigblob, 's', len);