diff options
| author | Peter Bright <drpizza@quiscalusmexicanus.org> | 2011-08-20 06:05:08 +0100 |
|---|---|---|
| committer | Ryan Dahl <ry@tinyclouds.org> | 2011-08-22 11:30:47 -0700 |
| commit | 0110c90382f9a1e8f7aa3cc5388651ec2391a9a6 (patch) | |
| tree | 3eb18a48aec4a14ccbd815362b7f414d448c16c9 /deps/openssl/openssl/engines | |
| parent | e80cac622569dda0f6753b452ba3e5085a9d09e5 (diff) | |
| download | android-node-v8-0110c90382f9a1e8f7aa3cc5388651ec2391a9a6.tar.gz android-node-v8-0110c90382f9a1e8f7aa3cc5388651ec2391a9a6.tar.bz2 android-node-v8-0110c90382f9a1e8f7aa3cc5388651ec2391a9a6.zip | |
Upgrade to 0.9.8r.
Build in Win32.
Diffstat (limited to 'deps/openssl/openssl/engines')
| -rw-r--r-- | deps/openssl/openssl/engines/e_chil.c | 4 | ||||
| -rw-r--r-- | deps/openssl/openssl/engines/e_cswift.c | 2 | ||||
| -rw-r--r-- | deps/openssl/openssl/engines/e_ubsec.c | 2 |
3 files changed, 2 insertions, 6 deletions
diff --git a/deps/openssl/openssl/engines/e_chil.c b/deps/openssl/openssl/engines/e_chil.c index ab8a25962c..fca7a9cea6 100644 --- a/deps/openssl/openssl/engines/e_chil.c +++ b/deps/openssl/openssl/engines/e_chil.c @@ -1080,11 +1080,11 @@ static int hwcrhk_mod_exp_mont(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, static int hwcrhk_rsa_finish(RSA *rsa) { HWCryptoHook_RSAKeyHandle *hptr; - int ret; + hptr = RSA_get_ex_data(rsa, hndidx_rsa); if (hptr) { - ret = p_hwcrhk_RSAUnloadKey(*hptr, NULL); + p_hwcrhk_RSAUnloadKey(*hptr, NULL); OPENSSL_free(hptr); RSA_set_ex_data(rsa, hndidx_rsa, NULL); } diff --git a/deps/openssl/openssl/engines/e_cswift.c b/deps/openssl/openssl/engines/e_cswift.c index bc65179846..2e64ff3277 100644 --- a/deps/openssl/openssl/engines/e_cswift.c +++ b/deps/openssl/openssl/engines/e_cswift.c @@ -811,7 +811,6 @@ static DSA_SIG *cswift_dsa_sign(const unsigned char *dgst, int dlen, DSA *dsa) SW_PARAM sw_param; SW_STATUS sw_status; SW_LARGENUMBER arg, res; - unsigned char *ptr; BN_CTX *ctx; BIGNUM *dsa_p = NULL; BIGNUM *dsa_q = NULL; @@ -899,7 +898,6 @@ static DSA_SIG *cswift_dsa_sign(const unsigned char *dgst, int dlen, DSA *dsa) goto err; } /* Convert the response */ - ptr = (unsigned char *)result->d; if((to_return = DSA_SIG_new()) == NULL) goto err; to_return->r = BN_bin2bn((unsigned char *)result->d, 20, NULL); diff --git a/deps/openssl/openssl/engines/e_ubsec.c b/deps/openssl/openssl/engines/e_ubsec.c index a0f320caf5..f1c81013b1 100644 --- a/deps/openssl/openssl/engines/e_ubsec.c +++ b/deps/openssl/openssl/engines/e_ubsec.c @@ -631,10 +631,8 @@ static int ubsec_mod_exp_crt(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, const BIGNUM *dq, const BIGNUM *qinv, BN_CTX *ctx) { int y_len, - m_len, fd; - m_len = BN_num_bytes(p) + BN_num_bytes(q) + 1; y_len = BN_num_bits(p) + BN_num_bits(q); /* Check if hardware can't handle this argument. */ |