projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make OCSP_id_cmp and OCSP_id_issuer_cmp accept const params
[oweals/openssl.git]
/
crypto
/
ec
/
ec_curve.c
diff --git
a/crypto/ec/ec_curve.c
b/crypto/ec/ec_curve.c
index 851e6a49812cc81cad04fe1655c7837f87caa850..bb1ce196d0fa6b255154d3a66a5a1cb1274fd492 100644
(file)
--- a/
crypto/ec/ec_curve.c
+++ b/
crypto/ec/ec_curve.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright 2002-201
6
The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2002-201
8
The OpenSSL Project Authors. All Rights Reserved.
* Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
*
* Licensed under the OpenSSL license (the "License"). You may not use
* Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
*
* Licensed under the OpenSSL license (the "License"). You may not use
@@
-3066,6
+3066,8
@@
static EC_GROUP *ec_group_new_from_data(const ec_list_element curve)
}
#endif
}
#endif
+ EC_GROUP_set_curve_name(group, curve.nid);
+
if ((P = EC_POINT_new(group)) == NULL) {
ECerr(EC_F_EC_GROUP_NEW_FROM_DATA, ERR_R_EC_LIB);
goto err;
if ((P = EC_POINT_new(group)) == NULL) {
ECerr(EC_F_EC_GROUP_NEW_FROM_DATA, ERR_R_EC_LIB);
goto err;
@@
-3076,7
+3078,7
@@
static EC_GROUP *ec_group_new_from_data(const ec_list_element curve)
ECerr(EC_F_EC_GROUP_NEW_FROM_DATA, ERR_R_BN_LIB);
goto err;
}
ECerr(EC_F_EC_GROUP_NEW_FROM_DATA, ERR_R_BN_LIB);
goto err;
}
- if (!EC_POINT_set_affine_coordinates
_GFp
(group, P, x, y, ctx)) {
+ if (!EC_POINT_set_affine_coordinates(group, P, x, y, ctx)) {
ECerr(EC_F_EC_GROUP_NEW_FROM_DATA, ERR_R_EC_LIB);
goto err;
}
ECerr(EC_F_EC_GROUP_NEW_FROM_DATA, ERR_R_EC_LIB);
goto err;
}
@@
-3131,8
+3133,6
@@
EC_GROUP *EC_GROUP_new_by_curve_name(int nid)
return NULL;
}
return NULL;
}
- EC_GROUP_set_curve_name(ret, nid);
-
return ret;
}
return ret;
}