diff options
Diffstat (limited to 'src/lib/libcrypto/ec/ec_cvt.c')
-rw-r--r-- | src/lib/libcrypto/ec/ec_cvt.c | 76 |
1 files changed, 6 insertions, 70 deletions
diff --git a/src/lib/libcrypto/ec/ec_cvt.c b/src/lib/libcrypto/ec/ec_cvt.c index d45640bab9..45b0ec33a0 100644 --- a/src/lib/libcrypto/ec/ec_cvt.c +++ b/src/lib/libcrypto/ec/ec_cvt.c | |||
@@ -1,9 +1,6 @@ | |||
1 | /* crypto/ec/ec_cvt.c */ | 1 | /* crypto/ec/ec_cvt.c */ |
2 | /* | ||
3 | * Originally written by Bodo Moeller for the OpenSSL project. | ||
4 | */ | ||
5 | /* ==================================================================== | 2 | /* ==================================================================== |
6 | * Copyright (c) 1998-2002 The OpenSSL Project. All rights reserved. | 3 | * Copyright (c) 1998-2001 The OpenSSL Project. All rights reserved. |
7 | * | 4 | * |
8 | * Redistribution and use in source and binary forms, with or without | 5 | * Redistribution and use in source and binary forms, with or without |
9 | * modification, are permitted provided that the following conditions | 6 | * modification, are permitted provided that the following conditions |
@@ -55,21 +52,7 @@ | |||
55 | * Hudson (tjh@cryptsoft.com). | 52 | * Hudson (tjh@cryptsoft.com). |
56 | * | 53 | * |
57 | */ | 54 | */ |
58 | /* ==================================================================== | ||
59 | * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED. | ||
60 | * | ||
61 | * Portions of the attached software ("Contribution") are developed by | ||
62 | * SUN MICROSYSTEMS, INC., and are contributed to the OpenSSL project. | ||
63 | * | ||
64 | * The Contribution is licensed pursuant to the OpenSSL open source | ||
65 | * license provided above. | ||
66 | * | ||
67 | * The elliptic curve binary polynomial software is originally written by | ||
68 | * Sheueling Chang Shantz and Douglas Stebila of Sun Microsystems Laboratories. | ||
69 | * | ||
70 | */ | ||
71 | 55 | ||
72 | #include <openssl/err.h> | ||
73 | #include "ec_lcl.h" | 56 | #include "ec_lcl.h" |
74 | 57 | ||
75 | 58 | ||
@@ -77,64 +60,17 @@ EC_GROUP *EC_GROUP_new_curve_GFp(const BIGNUM *p, const BIGNUM *a, const BIGNUM | |||
77 | { | 60 | { |
78 | const EC_METHOD *meth; | 61 | const EC_METHOD *meth; |
79 | EC_GROUP *ret; | 62 | EC_GROUP *ret; |
80 | |||
81 | meth = EC_GFp_nist_method(); | ||
82 | 63 | ||
83 | ret = EC_GROUP_new(meth); | 64 | /* Finally, this will use EC_GFp_nist_method if 'p' is a special |
84 | if (ret == NULL) | 65 | * prime with optimized modular arithmetics (for NIST curves) |
85 | return NULL; | 66 | */ |
86 | 67 | meth = EC_GFp_mont_method(); | |
87 | if (!EC_GROUP_set_curve_GFp(ret, p, a, b, ctx)) | ||
88 | { | ||
89 | unsigned long err; | ||
90 | |||
91 | err = ERR_peek_last_error(); | ||
92 | |||
93 | if (!(ERR_GET_LIB(err) == ERR_LIB_EC && | ||
94 | ((ERR_GET_REASON(err) == EC_R_NOT_A_NIST_PRIME) || | ||
95 | (ERR_GET_REASON(err) == EC_R_NOT_A_SUPPORTED_NIST_PRIME)))) | ||
96 | { | ||
97 | /* real error */ | ||
98 | |||
99 | EC_GROUP_clear_free(ret); | ||
100 | return NULL; | ||
101 | } | ||
102 | |||
103 | |||
104 | /* not an actual error, we just cannot use EC_GFp_nist_method */ | ||
105 | |||
106 | ERR_clear_error(); | ||
107 | |||
108 | EC_GROUP_clear_free(ret); | ||
109 | meth = EC_GFp_mont_method(); | ||
110 | |||
111 | ret = EC_GROUP_new(meth); | ||
112 | if (ret == NULL) | ||
113 | return NULL; | ||
114 | |||
115 | if (!EC_GROUP_set_curve_GFp(ret, p, a, b, ctx)) | ||
116 | { | ||
117 | EC_GROUP_clear_free(ret); | ||
118 | return NULL; | ||
119 | } | ||
120 | } | ||
121 | |||
122 | return ret; | ||
123 | } | ||
124 | |||
125 | |||
126 | EC_GROUP *EC_GROUP_new_curve_GF2m(const BIGNUM *p, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx) | ||
127 | { | ||
128 | const EC_METHOD *meth; | ||
129 | EC_GROUP *ret; | ||
130 | |||
131 | meth = EC_GF2m_simple_method(); | ||
132 | 68 | ||
133 | ret = EC_GROUP_new(meth); | 69 | ret = EC_GROUP_new(meth); |
134 | if (ret == NULL) | 70 | if (ret == NULL) |
135 | return NULL; | 71 | return NULL; |
136 | 72 | ||
137 | if (!EC_GROUP_set_curve_GF2m(ret, p, a, b, ctx)) | 73 | if (!EC_GROUP_set_curve_GFp(ret, p, a, b, ctx)) |
138 | { | 74 | { |
139 | EC_GROUP_clear_free(ret); | 75 | EC_GROUP_clear_free(ret); |
140 | return NULL; | 76 | return NULL; |