diff options
| author | Bodo Möller <bodo@openssl.org> | 2002-06-12 14:01:17 +0000 |
|---|---|---|
| committer | Bodo Möller <bodo@openssl.org> | 2002-06-12 14:01:17 +0000 |
| commit | 254ef80db19a6f6610ef07535efd699cef7aa855 (patch) | |
| tree | a2beefac629bbe499299ef89cce8411f5ebd2908 /crypto/asn1/x_pubkey.c | |
| parent | f9de8446a0a623936925d12812480fe86f5a9f71 (diff) | |
| download | openssl-254ef80db19a6f6610ef07535efd699cef7aa855.zip openssl-254ef80db19a6f6610ef07535efd699cef7aa855.tar.gz openssl-254ef80db19a6f6610ef07535efd699cef7aa855.tar.bz2 | |
simplify asn1_flag
Submitted by: Nils Larsch
Reviewed by: Bodo Moeller
Diffstat (limited to 'crypto/asn1/x_pubkey.c')
| -rw-r--r-- | crypto/asn1/x_pubkey.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crypto/asn1/x_pubkey.c b/crypto/asn1/x_pubkey.c index 13c753a..68ddeb4 100644 --- a/crypto/asn1/x_pubkey.c +++ b/crypto/asn1/x_pubkey.c @@ -145,7 +145,7 @@ int X509_PUBKEY_set(X509_PUBKEY **x, EVP_PKEY *pkey) goto err; } - if ((EC_GROUP_get_asn1_flag(ecdsa->group) & OPENSSL_EC_NAMED_CURVE) + if (EC_GROUP_get_asn1_flag(ecdsa->group) && (nid = EC_GROUP_get_nid(ecdsa->group))) { /* just set the OID */ @@ -312,8 +312,8 @@ EVP_PKEY *X509_PUBKEY_get(X509_PUBKEY *key) if ((ecdsa->group = EC_GROUP_new_by_name( OBJ_obj2nid(a->parameter->value.object))) == NULL) goto err; - EC_GROUP_set_asn1_flag(ecdsa->group, OPENSSL_EC_NAMED_CURVE | - (EC_GROUP_get_asn1_flag(ecdsa->group) & ~0x03)); + EC_GROUP_set_asn1_flag(ecdsa->group, + OPENSSL_EC_NAMED_CURVE); } /* the case implicitlyCA is currently not implemented */ ret->save_parameters = 1; |