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

Return to scard.c CVS log

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

Diff for /src/usr.bin/ssh/Attic/scard.c between version 1.17 and 1.18

version 1.17, 2001/12/27 18:22:16

version 1.18, 2002/03/21 16:38:06

Line 34

#include "xmalloc.h"

#include "scard.h"

#ifdef OPENSSL_VERSION_NUMBER

#if OPENSSL_VERSION_NUMBER >= 0x00907000L

#define RSA_get_default_openssl_method RSA_get_default_method

#define DSA_get_default_openssl_method DSA_get_default_method

#define DH_get_default_openssl_method DH_get_default_method

#define ENGINE_set_BN_mod_exp(x,y)

#endif

#define CLA_SSH 0x05

#define INS_DECRYPT 0x10

#define INS_GET_KEYLENGTH 0x20

Line 178

Line 187

/* private key operations */

static int

sc_private_decrypt(int flen, u_char *from, u_char *to, RSA *rsa, int padding)

sc_private_decrypt(int flen, const u_char *from, u_char *to, RSA *rsa,

int padding)

{

u_char *padded = NULL;

int sw, len, olen, status = -1;

Line 197

Line 207

len = BN_num_bytes(rsa->n);

padded = xmalloc(len);

sectok_apdu(sc_fd, CLA_SSH, INS_DECRYPT, 0, 0, len, from, 0, NULL, &sw);

sectok_apdu(sc_fd, CLA_SSH, INS_DECRYPT, 0, 0, len, (u_char *)from,

0, NULL, &sw);

if (!sectok_swOK(sw)) {

error("sc_private_decrypt: INS_DECRYPT failed: %s",

sectok_get_sw(sw));

Line 220

Line 231

}

static int

sc_private_encrypt(int flen, u_char *from, u_char *to, RSA *rsa, int padding)

sc_private_encrypt(int flen, const u_char *from, u_char *to, RSA *rsa,

int padding)

{

u_char *padded = NULL;

int sw, len, status = -1;

Line 238

Line 250

len = BN_num_bytes(rsa->n);

padded = xmalloc(len);

if (RSA_padding_add_PKCS1_type_1(padded, len, from, flen) <= 0) {

if (RSA_padding_add_PKCS1_type_1(padded, len, (u_char *)from, flen) <= 0) {

error("RSA_padding_add_PKCS1_type_1 failed");

goto err;

}

Line 279

Line 291

/* engine for overloading private key operations */

static ENGINE *smart_engine = NULL;

static RSA_METHOD smart_rsa =

static RSA_METHOD smart_rsa;

{

"sectok",

NULL,

};

ENGINE *

sc_get_engine(void)

{

RSA_METHOD *def;

const RSA_METHOD *def;

def = RSA_get_default_openssl_method();

/* use the OpenSSL version */

memcpy(&smart_rsa, def, sizeof(smart_rsa));

smart_rsa.name = "sectok";

/* overload */

smart_rsa.rsa_priv_enc = sc_private_encrypt;

smart_rsa.rsa_priv_dec = sc_private_decrypt;

Line 309

Line 313

orig_finish = def->finish;

smart_rsa.finish = sc_finish;

/* just use the OpenSSL version */

smart_rsa.rsa_pub_enc = def->rsa_pub_enc;

smart_rsa.rsa_pub_dec = def->rsa_pub_dec;

smart_rsa.rsa_mod_exp = def->rsa_mod_exp;

smart_rsa.bn_mod_exp = def->bn_mod_exp;

smart_rsa.init = def->init;

smart_rsa.flags = def->flags;

smart_rsa.app_data = def->app_data;

smart_rsa.rsa_sign = def->rsa_sign;

smart_rsa.rsa_verify = def->rsa_verify;

if ((smart_engine = ENGINE_new()) == NULL)

fatal("ENGINE_new failed");

ENGINE_set_id(smart_engine, "sectok");

ENGINE_set_name(smart_engine, "libsectok");

ENGINE_set_RSA(smart_engine, &smart_rsa);

ENGINE_set_DSA(smart_engine, DSA_get_default_openssl_method());

ENGINE_set_DH(smart_engine, DH_get_default_openssl_method());