projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
RT2626: Change default_bits from 1K to 2K
[openssl.git]
/
crypto
/
ec
/
ec_ameth.c
diff --git
a/crypto/ec/ec_ameth.c
b/crypto/ec/ec_ameth.c
index ae9d5319a368578e84f225952311539cf10b363a..62ea5a984f93005833fc31a1471d65f62f3f7aa2 100644
(file)
--- a/
crypto/ec/ec_ameth.c
+++ b/
crypto/ec/ec_ameth.c
@@
-356,6
+356,7
@@
static int eckey_priv_encode(PKCS8_PRIV_KEY_INFO *p8, const EVP_PKEY *pkey)
EC_KEY_set_enc_flags(ec_key, old_flags);
OPENSSL_free(ep);
ECerr(EC_F_ECKEY_PRIV_ENCODE, ERR_R_EC_LIB);
EC_KEY_set_enc_flags(ec_key, old_flags);
OPENSSL_free(ep);
ECerr(EC_F_ECKEY_PRIV_ENCODE, ERR_R_EC_LIB);
+ return 0;
}
/* restore old encoding flags */
EC_KEY_set_enc_flags(ec_key, old_flags);
}
/* restore old encoding flags */
EC_KEY_set_enc_flags(ec_key, old_flags);
@@
-472,14
+473,16
@@
static int do_EC_KEY_print(BIO *bp, const EC_KEY *x, int off, int ktype)
if (ktype > 0)
{
public_key = EC_KEY_get0_public_key(x);
if (ktype > 0)
{
public_key = EC_KEY_get0_public_key(x);
- if ((pub_key = EC_POINT_point2bn(group, public_key,
- EC_KEY_get_conv_form(x), NULL, ctx)) == NULL)
+ if (public_key != NULL)
{
{
- reason = ERR_R_EC_LIB;
- goto err;
- }
- if (pub_key)
+ if ((pub_key = EC_POINT_point2bn(group, public_key,
+ EC_KEY_get_conv_form(x), NULL, ctx)) == NULL)
+ {
+ reason = ERR_R_EC_LIB;
+ goto err;
+ }
buf_len = (size_t)BN_num_bytes(pub_key);
buf_len = (size_t)BN_num_bytes(pub_key);
+ }
}
if (ktype == 2)
}
if (ktype == 2)
@@
-646,7
+649,7
@@
static int ec_pkey_ctrl(EVP_PKEY *pkey, int op, long arg1, void *arg2)
#endif
case ASN1_PKEY_CTRL_DEFAULT_MD_NID:
#endif
case ASN1_PKEY_CTRL_DEFAULT_MD_NID:
- *(int *)arg2 = NID_sha
1
;
+ *(int *)arg2 = NID_sha
256
;
return 2;
default:
return 2;
default: