james/yubikey.rs
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fixed some bugs in the port to Openssl-1.1:

Browse Source 
- wrap_public_key() passed the address of the local stack variable
  internal_key to RSA_meth_set0_data(), which was used long after
  wrap_public_key() had returned. Changed to static.

- The callback functions yk_rsa_meth_sign and yk_ec_meth_sign 'siglen'
  parameter has type (unisgned int *), which was cast to (size_t *)
  before it was used to write a value in the caller's memory
  space. This caused stack corruption on machines where size_t is
  bigger than unsigned int.

- The callback function's 'siglen' parameter is output-only, not
  in-out. The input value was assumed to contain the maximum size of
  the output buffer as input, and a bogus value was compared to the
  amount of data received from the token in function
  _general_authenticate(). Changed to pass in the values returned by
  RSA_size(rsa) and ECDSA_size(ec), which Openssl specifies as minimum
  buffer sizes.

- The callback functions' return values were swapped; fixed to return
  1 on success, 0 on failure.
This commit is contained in:
Johan Myréen
2017-12-30 22:08:09 +02:00
parent 427451c12f
commit b0210e0710
1 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tool/yubico-piv-tool.c
+16 -7
View File
@@ -135,22 +135,28 @@ struct internal_key {
int yk_rsa_meth_sign(int dtype, const unsigned char *m, unsigned int m_length,
unsigned char *sigret, unsigned int *siglen, const RSA *rsa) {
size_t yk_siglen = RSA_size(rsa);
const RSA_METHOD *meth = RSA_get_method(rsa);
const struct internal_key *key = RSA_meth_get0_app_data(meth);
if (sign_data(key->state, m, m_length, sigret, (size_t *)siglen, key->algorithm, key->key))
return 0;
if (sign_data(key->state, m, m_length, sigret, &yk_siglen, key->algorithm, key->key)) {
*siglen = (unsigned int)yk_siglen;
return 1;
}
return 1;
return 0;
}
int yk_ec_meth_sign(int type, const unsigned char *dgst, int dlen,
unsigned char *sig, unsigned int *siglen, const BIGNUM *kinv,
const BIGNUM *r, EC_KEY *ec) {
size_t yk_siglen = ECDSA_size(ec);
const struct internal_key *key = EC_KEY_get_ex_data(ec, ec_key_ex_data_idx);
if (sign_data(key->state, dgst, dlen, sig, (size_t *)siglen, key->algorithm, key->key))
return 0;
if (sign_data(key->state, dgst, dlen, sig, &yk_siglen, key->algorithm, key->key)) {
*siglen = (unsigned int)yk_siglen;
return 1;
}
return 1;
return 0;
}
static int wrap_public_key(ykpiv_state *state, int algorithm, EVP_PKEY *public_key,
@@ -158,7 +164,10 @@ static int wrap_public_key(ykpiv_state *state, int algorithm, EVP_PKEY *public_k
if(YKPIV_IS_RSA(algorithm)) {
RSA_METHOD *meth = RSA_meth_dup(RSA_get_default_method());
RSA *rsa = EVP_PKEY_get0_RSA(public_key);
struct internal_key int_key = {state, algorithm, key};
static struct internal_key int_key;
int_key.state = state;
int_key.algorithm = algorithm;
int_key.key = key;
RSA_meth_set0_app_data(meth, &int_key);
RSA_meth_set_sign(meth, yk_rsa_meth_sign);
RSA_set_method(rsa, meth);