summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjsing <>2014-05-08 13:48:36 +0000
committerjsing <>2014-05-08 13:48:36 +0000
commitff8febcf7ff5708902485e389dc8f34d77f0a932 (patch)
tree1c0f025d26ec530a118fc8a5257de26eaef87b46
parent2e8879604fe3abbc2431ca79a4a923f1e87da75e (diff)
downloadopenbsd-ff8febcf7ff5708902485e389dc8f34d77f0a932.tar.gz
openbsd-ff8febcf7ff5708902485e389dc8f34d77f0a932.tar.bz2
openbsd-ff8febcf7ff5708902485e389dc8f34d77f0a932.zip
knfectomie.
Diffstat
-rw-r--r--src/lib/libcrypto/bn/bn_nist.c1471
-rw-r--r--src/lib/libssl/src/crypto/bn/bn_nist.c1471
2 files changed, 1636 insertions, 1306 deletions
diff --git a/src/lib/libcrypto/bn/bn_nist.c b/src/lib/libcrypto/bn/bn_nist.c
index d793644e27..d44e709c83 100644
--- a/src/lib/libcrypto/bn/bn_nist.c
+++ b/src/lib/libcrypto/bn/bn_nist.c
@@ -10,7 +10,7 @@
10 * are met: 10 * are met:
11 * 11 *
12 * 1. Redistributions of source code must retain the above copyright 12 * 1. Redistributions of source code must retain the above copyright
13 * notice, this list of conditions and the following disclaimer. 13 * notice, this list of conditions and the following disclaimer.
14 * 14 *
15 * 2. Redistributions in binary form must reproduce the above copyright 15 * 2. Redistributions in binary form must reproduce the above copyright
16 * notice, this list of conditions and the following disclaimer in 16 * notice, this list of conditions and the following disclaimer in
@@ -71,225 +71,292 @@
71/* pre-computed tables are "carry-less" values of modulus*(i+1) */ 71/* pre-computed tables are "carry-less" values of modulus*(i+1) */
72#if BN_BITS2 == 64 72#if BN_BITS2 == 64
73static const BN_ULONG _nist_p_192[][BN_NIST_192_TOP] = { 73static const BN_ULONG _nist_p_192[][BN_NIST_192_TOP] = {
74 {0xFFFFFFFFFFFFFFFFULL,0xFFFFFFFFFFFFFFFEULL,0xFFFFFFFFFFFFFFFFULL}, 74 {0xFFFFFFFFFFFFFFFFULL, 0xFFFFFFFFFFFFFFFEULL, 0xFFFFFFFFFFFFFFFFULL},
75 {0xFFFFFFFFFFFFFFFEULL,0xFFFFFFFFFFFFFFFDULL,0xFFFFFFFFFFFFFFFFULL}, 75 {0xFFFFFFFFFFFFFFFEULL, 0xFFFFFFFFFFFFFFFDULL, 0xFFFFFFFFFFFFFFFFULL},
76 {0xFFFFFFFFFFFFFFFDULL,0xFFFFFFFFFFFFFFFCULL,0xFFFFFFFFFFFFFFFFULL} 76 {0xFFFFFFFFFFFFFFFDULL, 0xFFFFFFFFFFFFFFFCULL, 0xFFFFFFFFFFFFFFFFULL}
77 }; 77};
78static const BN_ULONG _nist_p_192_sqr[] = { 78static const BN_ULONG _nist_p_192_sqr[] = {
79 0x0000000000000001ULL,0x0000000000000002ULL,0x0000000000000001ULL, 79 0x0000000000000001ULL, 0x0000000000000002ULL, 0x0000000000000001ULL,
80 0xFFFFFFFFFFFFFFFEULL,0xFFFFFFFFFFFFFFFDULL,0xFFFFFFFFFFFFFFFFULL 80 0xFFFFFFFFFFFFFFFEULL, 0xFFFFFFFFFFFFFFFDULL, 0xFFFFFFFFFFFFFFFFULL
81 }; 81};
82static const BN_ULONG _nist_p_224[][BN_NIST_224_TOP] = { 82static const BN_ULONG _nist_p_224[][BN_NIST_224_TOP] = {
83 {0x0000000000000001ULL,0xFFFFFFFF00000000ULL, 83 {
84 0xFFFFFFFFFFFFFFFFULL,0x00000000FFFFFFFFULL}, 84 0x0000000000000001ULL, 0xFFFFFFFF00000000ULL,
85 {0x0000000000000002ULL,0xFFFFFFFE00000000ULL, 85 0xFFFFFFFFFFFFFFFFULL, 0x00000000FFFFFFFFULL
86 0xFFFFFFFFFFFFFFFFULL,0x00000001FFFFFFFFULL} /* this one is "carry-full" */ 86 },
87 }; 87 {
88 0x0000000000000002ULL, 0xFFFFFFFE00000000ULL,
89 0xFFFFFFFFFFFFFFFFULL, 0x00000001FFFFFFFFULL
90 } /* this one is "carry-full" */
91};
88static const BN_ULONG _nist_p_224_sqr[] = { 92static const BN_ULONG _nist_p_224_sqr[] = {
89 0x0000000000000001ULL,0xFFFFFFFE00000000ULL, 93 0x0000000000000001ULL, 0xFFFFFFFE00000000ULL,
90 0xFFFFFFFFFFFFFFFFULL,0x0000000200000000ULL, 94 0xFFFFFFFFFFFFFFFFULL, 0x0000000200000000ULL,
91 0x0000000000000000ULL,0xFFFFFFFFFFFFFFFEULL, 95 0x0000000000000000ULL, 0xFFFFFFFFFFFFFFFEULL,
92 0xFFFFFFFFFFFFFFFFULL 96 0xFFFFFFFFFFFFFFFFULL
93 }; 97};
94static const BN_ULONG _nist_p_256[][BN_NIST_256_TOP] = { 98static const BN_ULONG _nist_p_256[][BN_NIST_256_TOP] = {
95 {0xFFFFFFFFFFFFFFFFULL,0x00000000FFFFFFFFULL, 99 {
96 0x0000000000000000ULL,0xFFFFFFFF00000001ULL}, 100 0xFFFFFFFFFFFFFFFFULL, 0x00000000FFFFFFFFULL,
97 {0xFFFFFFFFFFFFFFFEULL,0x00000001FFFFFFFFULL, 101 0x0000000000000000ULL, 0xFFFFFFFF00000001ULL
98 0x0000000000000000ULL,0xFFFFFFFE00000002ULL}, 102 },
99 {0xFFFFFFFFFFFFFFFDULL,0x00000002FFFFFFFFULL, 103 {
100 0x0000000000000000ULL,0xFFFFFFFD00000003ULL}, 104 0xFFFFFFFFFFFFFFFEULL, 0x00000001FFFFFFFFULL,
101 {0xFFFFFFFFFFFFFFFCULL,0x00000003FFFFFFFFULL, 105 0x0000000000000000ULL, 0xFFFFFFFE00000002ULL
102 0x0000000000000000ULL,0xFFFFFFFC00000004ULL}, 106 },
103 {0xFFFFFFFFFFFFFFFBULL,0x00000004FFFFFFFFULL, 107 {
104 0x0000000000000000ULL,0xFFFFFFFB00000005ULL}, 108 0xFFFFFFFFFFFFFFFDULL, 0x00000002FFFFFFFFULL,
105 }; 109 0x0000000000000000ULL, 0xFFFFFFFD00000003ULL
110 },
111 {
112 0xFFFFFFFFFFFFFFFCULL, 0x00000003FFFFFFFFULL,
113 0x0000000000000000ULL, 0xFFFFFFFC00000004ULL
114 },
115 {
116 0xFFFFFFFFFFFFFFFBULL, 0x00000004FFFFFFFFULL,
117 0x0000000000000000ULL, 0xFFFFFFFB00000005ULL
118 },
119};
106static const BN_ULONG _nist_p_256_sqr[] = { 120static const BN_ULONG _nist_p_256_sqr[] = {
107 0x0000000000000001ULL,0xFFFFFFFE00000000ULL, 121 0x0000000000000001ULL, 0xFFFFFFFE00000000ULL,
108 0xFFFFFFFFFFFFFFFFULL,0x00000001FFFFFFFEULL, 122 0xFFFFFFFFFFFFFFFFULL, 0x00000001FFFFFFFEULL,
109 0x00000001FFFFFFFEULL,0x00000001FFFFFFFEULL, 123 0x00000001FFFFFFFEULL, 0x00000001FFFFFFFEULL,
110 0xFFFFFFFE00000001ULL,0xFFFFFFFE00000002ULL 124 0xFFFFFFFE00000001ULL, 0xFFFFFFFE00000002ULL
111 }; 125};
112static const BN_ULONG _nist_p_384[][BN_NIST_384_TOP] = { 126static const BN_ULONG _nist_p_384[][BN_NIST_384_TOP] = {
113 {0x00000000FFFFFFFFULL,0xFFFFFFFF00000000ULL,0xFFFFFFFFFFFFFFFEULL, 127 {
114 0xFFFFFFFFFFFFFFFFULL,0xFFFFFFFFFFFFFFFFULL,0xFFFFFFFFFFFFFFFFULL}, 128 0x00000000FFFFFFFFULL, 0xFFFFFFFF00000000ULL,
115 {0x00000001FFFFFFFEULL,0xFFFFFFFE00000000ULL,0xFFFFFFFFFFFFFFFDULL, 129 0xFFFFFFFFFFFFFFFEULL, 0xFFFFFFFFFFFFFFFFULL,
116 0xFFFFFFFFFFFFFFFFULL,0xFFFFFFFFFFFFFFFFULL,0xFFFFFFFFFFFFFFFFULL}, 130 0xFFFFFFFFFFFFFFFFULL, 0xFFFFFFFFFFFFFFFFULL
117 {0x00000002FFFFFFFDULL,0xFFFFFFFD00000000ULL,0xFFFFFFFFFFFFFFFCULL, 131 },
118 0xFFFFFFFFFFFFFFFFULL,0xFFFFFFFFFFFFFFFFULL,0xFFFFFFFFFFFFFFFFULL}, 132 {
119 {0x00000003FFFFFFFCULL,0xFFFFFFFC00000000ULL,0xFFFFFFFFFFFFFFFBULL, 133 0x00000001FFFFFFFEULL, 0xFFFFFFFE00000000ULL,
120 0xFFFFFFFFFFFFFFFFULL,0xFFFFFFFFFFFFFFFFULL,0xFFFFFFFFFFFFFFFFULL}, 134 0xFFFFFFFFFFFFFFFDULL, 0xFFFFFFFFFFFFFFFFULL,
121 {0x00000004FFFFFFFBULL,0xFFFFFFFB00000000ULL,0xFFFFFFFFFFFFFFFAULL, 135 0xFFFFFFFFFFFFFFFFULL, 0xFFFFFFFFFFFFFFFFULL
122 0xFFFFFFFFFFFFFFFFULL,0xFFFFFFFFFFFFFFFFULL,0xFFFFFFFFFFFFFFFFULL}, 136 },
123 }; 137 {
138 0x00000002FFFFFFFDULL, 0xFFFFFFFD00000000ULL,
139 0xFFFFFFFFFFFFFFFCULL, 0xFFFFFFFFFFFFFFFFULL,
140 0xFFFFFFFFFFFFFFFFULL, 0xFFFFFFFFFFFFFFFFULL
141 },
142 {
143 0x00000003FFFFFFFCULL, 0xFFFFFFFC00000000ULL,
144 0xFFFFFFFFFFFFFFFBULL, 0xFFFFFFFFFFFFFFFFULL,
145 0xFFFFFFFFFFFFFFFFULL, 0xFFFFFFFFFFFFFFFFULL
146 },
147 {
148 0x00000004FFFFFFFBULL, 0xFFFFFFFB00000000ULL,
149 0xFFFFFFFFFFFFFFFAULL, 0xFFFFFFFFFFFFFFFFULL,
150 0xFFFFFFFFFFFFFFFFULL, 0xFFFFFFFFFFFFFFFFULL
151 },
152};
124static const BN_ULONG _nist_p_384_sqr[] = { 153static const BN_ULONG _nist_p_384_sqr[] = {
125 0xFFFFFFFE00000001ULL,0x0000000200000000ULL,0xFFFFFFFE00000000ULL, 154 0xFFFFFFFE00000001ULL, 0x0000000200000000ULL, 0xFFFFFFFE00000000ULL,
126 0x0000000200000000ULL,0x0000000000000001ULL,0x0000000000000000ULL, 155 0x0000000200000000ULL, 0x0000000000000001ULL, 0x0000000000000000ULL,
127 0x00000001FFFFFFFEULL,0xFFFFFFFE00000000ULL,0xFFFFFFFFFFFFFFFDULL, 156 0x00000001FFFFFFFEULL, 0xFFFFFFFE00000000ULL, 0xFFFFFFFFFFFFFFFDULL,
128 0xFFFFFFFFFFFFFFFFULL,0xFFFFFFFFFFFFFFFFULL,0xFFFFFFFFFFFFFFFFULL 157 0xFFFFFFFFFFFFFFFFULL, 0xFFFFFFFFFFFFFFFFULL, 0xFFFFFFFFFFFFFFFFULL
129 }; 158};
130static const BN_ULONG _nist_p_521[] = 159static const BN_ULONG _nist_p_521[] = {
131 {0xFFFFFFFFFFFFFFFFULL,0xFFFFFFFFFFFFFFFFULL, 160 0xFFFFFFFFFFFFFFFFULL, 0xFFFFFFFFFFFFFFFFULL, 0xFFFFFFFFFFFFFFFFULL,
132 0xFFFFFFFFFFFFFFFFULL,0xFFFFFFFFFFFFFFFFULL, 161 0xFFFFFFFFFFFFFFFFULL, 0xFFFFFFFFFFFFFFFFULL, 0xFFFFFFFFFFFFFFFFULL,
133 0xFFFFFFFFFFFFFFFFULL,0xFFFFFFFFFFFFFFFFULL, 162 0xFFFFFFFFFFFFFFFFULL, 0xFFFFFFFFFFFFFFFFULL, 0x00000000000001FFULL
134 0xFFFFFFFFFFFFFFFFULL,0xFFFFFFFFFFFFFFFFULL, 163};
135 0x00000000000001FFULL};
136static const BN_ULONG _nist_p_521_sqr[] = { 164static const BN_ULONG _nist_p_521_sqr[] = {
137 0x0000000000000001ULL,0x0000000000000000ULL,0x0000000000000000ULL, 165 0x0000000000000001ULL, 0x0000000000000000ULL, 0x0000000000000000ULL,
138 0x0000000000000000ULL,0x0000000000000000ULL,0x0000000000000000ULL, 166 0x0000000000000000ULL, 0x0000000000000000ULL, 0x0000000000000000ULL,
139 0x0000000000000000ULL,0x0000000000000000ULL,0xFFFFFFFFFFFFFC00ULL, 167 0x0000000000000000ULL, 0x0000000000000000ULL, 0xFFFFFFFFFFFFFC00ULL,
140 0xFFFFFFFFFFFFFFFFULL,0xFFFFFFFFFFFFFFFFULL,0xFFFFFFFFFFFFFFFFULL, 168 0xFFFFFFFFFFFFFFFFULL, 0xFFFFFFFFFFFFFFFFULL, 0xFFFFFFFFFFFFFFFFULL,
141 0xFFFFFFFFFFFFFFFFULL,0xFFFFFFFFFFFFFFFFULL,0xFFFFFFFFFFFFFFFFULL, 169 0xFFFFFFFFFFFFFFFFULL, 0xFFFFFFFFFFFFFFFFULL, 0xFFFFFFFFFFFFFFFFULL,
142 0xFFFFFFFFFFFFFFFFULL,0x000000000003FFFFULL 170 0xFFFFFFFFFFFFFFFFULL, 0x000000000003FFFFULL
143 }; 171};
144#elif BN_BITS2 == 32 172#elif BN_BITS2 == 32
145static const BN_ULONG _nist_p_192[][BN_NIST_192_TOP] = { 173static const BN_ULONG _nist_p_192[][BN_NIST_192_TOP] = {
146 {0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFE,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF}, 174 {
147 {0xFFFFFFFE,0xFFFFFFFF,0xFFFFFFFD,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF}, 175 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFE, 0xFFFFFFFF,
148 {0xFFFFFFFD,0xFFFFFFFF,0xFFFFFFFC,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF} 176 0xFFFFFFFF, 0xFFFFFFFF
149 }; 177 },
178 {
179 0xFFFFFFFE, 0xFFFFFFFF, 0xFFFFFFFD, 0xFFFFFFFF,
180 0xFFFFFFFF, 0xFFFFFFFF
181 },
182 {
183 0xFFFFFFFD, 0xFFFFFFFF, 0xFFFFFFFC, 0xFFFFFFFF,
184 0xFFFFFFFF, 0xFFFFFFFF
185 }
186};
150static const BN_ULONG _nist_p_192_sqr[] = { 187static const BN_ULONG _nist_p_192_sqr[] = {
151 0x00000001,0x00000000,0x00000002,0x00000000,0x00000001,0x00000000, 188 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000,
152 0xFFFFFFFE,0xFFFFFFFF,0xFFFFFFFD,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF 189 0xFFFFFFFE, 0xFFFFFFFF, 0xFFFFFFFD, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF
153 }; 190};
154static const BN_ULONG _nist_p_224[][BN_NIST_224_TOP] = { 191static const BN_ULONG _nist_p_224[][BN_NIST_224_TOP] = {
155 {0x00000001,0x00000000,0x00000000,0xFFFFFFFF, 192 {
156 0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF}, 193 0x00000001, 0x00000000, 0x00000000, 0xFFFFFFFF,
157 {0x00000002,0x00000000,0x00000000,0xFFFFFFFE, 194 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF
158 0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF} 195 },
159 }; 196 {
197 0x00000002, 0x00000000, 0x00000000, 0xFFFFFFFE,
198 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF
199 }
200};
160static const BN_ULONG _nist_p_224_sqr[] = { 201static const BN_ULONG _nist_p_224_sqr[] = {
161 0x00000001,0x00000000,0x00000000,0xFFFFFFFE, 202 0x00000001, 0x00000000, 0x00000000, 0xFFFFFFFE,
162 0xFFFFFFFF,0xFFFFFFFF,0x00000000,0x00000002, 203 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x00000002,
163 0x00000000,0x00000000,0xFFFFFFFE,0xFFFFFFFF, 204 0x00000000, 0x00000000, 0xFFFFFFFE, 0xFFFFFFFF,
164 0xFFFFFFFF,0xFFFFFFFF 205 0xFFFFFFFF, 0xFFFFFFFF
165 }; 206};
166static const BN_ULONG _nist_p_256[][BN_NIST_256_TOP] = { 207static const BN_ULONG _nist_p_256[][BN_NIST_256_TOP] = {
167 {0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0x00000000, 208 {
168 0x00000000,0x00000000,0x00000001,0xFFFFFFFF}, 209 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000,
169 {0xFFFFFFFE,0xFFFFFFFF,0xFFFFFFFF,0x00000001, 210 0x00000000, 0x00000000, 0x00000001, 0xFFFFFFFF
170 0x00000000,0x00000000,0x00000002,0xFFFFFFFE}, 211 },
171 {0xFFFFFFFD,0xFFFFFFFF,0xFFFFFFFF,0x00000002, 212 {
172 0x00000000,0x00000000,0x00000003,0xFFFFFFFD}, 213 0xFFFFFFFE, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000001,
173 {0xFFFFFFFC,0xFFFFFFFF,0xFFFFFFFF,0x00000003, 214 0x00000000, 0x00000000, 0x00000002, 0xFFFFFFFE
174 0x00000000,0x00000000,0x00000004,0xFFFFFFFC}, 215 },
175 {0xFFFFFFFB,0xFFFFFFFF,0xFFFFFFFF,0x00000004, 216 {
176 0x00000000,0x00000000,0x00000005,0xFFFFFFFB}, 217 0xFFFFFFFD, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000002,
177 }; 218 0x00000000, 0x00000000, 0x00000003, 0xFFFFFFFD
219 },
220 {
221 0xFFFFFFFC, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000003,
222 0x00000000, 0x00000000, 0x00000004, 0xFFFFFFFC
223 },
224 {
225 0xFFFFFFFB, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000004,
226 0x00000000, 0x00000000, 0x00000005, 0xFFFFFFFB
227 },
228};
178static const BN_ULONG _nist_p_256_sqr[] = { 229static const BN_ULONG _nist_p_256_sqr[] = {
179 0x00000001,0x00000000,0x00000000,0xFFFFFFFE, 230 0x00000001, 0x00000000, 0x00000000, 0xFFFFFFFE,
180 0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFE,0x00000001, 231 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFE, 0x00000001,
181 0xFFFFFFFE,0x00000001,0xFFFFFFFE,0x00000001, 232 0xFFFFFFFE, 0x00000001, 0xFFFFFFFE, 0x00000001,
182 0x00000001,0xFFFFFFFE,0x00000002,0xFFFFFFFE 233 0x00000001, 0xFFFFFFFE, 0x00000002, 0xFFFFFFFE
183 }; 234};
184static const BN_ULONG _nist_p_384[][BN_NIST_384_TOP] = { 235static const BN_ULONG _nist_p_384[][BN_NIST_384_TOP] = {
185 {0xFFFFFFFF,0x00000000,0x00000000,0xFFFFFFFF,0xFFFFFFFE,0xFFFFFFFF, 236 {
186 0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF}, 237 0xFFFFFFFF, 0x00000000, 0x00000000, 0xFFFFFFFF,
187 {0xFFFFFFFE,0x00000001,0x00000000,0xFFFFFFFE,0xFFFFFFFD,0xFFFFFFFF, 238 0xFFFFFFFE, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
188 0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF}, 239 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF
189 {0xFFFFFFFD,0x00000002,0x00000000,0xFFFFFFFD,0xFFFFFFFC,0xFFFFFFFF, 240 },
190 0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF}, 241 {
191 {0xFFFFFFFC,0x00000003,0x00000000,0xFFFFFFFC,0xFFFFFFFB,0xFFFFFFFF, 242 0xFFFFFFFE, 0x00000001, 0x00000000, 0xFFFFFFFE,
192 0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF}, 243 0xFFFFFFFD, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
193 {0xFFFFFFFB,0x00000004,0x00000000,0xFFFFFFFB,0xFFFFFFFA,0xFFFFFFFF, 244 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF
194 0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF}, 245 },
195 }; 246 {
247 0xFFFFFFFD, 0x00000002, 0x00000000, 0xFFFFFFFD,
248 0xFFFFFFFC, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
249 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF
250 },
251 {
252 0xFFFFFFFC, 0x00000003, 0x00000000, 0xFFFFFFFC,
253 0xFFFFFFFB, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
254 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF
255 },
256 {
257 0xFFFFFFFB, 0x00000004, 0x00000000, 0xFFFFFFFB,
258 0xFFFFFFFA, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
259 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF
260 },
261};
196static const BN_ULONG _nist_p_384_sqr[] = { 262static const BN_ULONG _nist_p_384_sqr[] = {
197 0x00000001,0xFFFFFFFE,0x00000000,0x00000002,0x00000000,0xFFFFFFFE, 263 0x00000001, 0xFFFFFFFE, 0x00000000, 0x00000002, 0x00000000, 0xFFFFFFFE,
198 0x00000000,0x00000002,0x00000001,0x00000000,0x00000000,0x00000000, 264 0x00000000, 0x00000002, 0x00000001, 0x00000000, 0x00000000, 0x00000000,
199 0xFFFFFFFE,0x00000001,0x00000000,0xFFFFFFFE,0xFFFFFFFD,0xFFFFFFFF, 265 0xFFFFFFFE, 0x00000001, 0x00000000, 0xFFFFFFFE, 0xFFFFFFFD, 0xFFFFFFFF,
200 0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF 266 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF
201 }; 267};
202static const BN_ULONG _nist_p_521[] = {0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF, 268static const BN_ULONG _nist_p_521[] = {
203 0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF, 269 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
204 0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF, 270 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
205 0xFFFFFFFF,0x000001FF}; 271 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
272 0xFFFFFFFF, 0x000001FF
273};
206static const BN_ULONG _nist_p_521_sqr[] = { 274static const BN_ULONG _nist_p_521_sqr[] = {
207 0x00000001,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000, 275 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
208 0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000, 276 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
209 0x00000000,0x00000000,0x00000000,0x00000000,0xFFFFFC00,0xFFFFFFFF, 277 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFC00, 0xFFFFFFFF,
210 0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF, 278 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
211 0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF, 279 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
212 0xFFFFFFFF,0xFFFFFFFF,0x0003FFFF 280 0xFFFFFFFF, 0xFFFFFFFF, 0x0003FFFF
213 }; 281};
214#else 282#else
215#error "unsupported BN_BITS2" 283#error "unsupported BN_BITS2"
216#endif 284#endif
217 285
218 286static const BIGNUM _bignum_nist_p_192 = {
219static const BIGNUM _bignum_nist_p_192 =
220 {
221 (BN_ULONG *)_nist_p_192[0], 287 (BN_ULONG *)_nist_p_192[0],
222 BN_NIST_192_TOP, 288 BN_NIST_192_TOP,
223 BN_NIST_192_TOP, 289 BN_NIST_192_TOP,
224 0, 290 0,
225 BN_FLG_STATIC_DATA 291 BN_FLG_STATIC_DATA
226 }; 292};
227 293
228static const BIGNUM _bignum_nist_p_224 = 294static const BIGNUM _bignum_nist_p_224 = {
229 {
230 (BN_ULONG *)_nist_p_224[0], 295 (BN_ULONG *)_nist_p_224[0],
231 BN_NIST_224_TOP, 296 BN_NIST_224_TOP,
232 BN_NIST_224_TOP, 297 BN_NIST_224_TOP,
233 0, 298 0,
234 BN_FLG_STATIC_DATA 299 BN_FLG_STATIC_DATA
235 }; 300};
236 301
237static const BIGNUM _bignum_nist_p_256 = 302static const BIGNUM _bignum_nist_p_256 = {
238 {
239 (BN_ULONG *)_nist_p_256[0], 303 (BN_ULONG *)_nist_p_256[0],
240 BN_NIST_256_TOP, 304 BN_NIST_256_TOP,
241 BN_NIST_256_TOP, 305 BN_NIST_256_TOP,
242 0, 306 0,
243 BN_FLG_STATIC_DATA 307 BN_FLG_STATIC_DATA
244 }; 308};
245 309
246static const BIGNUM _bignum_nist_p_384 = 310static const BIGNUM _bignum_nist_p_384 = {
247 {
248 (BN_ULONG *)_nist_p_384[0], 311 (BN_ULONG *)_nist_p_384[0],
249 BN_NIST_384_TOP, 312 BN_NIST_384_TOP,
250 BN_NIST_384_TOP, 313 BN_NIST_384_TOP,
251 0, 314 0,
252 BN_FLG_STATIC_DATA 315 BN_FLG_STATIC_DATA
253 }; 316};
254 317
255static const BIGNUM _bignum_nist_p_521 = 318static const BIGNUM _bignum_nist_p_521 = {
256 {
257 (BN_ULONG *)_nist_p_521, 319 (BN_ULONG *)_nist_p_521,
258 BN_NIST_521_TOP, 320 BN_NIST_521_TOP,
259 BN_NIST_521_TOP, 321 BN_NIST_521_TOP,
260 0, 322 0,
261 BN_FLG_STATIC_DATA 323 BN_FLG_STATIC_DATA
262 }; 324};
263 325
264 326
265const BIGNUM *BN_get0_nist_prime_192(void) 327const BIGNUM *
266 { 328BN_get0_nist_prime_192(void)
329{
267 return &_bignum_nist_p_192; 330 return &_bignum_nist_p_192;
268 } 331}
269 332
270const BIGNUM *BN_get0_nist_prime_224(void) 333const BIGNUM *
271 { 334BN_get0_nist_prime_224(void)
335{
272 return &_bignum_nist_p_224; 336 return &_bignum_nist_p_224;
273 } 337}
274 338
275const BIGNUM *BN_get0_nist_prime_256(void) 339const BIGNUM *
276 { 340BN_get0_nist_prime_256(void)
341{
277 return &_bignum_nist_p_256; 342 return &_bignum_nist_p_256;
278 } 343}
279 344
280const BIGNUM *BN_get0_nist_prime_384(void) 345const BIGNUM *
281 { 346BN_get0_nist_prime_384(void)
347{
282 return &_bignum_nist_p_384; 348 return &_bignum_nist_p_384;
283 } 349}
284 350
285const BIGNUM *BN_get0_nist_prime_521(void) 351const BIGNUM *
286 { 352BN_get0_nist_prime_521(void)
353{
287 return &_bignum_nist_p_521; 354 return &_bignum_nist_p_521;
288 } 355}
289 356
290 357static void
291static void nist_cp_bn_0(BN_ULONG *dst, const BN_ULONG *src, int top, int max) 358nist_cp_bn_0(BN_ULONG *dst, const BN_ULONG *src, int top, int max)
292 { 359{
293 int i; 360 int i;
294 361
295#ifdef BN_DEBUG 362#ifdef BN_DEBUG
@@ -299,15 +366,15 @@ static void nist_cp_bn_0(BN_ULONG *dst, const BN_ULONG *src, int top, int max)
299 dst[i] = src[i]; 366 dst[i] = src[i];
300 for (; i < max; i++) 367 for (; i < max; i++)
301 dst[i] = 0; 368 dst[i] = 0;
302 } 369}
303 370
304static void nist_cp_bn(BN_ULONG *dst, const BN_ULONG *src, int top) 371static void nist_cp_bn(BN_ULONG *dst, const BN_ULONG *src, int top)
305 { 372{
306 int i; 373 int i;
307 374
308 for (i = 0; i < top; i++) 375 for (i = 0; i < top; i++)
309 dst[i] = src[i]; 376 dst[i] = src[i];
310 } 377}
311 378
312#if BN_BITS2 == 64 379#if BN_BITS2 == 64
313#define bn_cp_64(to, n, from, m) (to)[n] = (m>=0)?((from)[m]):0; 380#define bn_cp_64(to, n, from, m) (to)[n] = (m>=0)?((from)[m]):0;
@@ -352,93 +419,110 @@ static void nist_cp_bn(BN_ULONG *dst, const BN_ULONG *src, int top)
352 bn_cp_64(to, 2, from, (a1) - 3) \ 419 bn_cp_64(to, 2, from, (a1) - 3) \
353 } 420 }
354 421
355int BN_nist_mod_192(BIGNUM *r, const BIGNUM *a, const BIGNUM *field, 422int
356 BN_CTX *ctx) 423BN_nist_mod_192(BIGNUM *r, const BIGNUM *a, const BIGNUM *field, BN_CTX *ctx)
357 { 424{
358 int top = a->top, i; 425 int top = a->top, i;
359 int carry; 426 int carry;
360 register BN_ULONG *r_d, *a_d = a->d; 427 register BN_ULONG *r_d, *a_d = a->d;
361 union { 428 union {
362 BN_ULONG bn[BN_NIST_192_TOP]; 429 BN_ULONG bn[BN_NIST_192_TOP];
363 unsigned int ui[BN_NIST_192_TOP*sizeof(BN_ULONG)/sizeof(unsigned int)]; 430 unsigned int ui[BN_NIST_192_TOP *
364 } buf; 431 sizeof(BN_ULONG) / sizeof(unsigned int)];
365 BN_ULONG c_d[BN_NIST_192_TOP], 432 } buf;
366 *res; 433 BN_ULONG c_d[BN_NIST_192_TOP], *res;
367 uintptr_t mask; 434 uintptr_t mask;
368 static const BIGNUM _bignum_nist_p_192_sqr = { 435 static const BIGNUM _bignum_nist_p_192_sqr = {
369 (BN_ULONG *)_nist_p_192_sqr, 436 (BN_ULONG *)_nist_p_192_sqr,
370 sizeof(_nist_p_192_sqr)/sizeof(_nist_p_192_sqr[0]), 437 sizeof(_nist_p_192_sqr) / sizeof(_nist_p_192_sqr[0]),
371 sizeof(_nist_p_192_sqr)/sizeof(_nist_p_192_sqr[0]), 438 sizeof(_nist_p_192_sqr) / sizeof(_nist_p_192_sqr[0]),
372 0,BN_FLG_STATIC_DATA }; 439 0,
440 BN_FLG_STATIC_DATA
441 };
373 442
374 field = &_bignum_nist_p_192; /* just to make sure */ 443 field = &_bignum_nist_p_192; /* just to make sure */
375 444
376 if (BN_is_negative(a) || BN_ucmp(a,&_bignum_nist_p_192_sqr)>=0) 445 if (BN_is_negative(a) || BN_ucmp(a, &_bignum_nist_p_192_sqr) >= 0)
377 return BN_nnmod(r, a, field, ctx); 446 return BN_nnmod(r, a, field, ctx);
378 447
379 i = BN_ucmp(field, a); 448 i = BN_ucmp(field, a);
380 if (i == 0) 449 if (i == 0) {
381 {
382 BN_zero(r); 450 BN_zero(r);
383 return 1; 451 return 1;
384 } 452 } else if (i > 0)
385 else if (i > 0) 453 return (r == a) ? 1 : (BN_copy(r , a) != NULL);
386 return (r == a) ? 1 : (BN_copy(r ,a) != NULL);
387 454
388 if (r != a) 455 if (r != a) {
389 {
390 if (!bn_wexpand(r, BN_NIST_192_TOP)) 456 if (!bn_wexpand(r, BN_NIST_192_TOP))
391 return 0; 457 return 0;
392 r_d = r->d; 458 r_d = r->d;
393 nist_cp_bn(r_d, a_d, BN_NIST_192_TOP); 459 nist_cp_bn(r_d, a_d, BN_NIST_192_TOP);
394 } 460 } else
395 else
396 r_d = a_d; 461 r_d = a_d;
397 462
398 nist_cp_bn_0(buf.bn, a_d + BN_NIST_192_TOP, top - BN_NIST_192_TOP, BN_NIST_192_TOP); 463 nist_cp_bn_0(buf.bn, a_d + BN_NIST_192_TOP, top - BN_NIST_192_TOP,
464 BN_NIST_192_TOP);
399 465
400#if defined(NIST_INT64) 466#if defined(NIST_INT64)
401 { 467 {
402 NIST_INT64 acc; /* accumulator */ 468 NIST_INT64 acc; /* accumulator */
403 unsigned int *rp=(unsigned int *)r_d; 469 unsigned int *rp = (unsigned int *)r_d;
404 const unsigned int *bp=(const unsigned int *)buf.ui; 470 const unsigned int *bp = (const unsigned int *)buf.ui;
405 471
406 acc = rp[0]; acc += bp[3*2-6]; 472 acc = rp[0];
407 acc += bp[5*2-6]; rp[0] = (unsigned int)acc; acc >>= 32; 473 acc += bp[3 * 2 - 6];
408 474 acc += bp[5 * 2 - 6];
409 acc += rp[1]; acc += bp[3*2-5]; 475 rp[0] = (unsigned int)acc;
410 acc += bp[5*2-5]; rp[1] = (unsigned int)acc; acc >>= 32; 476 acc >>= 32;
411 477
412 acc += rp[2]; acc += bp[3*2-6]; 478 acc += rp[1];
413 acc += bp[4*2-6]; 479 acc += bp[3 * 2 - 5];
414 acc += bp[5*2-6]; rp[2] = (unsigned int)acc; acc >>= 32; 480 acc += bp[5 * 2 - 5];
415 481 rp[1] = (unsigned int)acc;
416 acc += rp[3]; acc += bp[3*2-5]; 482 acc >>= 32;
417 acc += bp[4*2-5]; 483
418 acc += bp[5*2-5]; rp[3] = (unsigned int)acc; acc >>= 32; 484 acc += rp[2];
419 485 acc += bp[3 * 2 - 6];
420 acc += rp[4]; acc += bp[4*2-6]; 486 acc += bp[4 * 2 - 6];
421 acc += bp[5*2-6]; rp[4] = (unsigned int)acc; acc >>= 32; 487 acc += bp[5 * 2 - 6];
422 488 rp[2] = (unsigned int)acc;
423 acc += rp[5]; acc += bp[4*2-5]; 489 acc >>= 32;
424 acc += bp[5*2-5]; rp[5] = (unsigned int)acc; 490
425 491 acc += rp[3];
426 carry = (int)(acc>>32); 492 acc += bp[3 * 2 - 5];
493 acc += bp[4 * 2 - 5];
494 acc += bp[5 * 2 - 5];
495 rp[3] = (unsigned int)acc;
496 acc >>= 32;
497
498 acc += rp[4];
499 acc += bp[4 * 2 - 6];
500 acc += bp[5 * 2 - 6];
501 rp[4] = (unsigned int)acc;
502 acc >>= 32;
503
504 acc += rp[5];
505 acc += bp[4 * 2 - 5];
506 acc += bp[5 * 2 - 5];
507 rp[5] = (unsigned int)acc;
508
509 carry = (int)(acc >> 32);
427 } 510 }
428#else 511#else
429 { 512 {
430 BN_ULONG t_d[BN_NIST_192_TOP]; 513 BN_ULONG t_d[BN_NIST_192_TOP];
431 514
432 nist_set_192(t_d, buf.bn, 0, 3, 3); 515 nist_set_192(t_d, buf.bn, 0, 3, 3);
433 carry = (int)bn_add_words(r_d, r_d, t_d, BN_NIST_192_TOP); 516 carry = (int)bn_add_words(r_d, r_d, t_d, BN_NIST_192_TOP);
434 nist_set_192(t_d, buf.bn, 4, 4, 0); 517 nist_set_192(t_d, buf.bn, 4, 4, 0);
435 carry += (int)bn_add_words(r_d, r_d, t_d, BN_NIST_192_TOP); 518 carry += (int)bn_add_words(r_d, r_d, t_d, BN_NIST_192_TOP);
436 nist_set_192(t_d, buf.bn, 5, 5, 5) 519 nist_set_192(t_d, buf.bn, 5, 5, 5)
437 carry += (int)bn_add_words(r_d, r_d, t_d, BN_NIST_192_TOP); 520 carry += (int)bn_add_words(r_d, r_d, t_d, BN_NIST_192_TOP);
438 } 521 }
439#endif 522#endif
440 if (carry > 0) 523 if (carry > 0)
441 carry = (int)bn_sub_words(r_d,r_d,_nist_p_192[carry-1],BN_NIST_192_TOP); 524 carry = (int)bn_sub_words(r_d, r_d, _nist_p_192[carry - 1],
525 BN_NIST_192_TOP);
442 else 526 else
443 carry = 1; 527 carry = 1;
444 528
@@ -448,19 +532,20 @@ int BN_nist_mod_192(BIGNUM *r, const BIGNUM *a, const BIGNUM *field,
448 * 'tmp=result-modulus; if (!carry || !borrow) result=tmp;' 532 * 'tmp=result-modulus; if (!carry || !borrow) result=tmp;'
449 * this is what happens below, but without explicit if:-) a. 533 * this is what happens below, but without explicit if:-) a.
450 */ 534 */
451 mask = 0-(uintptr_t)bn_sub_words(c_d,r_d,_nist_p_192[0],BN_NIST_192_TOP); 535 mask = 0 - (uintptr_t)bn_sub_words(c_d, r_d, _nist_p_192[0],
452 mask &= 0-(uintptr_t)carry; 536 BN_NIST_192_TOP);
453 res = c_d; 537 mask &= 0 - (uintptr_t)carry;
454 res = (BN_ULONG *) 538 res = c_d;
455 (((uintptr_t)res&~mask) | ((uintptr_t)r_d&mask)); 539 res = (BN_ULONG *)(((uintptr_t)res & ~mask) | ((uintptr_t)r_d & mask));
456 nist_cp_bn(r_d, res, BN_NIST_192_TOP); 540 nist_cp_bn(r_d, res, BN_NIST_192_TOP);
457 r->top = BN_NIST_192_TOP; 541 r->top = BN_NIST_192_TOP;
458 bn_correct_top(r); 542 bn_correct_top(r);
459 543
460 return 1; 544 return 1;
461 } 545}
462 546
463typedef BN_ULONG (*bn_addsub_f)(BN_ULONG *,const BN_ULONG *,const BN_ULONG *,int); 547typedef BN_ULONG (*bn_addsub_f)(BN_ULONG *, const BN_ULONG *,
548 const BN_ULONG *, int);
464 549
465#define nist_set_224(to, from, a1, a2, a3, a4, a5, a6, a7) \ 550#define nist_set_224(to, from, a1, a2, a3, a4, a5, a6, a7) \
466 { \ 551 { \
@@ -473,150 +558,170 @@ typedef BN_ULONG (*bn_addsub_f)(BN_ULONG *,const BN_ULONG *,const BN_ULONG *,int
473 bn_cp_32(to, 6, from, (a1) - 7) \ 558 bn_cp_32(to, 6, from, (a1) - 7) \
474 } 559 }
475 560
476int BN_nist_mod_224(BIGNUM *r, const BIGNUM *a, const BIGNUM *field, 561int
477 BN_CTX *ctx) 562BN_nist_mod_224(BIGNUM *r, const BIGNUM *a, const BIGNUM *field, BN_CTX *ctx)
478 { 563{
479 int top = a->top, i; 564 int top = a->top, i;
480 int carry; 565 int carry;
481 BN_ULONG *r_d, *a_d = a->d; 566 BN_ULONG *r_d, *a_d = a->d;
482 union { 567 union {
483 BN_ULONG bn[BN_NIST_224_TOP]; 568 BN_ULONG bn[BN_NIST_224_TOP];
484 unsigned int ui[BN_NIST_224_TOP*sizeof(BN_ULONG)/sizeof(unsigned int)]; 569 unsigned int ui[BN_NIST_224_TOP *
485 } buf; 570 sizeof(BN_ULONG) / sizeof(unsigned int)];
486 BN_ULONG c_d[BN_NIST_224_TOP], 571 } buf;
487 *res; 572 BN_ULONG c_d[BN_NIST_224_TOP], *res;
488 uintptr_t mask; 573 uintptr_t mask;
489 union { bn_addsub_f f; uintptr_t p; } u; 574 union {
575 bn_addsub_f f;
576 uintptr_t p;
577 } u;
490 static const BIGNUM _bignum_nist_p_224_sqr = { 578 static const BIGNUM _bignum_nist_p_224_sqr = {
491 (BN_ULONG *)_nist_p_224_sqr, 579 (BN_ULONG *)_nist_p_224_sqr,
492 sizeof(_nist_p_224_sqr)/sizeof(_nist_p_224_sqr[0]), 580 sizeof(_nist_p_224_sqr) / sizeof(_nist_p_224_sqr[0]),
493 sizeof(_nist_p_224_sqr)/sizeof(_nist_p_224_sqr[0]), 581 sizeof(_nist_p_224_sqr) / sizeof(_nist_p_224_sqr[0]),
494 0,BN_FLG_STATIC_DATA }; 582 0,
495 583 BN_FLG_STATIC_DATA
584 };
496 585
497 field = &_bignum_nist_p_224; /* just to make sure */ 586 field = &_bignum_nist_p_224; /* just to make sure */
498 587
499 if (BN_is_negative(a) || BN_ucmp(a,&_bignum_nist_p_224_sqr)>=0) 588 if (BN_is_negative(a) || BN_ucmp(a, &_bignum_nist_p_224_sqr) >= 0)
500 return BN_nnmod(r, a, field, ctx); 589 return BN_nnmod(r, a, field, ctx);
501 590
502 i = BN_ucmp(field, a); 591 i = BN_ucmp(field, a);
503 if (i == 0) 592 if (i == 0) {
504 {
505 BN_zero(r); 593 BN_zero(r);
506 return 1; 594 return 1;
507 } 595 } else if (i > 0)
508 else if (i > 0) 596 return (r == a) ? 1 : (BN_copy(r, a) != NULL);
509 return (r == a)? 1 : (BN_copy(r ,a) != NULL);
510 597
511 if (r != a) 598 if (r != a) {
512 {
513 if (!bn_wexpand(r, BN_NIST_224_TOP)) 599 if (!bn_wexpand(r, BN_NIST_224_TOP))
514 return 0; 600 return 0;
515 r_d = r->d; 601 r_d = r->d;
516 nist_cp_bn(r_d, a_d, BN_NIST_224_TOP); 602 nist_cp_bn(r_d, a_d, BN_NIST_224_TOP);
517 } 603 } else
518 else
519 r_d = a_d; 604 r_d = a_d;
520 605
521#if BN_BITS2==64 606#if BN_BITS2==64
522 /* copy upper 256 bits of 448 bit number ... */ 607 /* copy upper 256 bits of 448 bit number ... */
523 nist_cp_bn_0(c_d, a_d + (BN_NIST_224_TOP-1), top - (BN_NIST_224_TOP-1), BN_NIST_224_TOP); 608 nist_cp_bn_0(c_d, a_d + (BN_NIST_224_TOP - 1),
609 top - (BN_NIST_224_TOP - 1), BN_NIST_224_TOP);
524 /* ... and right shift by 32 to obtain upper 224 bits */ 610 /* ... and right shift by 32 to obtain upper 224 bits */
525 nist_set_224(buf.bn, c_d, 14, 13, 12, 11, 10, 9, 8); 611 nist_set_224(buf.bn, c_d, 14, 13, 12, 11, 10, 9, 8);
526 /* truncate lower part to 224 bits too */ 612 /* truncate lower part to 224 bits too */
527 r_d[BN_NIST_224_TOP-1] &= BN_MASK2l; 613 r_d[BN_NIST_224_TOP - 1] &= BN_MASK2l;
528#else 614#else
529 nist_cp_bn_0(buf.bn, a_d + BN_NIST_224_TOP, top - BN_NIST_224_TOP, BN_NIST_224_TOP); 615 nist_cp_bn_0(buf.bn, a_d + BN_NIST_224_TOP,
616 top - BN_NIST_224_TOP, BN_NIST_224_TOP);
530#endif 617#endif
531 618
532#if defined(NIST_INT64) && BN_BITS2!=64 619#if defined(NIST_INT64) && BN_BITS2!=64
533 { 620 {
534 NIST_INT64 acc; /* accumulator */ 621 NIST_INT64 acc; /* accumulator */
535 unsigned int *rp=(unsigned int *)r_d; 622 unsigned int *rp = (unsigned int *)r_d;
536 const unsigned int *bp=(const unsigned int *)buf.ui; 623 const unsigned int *bp = (const unsigned int *)buf.ui;
537 624
538 acc = rp[0]; acc -= bp[7-7]; 625 acc = rp[0];
539 acc -= bp[11-7]; rp[0] = (unsigned int)acc; acc >>= 32; 626 acc -= bp[7 - 7];
540 627 acc -= bp[11 - 7];
541 acc += rp[1]; acc -= bp[8-7]; 628 rp[0] = (unsigned int)acc;
542 acc -= bp[12-7]; rp[1] = (unsigned int)acc; acc >>= 32; 629 acc >>= 32;
543 630
544 acc += rp[2]; acc -= bp[9-7]; 631 acc += rp[1];
545 acc -= bp[13-7]; rp[2] = (unsigned int)acc; acc >>= 32; 632 acc -= bp[8 - 7];
546 633 acc -= bp[12 - 7];
547 acc += rp[3]; acc += bp[7-7]; 634 rp[1] = (unsigned int)acc;
548 acc += bp[11-7]; 635 acc >>= 32;
549 acc -= bp[10-7]; rp[3] = (unsigned int)acc; acc>>= 32; 636
550 637 acc += rp[2];
551 acc += rp[4]; acc += bp[8-7]; 638 acc -= bp[9 - 7];
552 acc += bp[12-7]; 639 acc -= bp[13 - 7];
553 acc -= bp[11-7]; rp[4] = (unsigned int)acc; acc >>= 32; 640 rp[2] = (unsigned int)acc;
554 641 acc >>= 32;
555 acc += rp[5]; acc += bp[9-7]; 642
556 acc += bp[13-7]; 643 acc += rp[3];
557 acc -= bp[12-7]; rp[5] = (unsigned int)acc; acc >>= 32; 644 acc += bp[7 - 7];
558 645 acc += bp[11 - 7];
559 acc += rp[6]; acc += bp[10-7]; 646 acc -= bp[10 - 7];
560 acc -= bp[13-7]; rp[6] = (unsigned int)acc; 647 rp[3] = (unsigned int)acc;
561 648 acc >>= 32;
562 carry = (int)(acc>>32); 649
650 acc += rp[4];
651 acc += bp[8 - 7];
652 acc += bp[12 - 7];
653 acc -= bp[11 - 7];
654 rp[4] = (unsigned int)acc;
655 acc >>= 32;
656
657 acc += rp[5];
658 acc += bp[9 - 7];
659 acc += bp[13 - 7];
660 acc -= bp[12 - 7];
661 rp[5] = (unsigned int)acc;
662 acc >>= 32;
663
664 acc += rp[6];
665 acc += bp[10 - 7];
666 acc -= bp[13 - 7];
667 rp[6] = (unsigned int)acc;
668
669 carry = (int)(acc >> 32);
563# if BN_BITS2==64 670# if BN_BITS2==64
564 rp[7] = carry; 671 rp[7] = carry;
565# endif 672# endif
566 } 673 }
567#else 674#else
568 { 675 {
569 BN_ULONG t_d[BN_NIST_224_TOP]; 676 BN_ULONG t_d[BN_NIST_224_TOP];
570 677
571 nist_set_224(t_d, buf.bn, 10, 9, 8, 7, 0, 0, 0); 678 nist_set_224(t_d, buf.bn, 10, 9, 8, 7, 0, 0, 0);
572 carry = (int)bn_add_words(r_d, r_d, t_d, BN_NIST_224_TOP); 679 carry = (int)bn_add_words(r_d, r_d, t_d, BN_NIST_224_TOP);
573 nist_set_224(t_d, buf.bn, 0, 13, 12, 11, 0, 0, 0); 680 nist_set_224(t_d, buf.bn, 0, 13, 12, 11, 0, 0, 0);
574 carry += (int)bn_add_words(r_d, r_d, t_d, BN_NIST_224_TOP); 681 carry += (int)bn_add_words(r_d, r_d, t_d, BN_NIST_224_TOP);
575 nist_set_224(t_d, buf.bn, 13, 12, 11, 10, 9, 8, 7); 682 nist_set_224(t_d, buf.bn, 13, 12, 11, 10, 9, 8, 7);
576 carry -= (int)bn_sub_words(r_d, r_d, t_d, BN_NIST_224_TOP); 683 carry -= (int)bn_sub_words(r_d, r_d, t_d, BN_NIST_224_TOP);
577 nist_set_224(t_d, buf.bn, 0, 0, 0, 0, 13, 12, 11); 684 nist_set_224(t_d, buf.bn, 0, 0, 0, 0, 13, 12, 11);
578 carry -= (int)bn_sub_words(r_d, r_d, t_d, BN_NIST_224_TOP); 685 carry -= (int)bn_sub_words(r_d, r_d, t_d, BN_NIST_224_TOP);
579 686
580#if BN_BITS2==64 687#if BN_BITS2==64
581 carry = (int)(r_d[BN_NIST_224_TOP-1]>>32); 688 carry = (int)(r_d[BN_NIST_224_TOP - 1] >> 32);
582#endif 689#endif
583 } 690 }
584#endif 691#endif
585 u.f = bn_sub_words; 692 u.f = bn_sub_words;
586 if (carry > 0) 693 if (carry > 0) {
587 { 694 carry = (int)bn_sub_words(r_d, r_d, _nist_p_224[carry - 1],
588 carry = (int)bn_sub_words(r_d,r_d,_nist_p_224[carry-1],BN_NIST_224_TOP); 695 BN_NIST_224_TOP);
589#if BN_BITS2==64 696#if BN_BITS2==64
590 carry=(int)(~(r_d[BN_NIST_224_TOP-1]>>32))&1; 697 carry = (int)(~(r_d[BN_NIST_224_TOP - 1] >> 32)) & 1;
591#endif 698#endif
592 } 699 } else if (carry < 0) {
593 else if (carry < 0)
594 {
595 /* it's a bit more complicated logic in this case. 700 /* it's a bit more complicated logic in this case.
596 * if bn_add_words yields no carry, then result 701 * if bn_add_words yields no carry, then result
597 * has to be adjusted by unconditionally *adding* 702 * has to be adjusted by unconditionally *adding*
598 * the modulus. but if it does, then result has 703 * the modulus. but if it does, then result has
599 * to be compared to the modulus and conditionally 704 * to be compared to the modulus and conditionally
600 * adjusted by *subtracting* the latter. */ 705 * adjusted by *subtracting* the latter. */
601 carry = (int)bn_add_words(r_d,r_d,_nist_p_224[-carry-1],BN_NIST_224_TOP); 706 carry = (int)bn_add_words(r_d, r_d, _nist_p_224[-carry - 1],
602 mask = 0-(uintptr_t)carry; 707 BN_NIST_224_TOP);
603 u.p = ((uintptr_t)bn_sub_words&mask) | 708 mask = 0 - (uintptr_t)carry;
604 ((uintptr_t)bn_add_words&~mask); 709 u.p = ((uintptr_t)bn_sub_words & mask) |
605 } 710 ((uintptr_t)bn_add_words & ~mask);
606 else 711 } else
607 carry = 1; 712 carry = 1;
608 713
609 /* otherwise it's effectively same as in BN_nist_mod_192... */ 714 /* otherwise it's effectively same as in BN_nist_mod_192... */
610 mask = 0-(uintptr_t)(*u.f)(c_d,r_d,_nist_p_224[0],BN_NIST_224_TOP); 715 mask = 0 - (uintptr_t)(*u.f)(c_d, r_d, _nist_p_224[0], BN_NIST_224_TOP);
611 mask &= 0-(uintptr_t)carry; 716 mask &= 0 - (uintptr_t)carry;
612 res = c_d; 717 res = c_d;
613 res = (BN_ULONG *)(((uintptr_t)res&~mask) | ((uintptr_t)r_d&mask)); 718 res = (BN_ULONG *)(((uintptr_t)res & ~mask) | ((uintptr_t)r_d & mask));
614 nist_cp_bn(r_d, res, BN_NIST_224_TOP); 719 nist_cp_bn(r_d, res, BN_NIST_224_TOP);
615 r->top = BN_NIST_224_TOP; 720 r->top = BN_NIST_224_TOP;
616 bn_correct_top(r); 721 bn_correct_top(r);
617 722
618 return 1; 723 return 1;
619 } 724}
620 725
621#define nist_set_256(to, from, a1, a2, a3, a4, a5, a6, a7, a8) \ 726#define nist_set_256(to, from, a1, a2, a3, a4, a5, a6, a7, a8) \
622 { \ 727 { \
@@ -630,192 +735,216 @@ int BN_nist_mod_224(BIGNUM *r, const BIGNUM *a, const BIGNUM *field,
630 bn_cp_32(to, 7, from, (a1) - 8) \ 735 bn_cp_32(to, 7, from, (a1) - 8) \
631 } 736 }
632 737
633int BN_nist_mod_256(BIGNUM *r, const BIGNUM *a, const BIGNUM *field, 738int
634 BN_CTX *ctx) 739BN_nist_mod_256(BIGNUM *r, const BIGNUM *a, const BIGNUM *field, BN_CTX *ctx)
635 { 740{
636 int i, top = a->top; 741 int i, top = a->top;
637 int carry = 0; 742 int carry = 0;
638 register BN_ULONG *a_d = a->d, *r_d; 743 register BN_ULONG *a_d = a->d, *r_d;
639 union { 744 union {
640 BN_ULONG bn[BN_NIST_256_TOP]; 745 BN_ULONG bn[BN_NIST_256_TOP];
641 unsigned int ui[BN_NIST_256_TOP*sizeof(BN_ULONG)/sizeof(unsigned int)]; 746 unsigned int ui[BN_NIST_256_TOP *
642 } buf; 747 sizeof(BN_ULONG) / sizeof(unsigned int)];
643 BN_ULONG c_d[BN_NIST_256_TOP], 748 } buf;
644 *res; 749 BN_ULONG c_d[BN_NIST_256_TOP], *res;
645 uintptr_t mask; 750 uintptr_t mask;
646 union { bn_addsub_f f; uintptr_t p; } u; 751 union {
752 bn_addsub_f f;
753 uintptr_t p;
754 } u;
647 static const BIGNUM _bignum_nist_p_256_sqr = { 755 static const BIGNUM _bignum_nist_p_256_sqr = {
648 (BN_ULONG *)_nist_p_256_sqr, 756 (BN_ULONG *)_nist_p_256_sqr,
649 sizeof(_nist_p_256_sqr)/sizeof(_nist_p_256_sqr[0]), 757 sizeof(_nist_p_256_sqr) / sizeof(_nist_p_256_sqr[0]),
650 sizeof(_nist_p_256_sqr)/sizeof(_nist_p_256_sqr[0]), 758 sizeof(_nist_p_256_sqr) / sizeof(_nist_p_256_sqr[0]),
651 0,BN_FLG_STATIC_DATA }; 759 0,
760 BN_FLG_STATIC_DATA
761 };
652 762
653 field = &_bignum_nist_p_256; /* just to make sure */ 763 field = &_bignum_nist_p_256; /* just to make sure */
654 764
655 if (BN_is_negative(a) || BN_ucmp(a,&_bignum_nist_p_256_sqr)>=0) 765 if (BN_is_negative(a) || BN_ucmp(a, &_bignum_nist_p_256_sqr) >= 0)
656 return BN_nnmod(r, a, field, ctx); 766 return BN_nnmod(r, a, field, ctx);
657 767
658 i = BN_ucmp(field, a); 768 i = BN_ucmp(field, a);
659 if (i == 0) 769 if (i == 0) {
660 {
661 BN_zero(r); 770 BN_zero(r);
662 return 1; 771 return 1;
663 } 772 } else if (i > 0)
664 else if (i > 0) 773 return (r == a) ? 1 : (BN_copy(r, a) != NULL);
665 return (r == a)? 1 : (BN_copy(r ,a) != NULL);
666 774
667 if (r != a) 775 if (r != a) {
668 {
669 if (!bn_wexpand(r, BN_NIST_256_TOP)) 776 if (!bn_wexpand(r, BN_NIST_256_TOP))
670 return 0; 777 return 0;
671 r_d = r->d; 778 r_d = r->d;
672 nist_cp_bn(r_d, a_d, BN_NIST_256_TOP); 779 nist_cp_bn(r_d, a_d, BN_NIST_256_TOP);
673 } 780 } else
674 else
675 r_d = a_d; 781 r_d = a_d;
676 782
677 nist_cp_bn_0(buf.bn, a_d + BN_NIST_256_TOP, top - BN_NIST_256_TOP, BN_NIST_256_TOP); 783 nist_cp_bn_0(buf.bn, a_d + BN_NIST_256_TOP,
784 top - BN_NIST_256_TOP, BN_NIST_256_TOP);
678 785
679#if defined(NIST_INT64) 786#if defined(NIST_INT64)
680 { 787 {
681 NIST_INT64 acc; /* accumulator */ 788 NIST_INT64 acc; /* accumulator */
682 unsigned int *rp=(unsigned int *)r_d; 789 unsigned int *rp = (unsigned int *)r_d;
683 const unsigned int *bp=(const unsigned int *)buf.ui; 790 const unsigned int *bp = (const unsigned int *)buf.ui;
684 791
685 acc = rp[0]; acc += bp[8-8]; 792 acc = rp[0];
686 acc += bp[9-8]; 793 acc += bp[8 - 8];
687 acc -= bp[11-8]; 794 acc += bp[9 - 8];
688 acc -= bp[12-8]; 795 acc -= bp[11 - 8];
689 acc -= bp[13-8]; 796 acc -= bp[12 - 8];
690 acc -= bp[14-8]; rp[0] = (unsigned int)acc; acc >>= 32; 797 acc -= bp[13 - 8];
691 798 acc -= bp[14 - 8];
692 acc += rp[1]; acc += bp[9-8]; 799 rp[0] = (unsigned int)acc;
693 acc += bp[10-8]; 800 acc >>= 32;
694 acc -= bp[12-8]; 801
695 acc -= bp[13-8]; 802 acc += rp[1];
696 acc -= bp[14-8]; 803 acc += bp[9 - 8];
697 acc -= bp[15-8]; rp[1] = (unsigned int)acc; acc >>= 32; 804 acc += bp[10 - 8];
698 805 acc -= bp[12 - 8];
699 acc += rp[2]; acc += bp[10-8]; 806 acc -= bp[13 - 8];
700 acc += bp[11-8]; 807 acc -= bp[14 - 8];
701 acc -= bp[13-8]; 808 acc -= bp[15 - 8];
702 acc -= bp[14-8]; 809 rp[1] = (unsigned int)acc;
703 acc -= bp[15-8]; rp[2] = (unsigned int)acc; acc >>= 32; 810 acc >>= 32;
704 811
705 acc += rp[3]; acc += bp[11-8]; 812 acc += rp[2];
706 acc += bp[11-8]; 813 acc += bp[10 - 8];
707 acc += bp[12-8]; 814 acc += bp[11 - 8];
708 acc += bp[12-8]; 815 acc -= bp[13 - 8];
709 acc += bp[13-8]; 816 acc -= bp[14 - 8];
710 acc -= bp[15-8]; 817 acc -= bp[15 - 8];
711 acc -= bp[8-8]; 818 rp[2] = (unsigned int)acc;
712 acc -= bp[9-8]; rp[3] = (unsigned int)acc; acc >>= 32; 819 acc >>= 32;
713 820
714 acc += rp[4]; acc += bp[12-8]; 821 acc += rp[3];
715 acc += bp[12-8]; 822 acc += bp[11 - 8];
716 acc += bp[13-8]; 823 acc += bp[11 - 8];
717 acc += bp[13-8]; 824 acc += bp[12 - 8];
718 acc += bp[14-8]; 825 acc += bp[12 - 8];
719 acc -= bp[9-8]; 826 acc += bp[13 - 8];
720 acc -= bp[10-8]; rp[4] = (unsigned int)acc; acc >>= 32; 827 acc -= bp[15 - 8];
721 828 acc -= bp[8 - 8];
722 acc += rp[5]; acc += bp[13-8]; 829 acc -= bp[9 - 8];
723 acc += bp[13-8]; 830 rp[3] = (unsigned int)acc;
724 acc += bp[14-8]; 831 acc >>= 32;
725 acc += bp[14-8]; 832
726 acc += bp[15-8]; 833 acc += rp[4];
727 acc -= bp[10-8]; 834 acc += bp[12 - 8];
728 acc -= bp[11-8]; rp[5] = (unsigned int)acc; acc >>= 32; 835 acc += bp[12 - 8];
729 836 acc += bp[13 - 8];
730 acc += rp[6]; acc += bp[14-8]; 837 acc += bp[13 - 8];
731 acc += bp[14-8]; 838 acc += bp[14 - 8];
732 acc += bp[15-8]; 839 acc -= bp[9 - 8];
733 acc += bp[15-8]; 840 acc -= bp[10 - 8];
734 acc += bp[14-8]; 841 rp[4] = (unsigned int)acc;
735 acc += bp[13-8]; 842 acc >>= 32;
736 acc -= bp[8-8]; 843
737 acc -= bp[9-8]; rp[6] = (unsigned int)acc; acc >>= 32; 844 acc += rp[5];
738 845 acc += bp[13 - 8];
739 acc += rp[7]; acc += bp[15-8]; 846 acc += bp[13 - 8];
740 acc += bp[15-8]; 847 acc += bp[14 - 8];
741 acc += bp[15-8]; 848 acc += bp[14 - 8];
742 acc += bp[8 -8]; 849 acc += bp[15 - 8];
743 acc -= bp[10-8]; 850 acc -= bp[10 - 8];
744 acc -= bp[11-8]; 851 acc -= bp[11 - 8];
745 acc -= bp[12-8]; 852 rp[5] = (unsigned int)acc;
746 acc -= bp[13-8]; rp[7] = (unsigned int)acc; 853 acc >>= 32;
747 854
748 carry = (int)(acc>>32); 855 acc += rp[6];
856 acc += bp[14 - 8];
857 acc += bp[14 - 8];
858 acc += bp[15 - 8];
859 acc += bp[15 - 8];
860 acc += bp[14 - 8];
861 acc += bp[13 - 8];
862 acc -= bp[8 - 8];
863 acc -= bp[9 - 8];
864 rp[6] = (unsigned int)acc;
865 acc >>= 32;
866
867 acc += rp[7];
868 acc += bp[15 - 8];
869 acc += bp[15 - 8];
870 acc += bp[15 - 8];
871 acc += bp[8 - 8];
872 acc -= bp[10 - 8];
873 acc -= bp[11 - 8];
874 acc -= bp[12 - 8];
875 acc -= bp[13 - 8];
876 rp[7] = (unsigned int)acc;
877
878 carry = (int)(acc >> 32);
749 } 879 }
750#else 880#else
751 { 881 {
752 BN_ULONG t_d[BN_NIST_256_TOP]; 882 BN_ULONG t_d[BN_NIST_256_TOP];
753 883
754 /*S1*/ 884 /*S1*/
755 nist_set_256(t_d, buf.bn, 15, 14, 13, 12, 11, 0, 0, 0); 885 nist_set_256(t_d, buf.bn, 15, 14, 13, 12, 11, 0, 0, 0);
756 /*S2*/ 886 /*S2*/
757 nist_set_256(c_d, buf.bn, 0, 15, 14, 13, 12, 0, 0, 0); 887 nist_set_256(c_d, buf.bn, 0, 15, 14, 13, 12, 0, 0, 0);
758 carry = (int)bn_add_words(t_d, t_d, c_d, BN_NIST_256_TOP); 888 carry = (int)bn_add_words(t_d, t_d, c_d, BN_NIST_256_TOP);
759 /* left shift */ 889 /* left shift */
760 { 890 {
761 register BN_ULONG *ap,t,c; 891 register BN_ULONG *ap, t, c;
762 ap = t_d; 892 ap = t_d;
763 c=0; 893 c = 0;
764 for (i = BN_NIST_256_TOP; i != 0; --i) 894 for (i = BN_NIST_256_TOP; i != 0; --i) {
765 { 895 t = *ap;
766 t= *ap; 896 *(ap++) = ((t << 1) | c) & BN_MASK2;
767 *(ap++)=((t<<1)|c)&BN_MASK2; 897 c = (t & BN_TBIT) ? 1 : 0;
768 c=(t & BN_TBIT)?1:0;
769 } 898 }
770 carry <<= 1; 899 carry <<= 1;
771 carry |= c; 900 carry |= c;
772 } 901 }
773 carry += (int)bn_add_words(r_d, r_d, t_d, BN_NIST_256_TOP); 902 carry += (int)bn_add_words(r_d, r_d, t_d, BN_NIST_256_TOP);
774 /*S3*/ 903 /*S3*/
775 nist_set_256(t_d, buf.bn, 15, 14, 0, 0, 0, 10, 9, 8); 904 nist_set_256(t_d, buf.bn, 15, 14, 0, 0, 0, 10, 9, 8);
776 carry += (int)bn_add_words(r_d, r_d, t_d, BN_NIST_256_TOP); 905 carry += (int)bn_add_words(r_d, r_d, t_d, BN_NIST_256_TOP);
777 /*S4*/ 906 /*S4*/
778 nist_set_256(t_d, buf.bn, 8, 13, 15, 14, 13, 11, 10, 9); 907 nist_set_256(t_d, buf.bn, 8, 13, 15, 14, 13, 11, 10, 9);
779 carry += (int)bn_add_words(r_d, r_d, t_d, BN_NIST_256_TOP); 908 carry += (int)bn_add_words(r_d, r_d, t_d, BN_NIST_256_TOP);
780 /*D1*/ 909 /*D1*/
781 nist_set_256(t_d, buf.bn, 10, 8, 0, 0, 0, 13, 12, 11); 910 nist_set_256(t_d, buf.bn, 10, 8, 0, 0, 0, 13, 12, 11);
782 carry -= (int)bn_sub_words(r_d, r_d, t_d, BN_NIST_256_TOP); 911 carry -= (int)bn_sub_words(r_d, r_d, t_d, BN_NIST_256_TOP);
783 /*D2*/ 912 /*D2*/
784 nist_set_256(t_d, buf.bn, 11, 9, 0, 0, 15, 14, 13, 12); 913 nist_set_256(t_d, buf.bn, 11, 9, 0, 0, 15, 14, 13, 12);
785 carry -= (int)bn_sub_words(r_d, r_d, t_d, BN_NIST_256_TOP); 914 carry -= (int)bn_sub_words(r_d, r_d, t_d, BN_NIST_256_TOP);
786 /*D3*/ 915 /*D3*/
787 nist_set_256(t_d, buf.bn, 12, 0, 10, 9, 8, 15, 14, 13); 916 nist_set_256(t_d, buf.bn, 12, 0, 10, 9, 8, 15, 14, 13);
788 carry -= (int)bn_sub_words(r_d, r_d, t_d, BN_NIST_256_TOP); 917 carry -= (int)bn_sub_words(r_d, r_d, t_d, BN_NIST_256_TOP);
789 /*D4*/ 918 /*D4*/
790 nist_set_256(t_d, buf.bn, 13, 0, 11, 10, 9, 0, 15, 14); 919 nist_set_256(t_d, buf.bn, 13, 0, 11, 10, 9, 0, 15, 14);
791 carry -= (int)bn_sub_words(r_d, r_d, t_d, BN_NIST_256_TOP); 920 carry -= (int)bn_sub_words(r_d, r_d, t_d, BN_NIST_256_TOP);
792 921
793 } 922 }
794#endif 923#endif
795 /* see BN_nist_mod_224 for explanation */ 924 /* see BN_nist_mod_224 for explanation */
796 u.f = bn_sub_words; 925 u.f = bn_sub_words;
797 if (carry > 0) 926 if (carry > 0)
798 carry = (int)bn_sub_words(r_d,r_d,_nist_p_256[carry-1],BN_NIST_256_TOP); 927 carry = (int)bn_sub_words(r_d, r_d, _nist_p_256[carry - 1],
799 else if (carry < 0) 928 BN_NIST_256_TOP);
800 { 929 else if (carry < 0) {
801 carry = (int)bn_add_words(r_d,r_d,_nist_p_256[-carry-1],BN_NIST_256_TOP); 930 carry = (int)bn_add_words(r_d, r_d, _nist_p_256[-carry - 1],
802 mask = 0-(uintptr_t)carry; 931 BN_NIST_256_TOP);
803 u.p = ((uintptr_t)bn_sub_words&mask) | 932 mask = 0 - (uintptr_t)carry;
804 ((uintptr_t)bn_add_words&~mask); 933 u.p = ((uintptr_t)bn_sub_words & mask) |
805 } 934 ((uintptr_t)bn_add_words & ~mask);
806 else 935 } else
807 carry = 1; 936 carry = 1;
808 937
809 mask = 0-(uintptr_t)(*u.f)(c_d,r_d,_nist_p_256[0],BN_NIST_256_TOP); 938 mask = 0 - (uintptr_t)(*u.f)(c_d, r_d, _nist_p_256[0], BN_NIST_256_TOP);
810 mask &= 0-(uintptr_t)carry; 939 mask &= 0 - (uintptr_t)carry;
811 res = c_d; 940 res = c_d;
812 res = (BN_ULONG *)(((uintptr_t)res&~mask) | ((uintptr_t)r_d&mask)); 941 res = (BN_ULONG *)(((uintptr_t)res & ~mask) | ((uintptr_t)r_d & mask));
813 nist_cp_bn(r_d, res, BN_NIST_256_TOP); 942 nist_cp_bn(r_d, res, BN_NIST_256_TOP);
814 r->top = BN_NIST_256_TOP; 943 r->top = BN_NIST_256_TOP;
815 bn_correct_top(r); 944 bn_correct_top(r);
816 945
817 return 1; 946 return 1;
818 } 947}
819 948
820#define nist_set_384(to,from,a1,a2,a3,a4,a5,a6,a7,a8,a9,a10,a11,a12) \ 949#define nist_set_384(to,from,a1,a2,a3,a4,a5,a6,a7,a8,a9,a10,a11,a12) \
821 { \ 950 { \
@@ -833,273 +962,309 @@ int BN_nist_mod_256(BIGNUM *r, const BIGNUM *a, const BIGNUM *field,
833 bn_cp_32(to, 11, from, (a1) - 12) \ 962 bn_cp_32(to, 11, from, (a1) - 12) \
834 } 963 }
835 964
836int BN_nist_mod_384(BIGNUM *r, const BIGNUM *a, const BIGNUM *field, 965int
837 BN_CTX *ctx) 966BN_nist_mod_384(BIGNUM *r, const BIGNUM *a, const BIGNUM *field, BN_CTX *ctx)
838 { 967{
839 int i, top = a->top; 968 int i, top = a->top;
840 int carry = 0; 969 int carry = 0;
841 register BN_ULONG *r_d, *a_d = a->d; 970 register BN_ULONG *r_d, *a_d = a->d;
842 union { 971 union {
843 BN_ULONG bn[BN_NIST_384_TOP]; 972 BN_ULONG bn[BN_NIST_384_TOP];
844 unsigned int ui[BN_NIST_384_TOP*sizeof(BN_ULONG)/sizeof(unsigned int)]; 973 unsigned int ui[BN_NIST_384_TOP *
845 } buf; 974 sizeof(BN_ULONG) / sizeof(unsigned int)];
846 BN_ULONG c_d[BN_NIST_384_TOP], 975 } buf;
847 *res; 976 BN_ULONG c_d[BN_NIST_384_TOP], *res;
848 uintptr_t mask; 977 uintptr_t mask;
849 union { bn_addsub_f f; uintptr_t p; } u; 978 union {
979 bn_addsub_f f;
980 uintptr_t p;
981 } u;
850 static const BIGNUM _bignum_nist_p_384_sqr = { 982 static const BIGNUM _bignum_nist_p_384_sqr = {
851 (BN_ULONG *)_nist_p_384_sqr, 983 (BN_ULONG *)_nist_p_384_sqr,
852 sizeof(_nist_p_384_sqr)/sizeof(_nist_p_384_sqr[0]), 984 sizeof(_nist_p_384_sqr) / sizeof(_nist_p_384_sqr[0]),
853 sizeof(_nist_p_384_sqr)/sizeof(_nist_p_384_sqr[0]), 985 sizeof(_nist_p_384_sqr) / sizeof(_nist_p_384_sqr[0]),
854 0,BN_FLG_STATIC_DATA }; 986 0,
855 987 BN_FLG_STATIC_DATA
988 };
856 989
857 field = &_bignum_nist_p_384; /* just to make sure */ 990 field = &_bignum_nist_p_384; /* just to make sure */
858 991
859 if (BN_is_negative(a) || BN_ucmp(a,&_bignum_nist_p_384_sqr)>=0) 992 if (BN_is_negative(a) || BN_ucmp(a, &_bignum_nist_p_384_sqr) >= 0)
860 return BN_nnmod(r, a, field, ctx); 993 return BN_nnmod(r, a, field, ctx);
861 994
862 i = BN_ucmp(field, a); 995 i = BN_ucmp(field, a);
863 if (i == 0) 996 if (i == 0) {
864 {
865 BN_zero(r); 997 BN_zero(r);
866 return 1; 998 return 1;
867 } 999 } else if (i > 0)
868 else if (i > 0) 1000 return (r == a) ? 1 : (BN_copy(r, a) != NULL);
869 return (r == a)? 1 : (BN_copy(r ,a) != NULL);
870 1001
871 if (r != a) 1002 if (r != a) {
872 {
873 if (!bn_wexpand(r, BN_NIST_384_TOP)) 1003 if (!bn_wexpand(r, BN_NIST_384_TOP))
874 return 0; 1004 return 0;
875 r_d = r->d; 1005 r_d = r->d;
876 nist_cp_bn(r_d, a_d, BN_NIST_384_TOP); 1006 nist_cp_bn(r_d, a_d, BN_NIST_384_TOP);
877 } 1007 } else
878 else
879 r_d = a_d; 1008 r_d = a_d;
880 1009
881 nist_cp_bn_0(buf.bn, a_d + BN_NIST_384_TOP, top - BN_NIST_384_TOP, BN_NIST_384_TOP); 1010 nist_cp_bn_0(buf.bn, a_d + BN_NIST_384_TOP,
1011 top - BN_NIST_384_TOP, BN_NIST_384_TOP);
882 1012
883#if defined(NIST_INT64) 1013#if defined(NIST_INT64)
884 { 1014 {
885 NIST_INT64 acc; /* accumulator */ 1015 NIST_INT64 acc; /* accumulator */
886 unsigned int *rp=(unsigned int *)r_d; 1016 unsigned int *rp = (unsigned int *)r_d;
887 const unsigned int *bp=(const unsigned int *)buf.ui; 1017 const unsigned int *bp = (const unsigned int *)buf.ui;
888 1018
889 acc = rp[0]; acc += bp[12-12]; 1019 acc = rp[0];
890 acc += bp[21-12]; 1020 acc += bp[12 - 12];
891 acc += bp[20-12]; 1021 acc += bp[21 - 12];
892 acc -= bp[23-12]; rp[0] = (unsigned int)acc; acc >>= 32; 1022 acc += bp[20 - 12];
893 1023 acc -= bp[23 - 12];
894 acc += rp[1]; acc += bp[13-12]; 1024 rp[0] = (unsigned int)acc;
895 acc += bp[22-12]; 1025 acc >>= 32;
896 acc += bp[23-12]; 1026
897 acc -= bp[12-12]; 1027 acc += rp[1];
898 acc -= bp[20-12]; rp[1] = (unsigned int)acc; acc >>= 32; 1028 acc += bp[13 - 12];
899 1029 acc += bp[22 - 12];
900 acc += rp[2]; acc += bp[14-12]; 1030 acc += bp[23 - 12];
901 acc += bp[23-12]; 1031 acc -= bp[12 - 12];
902 acc -= bp[13-12]; 1032 acc -= bp[20 - 12];
903 acc -= bp[21-12]; rp[2] = (unsigned int)acc; acc >>= 32; 1033 rp[1] = (unsigned int)acc;
904 1034 acc >>= 32;
905 acc += rp[3]; acc += bp[15-12]; 1035
906 acc += bp[12-12]; 1036 acc += rp[2];
907 acc += bp[20-12]; 1037 acc += bp[14 - 12];
908 acc += bp[21-12]; 1038 acc += bp[23 - 12];
909 acc -= bp[14-12]; 1039 acc -= bp[13 - 12];
910 acc -= bp[22-12]; 1040 acc -= bp[21 - 12];
911 acc -= bp[23-12]; rp[3] = (unsigned int)acc; acc >>= 32; 1041 rp[2] = (unsigned int)acc;
912 1042 acc >>= 32;
913 acc += rp[4]; acc += bp[21-12]; 1043
914 acc += bp[21-12]; 1044 acc += rp[3];
915 acc += bp[16-12]; 1045 acc += bp[15 - 12];
916 acc += bp[13-12]; 1046 acc += bp[12 - 12];
917 acc += bp[12-12]; 1047 acc += bp[20 - 12];
918 acc += bp[20-12]; 1048 acc += bp[21 - 12];
919 acc += bp[22-12]; 1049 acc -= bp[14 - 12];
920 acc -= bp[15-12]; 1050 acc -= bp[22 - 12];
921 acc -= bp[23-12]; 1051 acc -= bp[23 - 12];
922 acc -= bp[23-12]; rp[4] = (unsigned int)acc; acc >>= 32; 1052 rp[3] = (unsigned int)acc;
923 1053 acc >>= 32;
924 acc += rp[5]; acc += bp[22-12]; 1054
925 acc += bp[22-12]; 1055 acc += rp[4];
926 acc += bp[17-12]; 1056 acc += bp[21 - 12];
927 acc += bp[14-12]; 1057 acc += bp[21 - 12];
928 acc += bp[13-12]; 1058 acc += bp[16 - 12];
929 acc += bp[21-12]; 1059 acc += bp[13 - 12];
930 acc += bp[23-12]; 1060 acc += bp[12 - 12];
931 acc -= bp[16-12]; rp[5] = (unsigned int)acc; acc >>= 32; 1061 acc += bp[20 - 12];
932 1062 acc += bp[22 - 12];
933 acc += rp[6]; acc += bp[23-12]; 1063 acc -= bp[15 - 12];
934 acc += bp[23-12]; 1064 acc -= bp[23 - 12];
935 acc += bp[18-12]; 1065 acc -= bp[23 - 12];
936 acc += bp[15-12]; 1066 rp[4] = (unsigned int)acc;
937 acc += bp[14-12]; 1067 acc >>= 32;
938 acc += bp[22-12]; 1068
939 acc -= bp[17-12]; rp[6] = (unsigned int)acc; acc >>= 32; 1069 acc += rp[5];
940 1070 acc += bp[22 - 12];
941 acc += rp[7]; acc += bp[19-12]; 1071 acc += bp[22 - 12];
942 acc += bp[16-12]; 1072 acc += bp[17 - 12];
943 acc += bp[15-12]; 1073 acc += bp[14 - 12];
944 acc += bp[23-12]; 1074 acc += bp[13 - 12];
945 acc -= bp[18-12]; rp[7] = (unsigned int)acc; acc >>= 32; 1075 acc += bp[21 - 12];
946 1076 acc += bp[23 - 12];
947 acc += rp[8]; acc += bp[20-12]; 1077 acc -= bp[16 - 12];
948 acc += bp[17-12]; 1078 rp[5] = (unsigned int)acc;
949 acc += bp[16-12]; 1079 acc >>= 32;
950 acc -= bp[19-12]; rp[8] = (unsigned int)acc; acc >>= 32; 1080
951 1081 acc += rp[6];
952 acc += rp[9]; acc += bp[21-12]; 1082 acc += bp[23 - 12];
953 acc += bp[18-12]; 1083 acc += bp[23 - 12];
954 acc += bp[17-12]; 1084 acc += bp[18 - 12];
955 acc -= bp[20-12]; rp[9] = (unsigned int)acc; acc >>= 32; 1085 acc += bp[15 - 12];
956 1086 acc += bp[14 - 12];
957 acc += rp[10]; acc += bp[22-12]; 1087 acc += bp[22 - 12];
958 acc += bp[19-12]; 1088 acc -= bp[17 - 12];
959 acc += bp[18-12]; 1089 rp[6] = (unsigned int)acc;
960 acc -= bp[21-12]; rp[10] = (unsigned int)acc; acc >>= 32; 1090 acc >>= 32;
961 1091
962 acc += rp[11]; acc += bp[23-12]; 1092 acc += rp[7];
963 acc += bp[20-12]; 1093 acc += bp[19 - 12];
964 acc += bp[19-12]; 1094 acc += bp[16 - 12];
965 acc -= bp[22-12]; rp[11] = (unsigned int)acc; 1095 acc += bp[15 - 12];
966 1096 acc += bp[23 - 12];
967 carry = (int)(acc>>32); 1097 acc -= bp[18 - 12];
1098 rp[7] = (unsigned int)acc;
1099 acc >>= 32;
1100
1101 acc += rp[8];
1102 acc += bp[20 - 12];
1103 acc += bp[17 - 12];
1104 acc += bp[16 - 12];
1105 acc -= bp[19 - 12];
1106 rp[8] = (unsigned int)acc;
1107 acc >>= 32;
1108
1109 acc += rp[9];
1110 acc += bp[21 - 12];
1111 acc += bp[18 - 12];
1112 acc += bp[17 - 12];
1113 acc -= bp[20 - 12];
1114 rp[9] = (unsigned int)acc;
1115 acc >>= 32;
1116
1117 acc += rp[10];
1118 acc += bp[22 - 12];
1119 acc += bp[19 - 12];
1120 acc += bp[18 - 12];
1121 acc -= bp[21 - 12];
1122 rp[10] = (unsigned int)acc;
1123 acc >>= 32;
1124
1125 acc += rp[11];
1126 acc += bp[23 - 12];
1127 acc += bp[20 - 12];
1128 acc += bp[19 - 12];
1129 acc -= bp[22 - 12];
1130 rp[11] = (unsigned int)acc;
1131
1132 carry = (int)(acc >> 32);
968 } 1133 }
969#else 1134#else
970 { 1135 {
971 BN_ULONG t_d[BN_NIST_384_TOP]; 1136 BN_ULONG t_d[BN_NIST_384_TOP];
972 1137
973 /*S1*/ 1138 /*S1*/
974 nist_set_256(t_d, buf.bn, 0, 0, 0, 0, 0, 23-4, 22-4, 21-4); 1139 nist_set_256(t_d, buf.bn, 0, 0, 0, 0, 0, 23 - 4, 22 - 4,
1140 21 - 4);
975 /* left shift */ 1141 /* left shift */
976 { 1142 {
977 register BN_ULONG *ap,t,c; 1143 register BN_ULONG *ap, t, c;
978 ap = t_d; 1144 ap = t_d;
979 c=0; 1145 c = 0;
980 for (i = 3; i != 0; --i) 1146 for (i = 3; i != 0; --i) {
981 { 1147 t= *ap;
982 t= *ap; 1148 *(ap++) = ((t << 1)|c) & BN_MASK2;
983 *(ap++)=((t<<1)|c)&BN_MASK2; 1149 c = (t & BN_TBIT) ? 1 : 0;
984 c=(t & BN_TBIT)?1:0;
985 } 1150 }
986 *ap=c; 1151 *ap = c;
987 } 1152 }
988 carry = (int)bn_add_words(r_d+(128/BN_BITS2), r_d+(128/BN_BITS2), 1153 carry = (int)bn_add_words(r_d + (128 / BN_BITS2),
989 t_d, BN_NIST_256_TOP); 1154 r_d + (128 / BN_BITS2), t_d, BN_NIST_256_TOP);
990 /*S2 */ 1155 /*S2 */
991 carry += (int)bn_add_words(r_d, r_d, buf.bn, BN_NIST_384_TOP); 1156 carry += (int)bn_add_words(r_d, r_d, buf.bn, BN_NIST_384_TOP);
992 /*S3*/ 1157 /*S3*/
993 nist_set_384(t_d,buf.bn,20,19,18,17,16,15,14,13,12,23,22,21); 1158 nist_set_384(t_d, buf.bn, 20, 19, 18, 17, 16, 15, 14, 13, 12,
994 carry += (int)bn_add_words(r_d, r_d, t_d, BN_NIST_384_TOP); 1159 23, 22, 21);
995 /*S4*/ 1160 carry += (int)bn_add_words(r_d, r_d, t_d, BN_NIST_384_TOP);
996 nist_set_384(t_d,buf.bn,19,18,17,16,15,14,13,12,20,0,23,0); 1161 /*S4*/
997 carry += (int)bn_add_words(r_d, r_d, t_d, BN_NIST_384_TOP); 1162 nist_set_384(t_d, buf.bn, 19, 18, 17, 16, 15, 14, 13, 12, 20,
998 /*S5*/ 1163 0, 23, 0);
999 nist_set_384(t_d, buf.bn,0,0,0,0,23,22,21,20,0,0,0,0); 1164 carry += (int)bn_add_words(r_d, r_d, t_d, BN_NIST_384_TOP);
1000 carry += (int)bn_add_words(r_d, r_d, t_d, BN_NIST_384_TOP); 1165 /*S5*/
1001 /*S6*/ 1166 nist_set_384(t_d, buf.bn, 0,0, 0,0, 23, 22, 21, 20, 0,0, 0, 0);
1002 nist_set_384(t_d,buf.bn,0,0,0,0,0,0,23,22,21,0,0,20); 1167 carry += (int)bn_add_words(r_d, r_d, t_d, BN_NIST_384_TOP);
1003 carry += (int)bn_add_words(r_d, r_d, t_d, BN_NIST_384_TOP); 1168 /*S6*/
1004 /*D1*/ 1169 nist_set_384(t_d, buf.bn, 0,0, 0,0, 0,0, 23, 22, 21, 0,0, 20);
1005 nist_set_384(t_d,buf.bn,22,21,20,19,18,17,16,15,14,13,12,23); 1170 carry += (int)bn_add_words(r_d, r_d, t_d, BN_NIST_384_TOP);
1006 carry -= (int)bn_sub_words(r_d, r_d, t_d, BN_NIST_384_TOP); 1171 /*D1*/
1007 /*D2*/ 1172 nist_set_384(t_d, buf.bn, 22, 21, 20, 19, 18, 17, 16, 15, 14,
1008 nist_set_384(t_d,buf.bn,0,0,0,0,0,0,0,23,22,21,20,0); 1173 13, 12, 23);
1009 carry -= (int)bn_sub_words(r_d, r_d, t_d, BN_NIST_384_TOP); 1174 carry -= (int)bn_sub_words(r_d, r_d, t_d, BN_NIST_384_TOP);
1010 /*D3*/ 1175 /*D2*/
1011 nist_set_384(t_d,buf.bn,0,0,0,0,0,0,0,23,23,0,0,0); 1176 nist_set_384(t_d, buf.bn, 0,0, 0,0, 0,0, 0,23, 22, 21, 20, 0);
1012 carry -= (int)bn_sub_words(r_d, r_d, t_d, BN_NIST_384_TOP); 1177 carry -= (int)bn_sub_words(r_d, r_d, t_d, BN_NIST_384_TOP);
1178 /*D3*/
1179 nist_set_384(t_d, buf.bn, 0,0, 0,0, 0,0, 0,23, 23, 0,0, 0);
1180 carry -= (int)bn_sub_words(r_d, r_d, t_d, BN_NIST_384_TOP);
1013 1181
1014 } 1182 }
1015#endif 1183#endif
1016 /* see BN_nist_mod_224 for explanation */ 1184 /* see BN_nist_mod_224 for explanation */
1017 u.f = bn_sub_words; 1185 u.f = bn_sub_words;
1018 if (carry > 0) 1186 if (carry > 0)
1019 carry = (int)bn_sub_words(r_d,r_d,_nist_p_384[carry-1],BN_NIST_384_TOP); 1187 carry = (int)bn_sub_words(r_d, r_d, _nist_p_384[carry - 1],
1020 else if (carry < 0) 1188 BN_NIST_384_TOP);
1021 { 1189 else if (carry < 0) {
1022 carry = (int)bn_add_words(r_d,r_d,_nist_p_384[-carry-1],BN_NIST_384_TOP); 1190 carry = (int)bn_add_words(r_d, r_d, _nist_p_384[-carry - 1],
1023 mask = 0-(uintptr_t)carry; 1191 BN_NIST_384_TOP);
1024 u.p = ((uintptr_t)bn_sub_words&mask) | 1192 mask = 0 - (uintptr_t)carry;
1025 ((uintptr_t)bn_add_words&~mask); 1193 u.p = ((uintptr_t)bn_sub_words & mask) |
1026 } 1194 ((uintptr_t)bn_add_words & ~mask);
1027 else 1195 } else
1028 carry = 1; 1196 carry = 1;
1029 1197
1030 mask = 0-(uintptr_t)(*u.f)(c_d,r_d,_nist_p_384[0],BN_NIST_384_TOP); 1198 mask = 0 - (uintptr_t)(*u.f)(c_d, r_d, _nist_p_384[0], BN_NIST_384_TOP);
1031 mask &= 0-(uintptr_t)carry; 1199 mask &= 0 - (uintptr_t)carry;
1032 res = c_d; 1200 res = c_d;
1033 res = (BN_ULONG *)(((uintptr_t)res&~mask) | ((uintptr_t)r_d&mask)); 1201 res = (BN_ULONG *)(((uintptr_t)res & ~mask) | ((uintptr_t)r_d & mask));
1034 nist_cp_bn(r_d, res, BN_NIST_384_TOP); 1202 nist_cp_bn(r_d, res, BN_NIST_384_TOP);
1035 r->top = BN_NIST_384_TOP; 1203 r->top = BN_NIST_384_TOP;
1036 bn_correct_top(r); 1204 bn_correct_top(r);
1037 1205
1038 return 1; 1206 return 1;
1039 } 1207}
1040 1208
1041#define BN_NIST_521_RSHIFT (521%BN_BITS2) 1209#define BN_NIST_521_RSHIFT (521%BN_BITS2)
1042#define BN_NIST_521_LSHIFT (BN_BITS2-BN_NIST_521_RSHIFT) 1210#define BN_NIST_521_LSHIFT (BN_BITS2-BN_NIST_521_RSHIFT)
1043#define BN_NIST_521_TOP_MASK ((BN_ULONG)BN_MASK2>>BN_NIST_521_LSHIFT) 1211#define BN_NIST_521_TOP_MASK ((BN_ULONG)BN_MASK2>>BN_NIST_521_LSHIFT)
1044 1212
1045int BN_nist_mod_521(BIGNUM *r, const BIGNUM *a, const BIGNUM *field, 1213int
1046 BN_CTX *ctx) 1214BN_nist_mod_521(BIGNUM *r, const BIGNUM *a, const BIGNUM *field, BN_CTX *ctx)
1047 { 1215{
1048 int top = a->top, i; 1216 int top = a->top, i;
1049 BN_ULONG *r_d, *a_d = a->d, 1217 BN_ULONG *r_d, *a_d = a->d, t_d[BN_NIST_521_TOP], val, tmp, *res;
1050 t_d[BN_NIST_521_TOP],
1051 val,tmp,*res;
1052 uintptr_t mask; 1218 uintptr_t mask;
1053 static const BIGNUM _bignum_nist_p_521_sqr = { 1219 static const BIGNUM _bignum_nist_p_521_sqr = {
1054 (BN_ULONG *)_nist_p_521_sqr, 1220 (BN_ULONG *)_nist_p_521_sqr,
1055 sizeof(_nist_p_521_sqr)/sizeof(_nist_p_521_sqr[0]), 1221 sizeof(_nist_p_521_sqr) / sizeof(_nist_p_521_sqr[0]),
1056 sizeof(_nist_p_521_sqr)/sizeof(_nist_p_521_sqr[0]), 1222 sizeof(_nist_p_521_sqr) / sizeof(_nist_p_521_sqr[0]),
1057 0,BN_FLG_STATIC_DATA }; 1223 0,
1224 BN_FLG_STATIC_DATA
1225 };
1058 1226
1059 field = &_bignum_nist_p_521; /* just to make sure */ 1227 field = &_bignum_nist_p_521; /* just to make sure */
1060 1228
1061 if (BN_is_negative(a) || BN_ucmp(a,&_bignum_nist_p_521_sqr)>=0) 1229 if (BN_is_negative(a) || BN_ucmp(a, &_bignum_nist_p_521_sqr) >= 0)
1062 return BN_nnmod(r, a, field, ctx); 1230 return BN_nnmod(r, a, field, ctx);
1063 1231
1064 i = BN_ucmp(field, a); 1232 i = BN_ucmp(field, a);
1065 if (i == 0) 1233 if (i == 0) {
1066 {
1067 BN_zero(r); 1234 BN_zero(r);
1068 return 1; 1235 return 1;
1069 } 1236 } else if (i > 0)
1070 else if (i > 0) 1237 return (r == a) ? 1 : (BN_copy(r, a) != NULL);
1071 return (r == a)? 1 : (BN_copy(r ,a) != NULL);
1072 1238
1073 if (r != a) 1239 if (r != a) {
1074 { 1240 if (!bn_wexpand(r, BN_NIST_521_TOP))
1075 if (!bn_wexpand(r,BN_NIST_521_TOP))
1076 return 0; 1241 return 0;
1077 r_d = r->d; 1242 r_d = r->d;
1078 nist_cp_bn(r_d,a_d, BN_NIST_521_TOP); 1243 nist_cp_bn(r_d, a_d, BN_NIST_521_TOP);
1079 } 1244 } else
1080 else
1081 r_d = a_d; 1245 r_d = a_d;
1082 1246
1083 /* upper 521 bits, copy ... */ 1247 /* upper 521 bits, copy ... */
1084 nist_cp_bn_0(t_d,a_d + (BN_NIST_521_TOP-1), top - (BN_NIST_521_TOP-1),BN_NIST_521_TOP); 1248 nist_cp_bn_0(t_d, a_d + (BN_NIST_521_TOP - 1),
1249 top - (BN_NIST_521_TOP - 1), BN_NIST_521_TOP);
1085 /* ... and right shift */ 1250 /* ... and right shift */
1086 for (val=t_d[0],i=0; i<BN_NIST_521_TOP-1; i++) 1251 for (val = t_d[0], i = 0; i < BN_NIST_521_TOP - 1; i++) {
1087 { 1252 tmp = val >> BN_NIST_521_RSHIFT;
1088 tmp = val>>BN_NIST_521_RSHIFT; 1253 val = t_d[i + 1];
1089 val = t_d[i+1]; 1254 t_d[i] = (tmp | val << BN_NIST_521_LSHIFT) & BN_MASK2;
1090 t_d[i] = (tmp | val<<BN_NIST_521_LSHIFT) & BN_MASK2; 1255 }
1091 } 1256 t_d[i] = val >> BN_NIST_521_RSHIFT;
1092 t_d[i] = val>>BN_NIST_521_RSHIFT;
1093 /* lower 521 bits */ 1257 /* lower 521 bits */
1094 r_d[i] &= BN_NIST_521_TOP_MASK; 1258 r_d[i] &= BN_NIST_521_TOP_MASK;
1095 1259
1096 bn_add_words(r_d,r_d,t_d,BN_NIST_521_TOP); 1260 bn_add_words(r_d, r_d, t_d, BN_NIST_521_TOP);
1097 mask = 0-(uintptr_t)bn_sub_words(t_d,r_d,_nist_p_521,BN_NIST_521_TOP); 1261 mask = 0 - (uintptr_t)bn_sub_words(t_d, r_d, _nist_p_521,
1098 res = t_d; 1262 BN_NIST_521_TOP);
1099 res = (BN_ULONG *)(((uintptr_t)res&~mask) | ((uintptr_t)r_d&mask)); 1263 res = t_d;
1100 nist_cp_bn(r_d,res,BN_NIST_521_TOP); 1264 res = (BN_ULONG *)(((uintptr_t)res & ~mask) | ((uintptr_t)r_d & mask));
1265 nist_cp_bn(r_d, res, BN_NIST_521_TOP);
1101 r->top = BN_NIST_521_TOP; 1266 r->top = BN_NIST_521_TOP;
1102 bn_correct_top(r); 1267 bn_correct_top(r);
1103 1268
1104 return 1; 1269 return 1;
1105 } 1270}
diff --git a/src/lib/libssl/src/crypto/bn/bn_nist.c b/src/lib/libssl/src/crypto/bn/bn_nist.c
index d793644e27..d44e709c83 100644
--- a/src/lib/libssl/src/crypto/bn/bn_nist.c
+++ b/src/lib/libssl/src/crypto/bn/bn_nist.c
@@ -10,7 +10,7 @@
10 * are met: 10 * are met:
11 * 11 *
12 * 1. Redistributions of source code must retain the above copyright 12 * 1. Redistributions of source code must retain the above copyright
13 * notice, this list of conditions and the following disclaimer. 13 * notice, this list of conditions and the following disclaimer.
14 * 14 *
15 * 2. Redistributions in binary form must reproduce the above copyright 15 * 2. Redistributions in binary form must reproduce the above copyright
16 * notice, this list of conditions and the following disclaimer in 16 * notice, this list of conditions and the following disclaimer in
@@ -71,225 +71,292 @@
71/* pre-computed tables are "carry-less" values of modulus*(i+1) */ 71/* pre-computed tables are "carry-less" values of modulus*(i+1) */
72#if BN_BITS2 == 64 72#if BN_BITS2 == 64
73static const BN_ULONG _nist_p_192[][BN_NIST_192_TOP] = { 73static const BN_ULONG _nist_p_192[][BN_NIST_192_TOP] = {
74 {0xFFFFFFFFFFFFFFFFULL,0xFFFFFFFFFFFFFFFEULL,0xFFFFFFFFFFFFFFFFULL}, 74 {0xFFFFFFFFFFFFFFFFULL, 0xFFFFFFFFFFFFFFFEULL, 0xFFFFFFFFFFFFFFFFULL},
75 {0xFFFFFFFFFFFFFFFEULL,0xFFFFFFFFFFFFFFFDULL,0xFFFFFFFFFFFFFFFFULL}, 75 {0xFFFFFFFFFFFFFFFEULL, 0xFFFFFFFFFFFFFFFDULL, 0xFFFFFFFFFFFFFFFFULL},
76 {0xFFFFFFFFFFFFFFFDULL,0xFFFFFFFFFFFFFFFCULL,0xFFFFFFFFFFFFFFFFULL} 76 {0xFFFFFFFFFFFFFFFDULL, 0xFFFFFFFFFFFFFFFCULL, 0xFFFFFFFFFFFFFFFFULL}
77 }; 77};
78static const BN_ULONG _nist_p_192_sqr[] = { 78static const BN_ULONG _nist_p_192_sqr[] = {
79 0x0000000000000001ULL,0x0000000000000002ULL,0x0000000000000001ULL, 79 0x0000000000000001ULL, 0x0000000000000002ULL, 0x0000000000000001ULL,
80 0xFFFFFFFFFFFFFFFEULL,0xFFFFFFFFFFFFFFFDULL,0xFFFFFFFFFFFFFFFFULL 80 0xFFFFFFFFFFFFFFFEULL, 0xFFFFFFFFFFFFFFFDULL, 0xFFFFFFFFFFFFFFFFULL
81 }; 81};
82static const BN_ULONG _nist_p_224[][BN_NIST_224_TOP] = { 82static const BN_ULONG _nist_p_224[][BN_NIST_224_TOP] = {
83 {0x0000000000000001ULL,0xFFFFFFFF00000000ULL, 83 {
84 0xFFFFFFFFFFFFFFFFULL,0x00000000FFFFFFFFULL}, 84 0x0000000000000001ULL, 0xFFFFFFFF00000000ULL,
85 {0x0000000000000002ULL,0xFFFFFFFE00000000ULL, 85 0xFFFFFFFFFFFFFFFFULL, 0x00000000FFFFFFFFULL
86 0xFFFFFFFFFFFFFFFFULL,0x00000001FFFFFFFFULL} /* this one is "carry-full" */ 86 },
87 }; 87 {
88 0x0000000000000002ULL, 0xFFFFFFFE00000000ULL,
89 0xFFFFFFFFFFFFFFFFULL, 0x00000001FFFFFFFFULL
90 } /* this one is "carry-full" */
91};
88static const BN_ULONG _nist_p_224_sqr[] = { 92static const BN_ULONG _nist_p_224_sqr[] = {
89 0x0000000000000001ULL,0xFFFFFFFE00000000ULL, 93 0x0000000000000001ULL, 0xFFFFFFFE00000000ULL,
90 0xFFFFFFFFFFFFFFFFULL,0x0000000200000000ULL, 94 0xFFFFFFFFFFFFFFFFULL, 0x0000000200000000ULL,
91 0x0000000000000000ULL,0xFFFFFFFFFFFFFFFEULL, 95 0x0000000000000000ULL, 0xFFFFFFFFFFFFFFFEULL,
92 0xFFFFFFFFFFFFFFFFULL 96 0xFFFFFFFFFFFFFFFFULL
93 }; 97};
94static const BN_ULONG _nist_p_256[][BN_NIST_256_TOP] = { 98static const BN_ULONG _nist_p_256[][BN_NIST_256_TOP] = {
95 {0xFFFFFFFFFFFFFFFFULL,0x00000000FFFFFFFFULL, 99 {
96 0x0000000000000000ULL,0xFFFFFFFF00000001ULL}, 100 0xFFFFFFFFFFFFFFFFULL, 0x00000000FFFFFFFFULL,
97 {0xFFFFFFFFFFFFFFFEULL,0x00000001FFFFFFFFULL, 101 0x0000000000000000ULL, 0xFFFFFFFF00000001ULL
98 0x0000000000000000ULL,0xFFFFFFFE00000002ULL}, 102 },
99 {0xFFFFFFFFFFFFFFFDULL,0x00000002FFFFFFFFULL, 103 {
100 0x0000000000000000ULL,0xFFFFFFFD00000003ULL}, 104 0xFFFFFFFFFFFFFFFEULL, 0x00000001FFFFFFFFULL,
101 {0xFFFFFFFFFFFFFFFCULL,0x00000003FFFFFFFFULL, 105 0x0000000000000000ULL, 0xFFFFFFFE00000002ULL
102 0x0000000000000000ULL,0xFFFFFFFC00000004ULL}, 106 },
103 {0xFFFFFFFFFFFFFFFBULL,0x00000004FFFFFFFFULL, 107 {
104 0x0000000000000000ULL,0xFFFFFFFB00000005ULL}, 108 0xFFFFFFFFFFFFFFFDULL, 0x00000002FFFFFFFFULL,
105 }; 109 0x0000000000000000ULL, 0xFFFFFFFD00000003ULL
110 },
111 {
112 0xFFFFFFFFFFFFFFFCULL, 0x00000003FFFFFFFFULL,
113 0x0000000000000000ULL, 0xFFFFFFFC00000004ULL
114 },
115 {
116 0xFFFFFFFFFFFFFFFBULL, 0x00000004FFFFFFFFULL,
117 0x0000000000000000ULL, 0xFFFFFFFB00000005ULL
118 },
119};
106static const BN_ULONG _nist_p_256_sqr[] = { 120static const BN_ULONG _nist_p_256_sqr[] = {
107 0x0000000000000001ULL,0xFFFFFFFE00000000ULL, 121 0x0000000000000001ULL, 0xFFFFFFFE00000000ULL,
108 0xFFFFFFFFFFFFFFFFULL,0x00000001FFFFFFFEULL, 122 0xFFFFFFFFFFFFFFFFULL, 0x00000001FFFFFFFEULL,
109 0x00000001FFFFFFFEULL,0x00000001FFFFFFFEULL, 123 0x00000001FFFFFFFEULL, 0x00000001FFFFFFFEULL,
110 0xFFFFFFFE00000001ULL,0xFFFFFFFE00000002ULL 124 0xFFFFFFFE00000001ULL, 0xFFFFFFFE00000002ULL
111 }; 125};
112static const BN_ULONG _nist_p_384[][BN_NIST_384_TOP] = { 126static const BN_ULONG _nist_p_384[][BN_NIST_384_TOP] = {
113 {0x00000000FFFFFFFFULL,0xFFFFFFFF00000000ULL,0xFFFFFFFFFFFFFFFEULL, 127 {
114 0xFFFFFFFFFFFFFFFFULL,0xFFFFFFFFFFFFFFFFULL,0xFFFFFFFFFFFFFFFFULL}, 128 0x00000000FFFFFFFFULL, 0xFFFFFFFF00000000ULL,
115 {0x00000001FFFFFFFEULL,0xFFFFFFFE00000000ULL,0xFFFFFFFFFFFFFFFDULL, 129 0xFFFFFFFFFFFFFFFEULL, 0xFFFFFFFFFFFFFFFFULL,
116 0xFFFFFFFFFFFFFFFFULL,0xFFFFFFFFFFFFFFFFULL,0xFFFFFFFFFFFFFFFFULL}, 130 0xFFFFFFFFFFFFFFFFULL, 0xFFFFFFFFFFFFFFFFULL
117 {0x00000002FFFFFFFDULL,0xFFFFFFFD00000000ULL,0xFFFFFFFFFFFFFFFCULL, 131 },
118 0xFFFFFFFFFFFFFFFFULL,0xFFFFFFFFFFFFFFFFULL,0xFFFFFFFFFFFFFFFFULL}, 132 {
119 {0x00000003FFFFFFFCULL,0xFFFFFFFC00000000ULL,0xFFFFFFFFFFFFFFFBULL, 133 0x00000001FFFFFFFEULL, 0xFFFFFFFE00000000ULL,
120 0xFFFFFFFFFFFFFFFFULL,0xFFFFFFFFFFFFFFFFULL,0xFFFFFFFFFFFFFFFFULL}, 134 0xFFFFFFFFFFFFFFFDULL, 0xFFFFFFFFFFFFFFFFULL,
121 {0x00000004FFFFFFFBULL,0xFFFFFFFB00000000ULL,0xFFFFFFFFFFFFFFFAULL, 135 0xFFFFFFFFFFFFFFFFULL, 0xFFFFFFFFFFFFFFFFULL
122 0xFFFFFFFFFFFFFFFFULL,0xFFFFFFFFFFFFFFFFULL,0xFFFFFFFFFFFFFFFFULL}, 136 },
123 }; 137 {
138 0x00000002FFFFFFFDULL, 0xFFFFFFFD00000000ULL,
139 0xFFFFFFFFFFFFFFFCULL, 0xFFFFFFFFFFFFFFFFULL,
140 0xFFFFFFFFFFFFFFFFULL, 0xFFFFFFFFFFFFFFFFULL
141 },
142 {
143 0x00000003FFFFFFFCULL, 0xFFFFFFFC00000000ULL,
144 0xFFFFFFFFFFFFFFFBULL, 0xFFFFFFFFFFFFFFFFULL,
145 0xFFFFFFFFFFFFFFFFULL, 0xFFFFFFFFFFFFFFFFULL
146 },
147 {
148 0x00000004FFFFFFFBULL, 0xFFFFFFFB00000000ULL,
149 0xFFFFFFFFFFFFFFFAULL, 0xFFFFFFFFFFFFFFFFULL,
150 0xFFFFFFFFFFFFFFFFULL, 0xFFFFFFFFFFFFFFFFULL
151 },
152};
124static const BN_ULONG _nist_p_384_sqr[] = { 153static const BN_ULONG _nist_p_384_sqr[] = {
125 0xFFFFFFFE00000001ULL,0x0000000200000000ULL,0xFFFFFFFE00000000ULL, 154 0xFFFFFFFE00000001ULL, 0x0000000200000000ULL, 0xFFFFFFFE00000000ULL,
126 0x0000000200000000ULL,0x0000000000000001ULL,0x0000000000000000ULL, 155 0x0000000200000000ULL, 0x0000000000000001ULL, 0x0000000000000000ULL,
127 0x00000001FFFFFFFEULL,0xFFFFFFFE00000000ULL,0xFFFFFFFFFFFFFFFDULL, 156 0x00000001FFFFFFFEULL, 0xFFFFFFFE00000000ULL, 0xFFFFFFFFFFFFFFFDULL,
128 0xFFFFFFFFFFFFFFFFULL,0xFFFFFFFFFFFFFFFFULL,0xFFFFFFFFFFFFFFFFULL 157 0xFFFFFFFFFFFFFFFFULL, 0xFFFFFFFFFFFFFFFFULL, 0xFFFFFFFFFFFFFFFFULL
129 }; 158};
130static const BN_ULONG _nist_p_521[] = 159static const BN_ULONG _nist_p_521[] = {
131 {0xFFFFFFFFFFFFFFFFULL,0xFFFFFFFFFFFFFFFFULL, 160 0xFFFFFFFFFFFFFFFFULL, 0xFFFFFFFFFFFFFFFFULL, 0xFFFFFFFFFFFFFFFFULL,
132 0xFFFFFFFFFFFFFFFFULL,0xFFFFFFFFFFFFFFFFULL, 161 0xFFFFFFFFFFFFFFFFULL, 0xFFFFFFFFFFFFFFFFULL, 0xFFFFFFFFFFFFFFFFULL,
133 0xFFFFFFFFFFFFFFFFULL,0xFFFFFFFFFFFFFFFFULL, 162 0xFFFFFFFFFFFFFFFFULL, 0xFFFFFFFFFFFFFFFFULL, 0x00000000000001FFULL
134 0xFFFFFFFFFFFFFFFFULL,0xFFFFFFFFFFFFFFFFULL, 163};
135 0x00000000000001FFULL};
136static const BN_ULONG _nist_p_521_sqr[] = { 164static const BN_ULONG _nist_p_521_sqr[] = {
137 0x0000000000000001ULL,0x0000000000000000ULL,0x0000000000000000ULL, 165 0x0000000000000001ULL, 0x0000000000000000ULL, 0x0000000000000000ULL,
138 0x0000000000000000ULL,0x0000000000000000ULL,0x0000000000000000ULL, 166 0x0000000000000000ULL, 0x0000000000000000ULL, 0x0000000000000000ULL,
139 0x0000000000000000ULL,0x0000000000000000ULL,0xFFFFFFFFFFFFFC00ULL, 167 0x0000000000000000ULL, 0x0000000000000000ULL, 0xFFFFFFFFFFFFFC00ULL,
140 0xFFFFFFFFFFFFFFFFULL,0xFFFFFFFFFFFFFFFFULL,0xFFFFFFFFFFFFFFFFULL, 168 0xFFFFFFFFFFFFFFFFULL, 0xFFFFFFFFFFFFFFFFULL, 0xFFFFFFFFFFFFFFFFULL,
141 0xFFFFFFFFFFFFFFFFULL,0xFFFFFFFFFFFFFFFFULL,0xFFFFFFFFFFFFFFFFULL, 169 0xFFFFFFFFFFFFFFFFULL, 0xFFFFFFFFFFFFFFFFULL, 0xFFFFFFFFFFFFFFFFULL,
142 0xFFFFFFFFFFFFFFFFULL,0x000000000003FFFFULL 170 0xFFFFFFFFFFFFFFFFULL, 0x000000000003FFFFULL
143 }; 171};
144#elif BN_BITS2 == 32 172#elif BN_BITS2 == 32
145static const BN_ULONG _nist_p_192[][BN_NIST_192_TOP] = { 173static const BN_ULONG _nist_p_192[][BN_NIST_192_TOP] = {
146 {0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFE,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF}, 174 {
147 {0xFFFFFFFE,0xFFFFFFFF,0xFFFFFFFD,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF}, 175 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFE, 0xFFFFFFFF,
148 {0xFFFFFFFD,0xFFFFFFFF,0xFFFFFFFC,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF} 176 0xFFFFFFFF, 0xFFFFFFFF
149 }; 177 },
178 {
179 0xFFFFFFFE, 0xFFFFFFFF, 0xFFFFFFFD, 0xFFFFFFFF,
180 0xFFFFFFFF, 0xFFFFFFFF
181 },
182 {
183 0xFFFFFFFD, 0xFFFFFFFF, 0xFFFFFFFC, 0xFFFFFFFF,
184 0xFFFFFFFF, 0xFFFFFFFF
185 }
186};
150static const BN_ULONG _nist_p_192_sqr[] = { 187static const BN_ULONG _nist_p_192_sqr[] = {
151 0x00000001,0x00000000,0x00000002,0x00000000,0x00000001,0x00000000, 188 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000,
152 0xFFFFFFFE,0xFFFFFFFF,0xFFFFFFFD,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF 189 0xFFFFFFFE, 0xFFFFFFFF, 0xFFFFFFFD, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF
153 }; 190};
154static const BN_ULONG _nist_p_224[][BN_NIST_224_TOP] = { 191static const BN_ULONG _nist_p_224[][BN_NIST_224_TOP] = {
155 {0x00000001,0x00000000,0x00000000,0xFFFFFFFF, 192 {
156 0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF}, 193 0x00000001, 0x00000000, 0x00000000, 0xFFFFFFFF,
157 {0x00000002,0x00000000,0x00000000,0xFFFFFFFE, 194 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF
158 0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF} 195 },
159 }; 196 {
197 0x00000002, 0x00000000, 0x00000000, 0xFFFFFFFE,
198 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF
199 }
200};
160static const BN_ULONG _nist_p_224_sqr[] = { 201static const BN_ULONG _nist_p_224_sqr[] = {
161 0x00000001,0x00000000,0x00000000,0xFFFFFFFE, 202 0x00000001, 0x00000000, 0x00000000, 0xFFFFFFFE,
162 0xFFFFFFFF,0xFFFFFFFF,0x00000000,0x00000002, 203 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x00000002,
163 0x00000000,0x00000000,0xFFFFFFFE,0xFFFFFFFF, 204 0x00000000, 0x00000000, 0xFFFFFFFE, 0xFFFFFFFF,
164 0xFFFFFFFF,0xFFFFFFFF 205 0xFFFFFFFF, 0xFFFFFFFF
165 }; 206};
166static const BN_ULONG _nist_p_256[][BN_NIST_256_TOP] = { 207static const BN_ULONG _nist_p_256[][BN_NIST_256_TOP] = {
167 {0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0x00000000, 208 {
168 0x00000000,0x00000000,0x00000001,0xFFFFFFFF}, 209 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000,
169 {0xFFFFFFFE,0xFFFFFFFF,0xFFFFFFFF,0x00000001, 210 0x00000000, 0x00000000, 0x00000001, 0xFFFFFFFF
170 0x00000000,0x00000000,0x00000002,0xFFFFFFFE}, 211 },
171 {0xFFFFFFFD,0xFFFFFFFF,0xFFFFFFFF,0x00000002, 212 {
172 0x00000000,0x00000000,0x00000003,0xFFFFFFFD}, 213 0xFFFFFFFE, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000001,
173 {0xFFFFFFFC,0xFFFFFFFF,0xFFFFFFFF,0x00000003, 214 0x00000000, 0x00000000, 0x00000002, 0xFFFFFFFE
174 0x00000000,0x00000000,0x00000004,0xFFFFFFFC}, 215 },
175 {0xFFFFFFFB,0xFFFFFFFF,0xFFFFFFFF,0x00000004, 216 {
176 0x00000000,0x00000000,0x00000005,0xFFFFFFFB}, 217 0xFFFFFFFD, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000002,
177 }; 218 0x00000000, 0x00000000, 0x00000003, 0xFFFFFFFD
219 },
220 {
221 0xFFFFFFFC, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000003,
222 0x00000000, 0x00000000, 0x00000004, 0xFFFFFFFC
223 },
224 {
225 0xFFFFFFFB, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000004,
226 0x00000000, 0x00000000, 0x00000005, 0xFFFFFFFB
227 },
228};
178static const BN_ULONG _nist_p_256_sqr[] = { 229static const BN_ULONG _nist_p_256_sqr[] = {
179 0x00000001,0x00000000,0x00000000,0xFFFFFFFE, 230 0x00000001, 0x00000000, 0x00000000, 0xFFFFFFFE,
180 0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFE,0x00000001, 231 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFE, 0x00000001,
181 0xFFFFFFFE,0x00000001,0xFFFFFFFE,0x00000001, 232 0xFFFFFFFE, 0x00000001, 0xFFFFFFFE, 0x00000001,
182 0x00000001,0xFFFFFFFE,0x00000002,0xFFFFFFFE 233 0x00000001, 0xFFFFFFFE, 0x00000002, 0xFFFFFFFE
183 }; 234};
184static const BN_ULONG _nist_p_384[][BN_NIST_384_TOP] = { 235static const BN_ULONG _nist_p_384[][BN_NIST_384_TOP] = {
185 {0xFFFFFFFF,0x00000000,0x00000000,0xFFFFFFFF,0xFFFFFFFE,0xFFFFFFFF, 236 {
186 0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF}, 237 0xFFFFFFFF, 0x00000000, 0x00000000, 0xFFFFFFFF,
187 {0xFFFFFFFE,0x00000001,0x00000000,0xFFFFFFFE,0xFFFFFFFD,0xFFFFFFFF, 238 0xFFFFFFFE, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
188 0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF}, 239 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF
189 {0xFFFFFFFD,0x00000002,0x00000000,0xFFFFFFFD,0xFFFFFFFC,0xFFFFFFFF, 240 },
190 0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF}, 241 {
191 {0xFFFFFFFC,0x00000003,0x00000000,0xFFFFFFFC,0xFFFFFFFB,0xFFFFFFFF, 242 0xFFFFFFFE, 0x00000001, 0x00000000, 0xFFFFFFFE,
192 0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF}, 243 0xFFFFFFFD, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
193 {0xFFFFFFFB,0x00000004,0x00000000,0xFFFFFFFB,0xFFFFFFFA,0xFFFFFFFF, 244 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF
194 0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF}, 245 },
195 }; 246 {
247 0xFFFFFFFD, 0x00000002, 0x00000000, 0xFFFFFFFD,
248 0xFFFFFFFC, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
249 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF
250 },
251 {
252 0xFFFFFFFC, 0x00000003, 0x00000000, 0xFFFFFFFC,
253 0xFFFFFFFB, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
254 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF
255 },
256 {
257 0xFFFFFFFB, 0x00000004, 0x00000000, 0xFFFFFFFB,
258 0xFFFFFFFA, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
259 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF
260 },
261};
196static const BN_ULONG _nist_p_384_sqr[] = { 262static const BN_ULONG _nist_p_384_sqr[] = {
197 0x00000001,0xFFFFFFFE,0x00000000,0x00000002,0x00000000,0xFFFFFFFE, 263 0x00000001, 0xFFFFFFFE, 0x00000000, 0x00000002, 0x00000000, 0xFFFFFFFE,
198 0x00000000,0x00000002,0x00000001,0x00000000,0x00000000,0x00000000, 264 0x00000000, 0x00000002, 0x00000001, 0x00000000, 0x00000000, 0x00000000,
199 0xFFFFFFFE,0x00000001,0x00000000,0xFFFFFFFE,0xFFFFFFFD,0xFFFFFFFF, 265 0xFFFFFFFE, 0x00000001, 0x00000000, 0xFFFFFFFE, 0xFFFFFFFD, 0xFFFFFFFF,
200 0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF 266 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF
201 }; 267};
202static const BN_ULONG _nist_p_521[] = {0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF, 268static const BN_ULONG _nist_p_521[] = {
203 0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF, 269 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
204 0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF, 270 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
205 0xFFFFFFFF,0x000001FF}; 271 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
272 0xFFFFFFFF, 0x000001FF
273};
206static const BN_ULONG _nist_p_521_sqr[] = { 274static const BN_ULONG _nist_p_521_sqr[] = {
207 0x00000001,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000, 275 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
208 0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000, 276 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
209 0x00000000,0x00000000,0x00000000,0x00000000,0xFFFFFC00,0xFFFFFFFF, 277 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFC00, 0xFFFFFFFF,
210 0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF, 278 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
211 0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF, 279 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
212 0xFFFFFFFF,0xFFFFFFFF,0x0003FFFF 280 0xFFFFFFFF, 0xFFFFFFFF, 0x0003FFFF
213 }; 281};
214#else 282#else
215#error "unsupported BN_BITS2" 283#error "unsupported BN_BITS2"
216#endif 284#endif
217 285
218 286static const BIGNUM _bignum_nist_p_192 = {
219static const BIGNUM _bignum_nist_p_192 =
220 {
221 (BN_ULONG *)_nist_p_192[0], 287 (BN_ULONG *)_nist_p_192[0],
222 BN_NIST_192_TOP, 288 BN_NIST_192_TOP,
223 BN_NIST_192_TOP, 289 BN_NIST_192_TOP,
224 0, 290 0,
225 BN_FLG_STATIC_DATA 291 BN_FLG_STATIC_DATA
226 }; 292};
227 293
228static const BIGNUM _bignum_nist_p_224 = 294static const BIGNUM _bignum_nist_p_224 = {
229 {
230 (BN_ULONG *)_nist_p_224[0], 295 (BN_ULONG *)_nist_p_224[0],
231 BN_NIST_224_TOP, 296 BN_NIST_224_TOP,
232 BN_NIST_224_TOP, 297 BN_NIST_224_TOP,
233 0, 298 0,
234 BN_FLG_STATIC_DATA 299 BN_FLG_STATIC_DATA
235 }; 300};
236 301
237static const BIGNUM _bignum_nist_p_256 = 302static const BIGNUM _bignum_nist_p_256 = {
238 {
239 (BN_ULONG *)_nist_p_256[0], 303 (BN_ULONG *)_nist_p_256[0],
240 BN_NIST_256_TOP, 304 BN_NIST_256_TOP,
241 BN_NIST_256_TOP, 305 BN_NIST_256_TOP,
242 0, 306 0,
243 BN_FLG_STATIC_DATA 307 BN_FLG_STATIC_DATA
244 }; 308};
245 309
246static const BIGNUM _bignum_nist_p_384 = 310static const BIGNUM _bignum_nist_p_384 = {
247 {
248 (BN_ULONG *)_nist_p_384[0], 311 (BN_ULONG *)_nist_p_384[0],
249 BN_NIST_384_TOP, 312 BN_NIST_384_TOP,
250 BN_NIST_384_TOP, 313 BN_NIST_384_TOP,
251 0, 314 0,
252 BN_FLG_STATIC_DATA 315 BN_FLG_STATIC_DATA
253 }; 316};
254 317
255static const BIGNUM _bignum_nist_p_521 = 318static const BIGNUM _bignum_nist_p_521 = {
256 {
257 (BN_ULONG *)_nist_p_521, 319 (BN_ULONG *)_nist_p_521,
258 BN_NIST_521_TOP, 320 BN_NIST_521_TOP,
259 BN_NIST_521_TOP, 321 BN_NIST_521_TOP,
260 0, 322 0,
261 BN_FLG_STATIC_DATA 323 BN_FLG_STATIC_DATA
262 }; 324};
263 325
264 326
265const BIGNUM *BN_get0_nist_prime_192(void) 327const BIGNUM *
266 { 328BN_get0_nist_prime_192(void)
329{
267 return &_bignum_nist_p_192; 330 return &_bignum_nist_p_192;
268 } 331}
269 332
270const BIGNUM *BN_get0_nist_prime_224(void) 333const BIGNUM *
271 { 334BN_get0_nist_prime_224(void)
335{
272 return &_bignum_nist_p_224; 336 return &_bignum_nist_p_224;
273 } 337}
274 338
275const BIGNUM *BN_get0_nist_prime_256(void) 339const BIGNUM *
276 { 340BN_get0_nist_prime_256(void)
341{
277 return &_bignum_nist_p_256; 342 return &_bignum_nist_p_256;
278 } 343}
279 344
280const BIGNUM *BN_get0_nist_prime_384(void) 345const BIGNUM *
281 { 346BN_get0_nist_prime_384(void)
347{
282 return &_bignum_nist_p_384; 348 return &_bignum_nist_p_384;
283 } 349}
284 350
285const BIGNUM *BN_get0_nist_prime_521(void) 351const BIGNUM *
286 { 352BN_get0_nist_prime_521(void)
353{
287 return &_bignum_nist_p_521; 354 return &_bignum_nist_p_521;
288 } 355}
289 356
290 357static void
291static void nist_cp_bn_0(BN_ULONG *dst, const BN_ULONG *src, int top, int max) 358nist_cp_bn_0(BN_ULONG *dst, const BN_ULONG *src, int top, int max)
292 { 359{
293 int i; 360 int i;
294 361
295#ifdef BN_DEBUG 362#ifdef BN_DEBUG
@@ -299,15 +366,15 @@ static void nist_cp_bn_0(BN_ULONG *dst, const BN_ULONG *src, int top, int max)
299 dst[i] = src[i]; 366 dst[i] = src[i];
300 for (; i < max; i++) 367 for (; i < max; i++)
301 dst[i] = 0; 368 dst[i] = 0;
302 } 369}
303 370
304static void nist_cp_bn(BN_ULONG *dst, const BN_ULONG *src, int top) 371static void nist_cp_bn(BN_ULONG *dst, const BN_ULONG *src, int top)
305 { 372{
306 int i; 373 int i;
307 374
308 for (i = 0; i < top; i++) 375 for (i = 0; i < top; i++)
309 dst[i] = src[i]; 376 dst[i] = src[i];
310 } 377}
311 378
312#if BN_BITS2 == 64 379#if BN_BITS2 == 64
313#define bn_cp_64(to, n, from, m) (to)[n] = (m>=0)?((from)[m]):0; 380#define bn_cp_64(to, n, from, m) (to)[n] = (m>=0)?((from)[m]):0;
@@ -352,93 +419,110 @@ static void nist_cp_bn(BN_ULONG *dst, const BN_ULONG *src, int top)
352 bn_cp_64(to, 2, from, (a1) - 3) \ 419 bn_cp_64(to, 2, from, (a1) - 3) \
353 } 420 }
354 421
355int BN_nist_mod_192(BIGNUM *r, const BIGNUM *a, const BIGNUM *field, 422int
356 BN_CTX *ctx) 423BN_nist_mod_192(BIGNUM *r, const BIGNUM *a, const BIGNUM *field, BN_CTX *ctx)
357 { 424{
358 int top = a->top, i; 425 int top = a->top, i;
359 int carry; 426 int carry;
360 register BN_ULONG *r_d, *a_d = a->d; 427 register BN_ULONG *r_d, *a_d = a->d;
361 union { 428 union {
362 BN_ULONG bn[BN_NIST_192_TOP]; 429 BN_ULONG bn[BN_NIST_192_TOP];
363 unsigned int ui[BN_NIST_192_TOP*sizeof(BN_ULONG)/sizeof(unsigned int)]; 430 unsigned int ui[BN_NIST_192_TOP *
364 } buf; 431 sizeof(BN_ULONG) / sizeof(unsigned int)];
365 BN_ULONG c_d[BN_NIST_192_TOP], 432 } buf;
366 *res; 433 BN_ULONG c_d[BN_NIST_192_TOP], *res;
367 uintptr_t mask; 434 uintptr_t mask;
368 static const BIGNUM _bignum_nist_p_192_sqr = { 435 static const BIGNUM _bignum_nist_p_192_sqr = {
369 (BN_ULONG *)_nist_p_192_sqr, 436 (BN_ULONG *)_nist_p_192_sqr,
370 sizeof(_nist_p_192_sqr)/sizeof(_nist_p_192_sqr[0]), 437 sizeof(_nist_p_192_sqr) / sizeof(_nist_p_192_sqr[0]),
371 sizeof(_nist_p_192_sqr)/sizeof(_nist_p_192_sqr[0]), 438 sizeof(_nist_p_192_sqr) / sizeof(_nist_p_192_sqr[0]),
372 0,BN_FLG_STATIC_DATA }; 439 0,
440 BN_FLG_STATIC_DATA
441 };
373 442
374 field = &_bignum_nist_p_192; /* just to make sure */ 443 field = &_bignum_nist_p_192; /* just to make sure */
375 444
376 if (BN_is_negative(a) || BN_ucmp(a,&_bignum_nist_p_192_sqr)>=0) 445 if (BN_is_negative(a) || BN_ucmp(a, &_bignum_nist_p_192_sqr) >= 0)
377 return BN_nnmod(r, a, field, ctx); 446 return BN_nnmod(r, a, field, ctx);
378 447
379 i = BN_ucmp(field, a); 448 i = BN_ucmp(field, a);
380 if (i == 0) 449 if (i == 0) {
381 {
382 BN_zero(r); 450 BN_zero(r);
383 return 1; 451 return 1;
384 } 452 } else if (i > 0)
385 else if (i > 0) 453 return (r == a) ? 1 : (BN_copy(r , a) != NULL);
386 return (r == a) ? 1 : (BN_copy(r ,a) != NULL);
387 454
388 if (r != a) 455 if (r != a) {
389 {
390 if (!bn_wexpand(r, BN_NIST_192_TOP)) 456 if (!bn_wexpand(r, BN_NIST_192_TOP))
391 return 0; 457 return 0;
392 r_d = r->d; 458 r_d = r->d;
393 nist_cp_bn(r_d, a_d, BN_NIST_192_TOP); 459 nist_cp_bn(r_d, a_d, BN_NIST_192_TOP);
394 } 460 } else
395 else
396 r_d = a_d; 461 r_d = a_d;
397 462
398 nist_cp_bn_0(buf.bn, a_d + BN_NIST_192_TOP, top - BN_NIST_192_TOP, BN_NIST_192_TOP); 463 nist_cp_bn_0(buf.bn, a_d + BN_NIST_192_TOP, top - BN_NIST_192_TOP,
464 BN_NIST_192_TOP);
399 465
400#if defined(NIST_INT64) 466#if defined(NIST_INT64)
401 { 467 {
402 NIST_INT64 acc; /* accumulator */ 468 NIST_INT64 acc; /* accumulator */
403 unsigned int *rp=(unsigned int *)r_d; 469 unsigned int *rp = (unsigned int *)r_d;
404 const unsigned int *bp=(const unsigned int *)buf.ui; 470 const unsigned int *bp = (const unsigned int *)buf.ui;
405 471
406 acc = rp[0]; acc += bp[3*2-6]; 472 acc = rp[0];
407 acc += bp[5*2-6]; rp[0] = (unsigned int)acc; acc >>= 32; 473 acc += bp[3 * 2 - 6];
408 474 acc += bp[5 * 2 - 6];
409 acc += rp[1]; acc += bp[3*2-5]; 475 rp[0] = (unsigned int)acc;
410 acc += bp[5*2-5]; rp[1] = (unsigned int)acc; acc >>= 32; 476 acc >>= 32;
411 477
412 acc += rp[2]; acc += bp[3*2-6]; 478 acc += rp[1];
413 acc += bp[4*2-6]; 479 acc += bp[3 * 2 - 5];
414 acc += bp[5*2-6]; rp[2] = (unsigned int)acc; acc >>= 32; 480 acc += bp[5 * 2 - 5];
415 481 rp[1] = (unsigned int)acc;
416 acc += rp[3]; acc += bp[3*2-5]; 482 acc >>= 32;
417 acc += bp[4*2-5]; 483
418 acc += bp[5*2-5]; rp[3] = (unsigned int)acc; acc >>= 32; 484 acc += rp[2];
419 485 acc += bp[3 * 2 - 6];
420 acc += rp[4]; acc += bp[4*2-6]; 486 acc += bp[4 * 2 - 6];
421 acc += bp[5*2-6]; rp[4] = (unsigned int)acc; acc >>= 32; 487 acc += bp[5 * 2 - 6];
422 488 rp[2] = (unsigned int)acc;
423 acc += rp[5]; acc += bp[4*2-5]; 489 acc >>= 32;
424 acc += bp[5*2-5]; rp[5] = (unsigned int)acc; 490
425 491 acc += rp[3];
426 carry = (int)(acc>>32); 492 acc += bp[3 * 2 - 5];
493 acc += bp[4 * 2 - 5];
494 acc += bp[5 * 2 - 5];
495 rp[3] = (unsigned int)acc;
496 acc >>= 32;
497
498 acc += rp[4];
499 acc += bp[4 * 2 - 6];
500 acc += bp[5 * 2 - 6];
501 rp[4] = (unsigned int)acc;
502 acc >>= 32;
503
504 acc += rp[5];
505 acc += bp[4 * 2 - 5];
506 acc += bp[5 * 2 - 5];
507 rp[5] = (unsigned int)acc;
508
509 carry = (int)(acc >> 32);
427 } 510 }
428#else 511#else
429 { 512 {
430 BN_ULONG t_d[BN_NIST_192_TOP]; 513 BN_ULONG t_d[BN_NIST_192_TOP];
431 514
432 nist_set_192(t_d, buf.bn, 0, 3, 3); 515 nist_set_192(t_d, buf.bn, 0, 3, 3);
433 carry = (int)bn_add_words(r_d, r_d, t_d, BN_NIST_192_TOP); 516 carry = (int)bn_add_words(r_d, r_d, t_d, BN_NIST_192_TOP);
434 nist_set_192(t_d, buf.bn, 4, 4, 0); 517 nist_set_192(t_d, buf.bn, 4, 4, 0);
435 carry += (int)bn_add_words(r_d, r_d, t_d, BN_NIST_192_TOP); 518 carry += (int)bn_add_words(r_d, r_d, t_d, BN_NIST_192_TOP);
436 nist_set_192(t_d, buf.bn, 5, 5, 5) 519 nist_set_192(t_d, buf.bn, 5, 5, 5)
437 carry += (int)bn_add_words(r_d, r_d, t_d, BN_NIST_192_TOP); 520 carry += (int)bn_add_words(r_d, r_d, t_d, BN_NIST_192_TOP);
438 } 521 }
439#endif 522#endif
440 if (carry > 0) 523 if (carry > 0)
441 carry = (int)bn_sub_words(r_d,r_d,_nist_p_192[carry-1],BN_NIST_192_TOP); 524 carry = (int)bn_sub_words(r_d, r_d, _nist_p_192[carry - 1],
525 BN_NIST_192_TOP);
442 else 526 else
443 carry = 1; 527 carry = 1;
444 528
@@ -448,19 +532,20 @@ int BN_nist_mod_192(BIGNUM *r, const BIGNUM *a, const BIGNUM *field,
448 * 'tmp=result-modulus; if (!carry || !borrow) result=tmp;' 532 * 'tmp=result-modulus; if (!carry || !borrow) result=tmp;'
449 * this is what happens below, but without explicit if:-) a. 533 * this is what happens below, but without explicit if:-) a.
450 */ 534 */
451 mask = 0-(uintptr_t)bn_sub_words(c_d,r_d,_nist_p_192[0],BN_NIST_192_TOP); 535 mask = 0 - (uintptr_t)bn_sub_words(c_d, r_d, _nist_p_192[0],
452 mask &= 0-(uintptr_t)carry; 536 BN_NIST_192_TOP);
453 res = c_d; 537 mask &= 0 - (uintptr_t)carry;
454 res = (BN_ULONG *) 538 res = c_d;
455 (((uintptr_t)res&~mask) | ((uintptr_t)r_d&mask)); 539 res = (BN_ULONG *)(((uintptr_t)res & ~mask) | ((uintptr_t)r_d & mask));
456 nist_cp_bn(r_d, res, BN_NIST_192_TOP); 540 nist_cp_bn(r_d, res, BN_NIST_192_TOP);
457 r->top = BN_NIST_192_TOP; 541 r->top = BN_NIST_192_TOP;
458 bn_correct_top(r); 542 bn_correct_top(r);
459 543
460 return 1; 544 return 1;
461 } 545}
462 546
463typedef BN_ULONG (*bn_addsub_f)(BN_ULONG *,const BN_ULONG *,const BN_ULONG *,int); 547typedef BN_ULONG (*bn_addsub_f)(BN_ULONG *, const BN_ULONG *,
548 const BN_ULONG *, int);
464 549
465#define nist_set_224(to, from, a1, a2, a3, a4, a5, a6, a7) \ 550#define nist_set_224(to, from, a1, a2, a3, a4, a5, a6, a7) \
466 { \ 551 { \
@@ -473,150 +558,170 @@ typedef BN_ULONG (*bn_addsub_f)(BN_ULONG *,const BN_ULONG *,const BN_ULONG *,int
473 bn_cp_32(to, 6, from, (a1) - 7) \ 558 bn_cp_32(to, 6, from, (a1) - 7) \
474 } 559 }
475 560
476int BN_nist_mod_224(BIGNUM *r, const BIGNUM *a, const BIGNUM *field, 561int
477 BN_CTX *ctx) 562BN_nist_mod_224(BIGNUM *r, const BIGNUM *a, const BIGNUM *field, BN_CTX *ctx)
478 { 563{
479 int top = a->top, i; 564 int top = a->top, i;
480 int carry; 565 int carry;
481 BN_ULONG *r_d, *a_d = a->d; 566 BN_ULONG *r_d, *a_d = a->d;
482 union { 567 union {
483 BN_ULONG bn[BN_NIST_224_TOP]; 568 BN_ULONG bn[BN_NIST_224_TOP];
484 unsigned int ui[BN_NIST_224_TOP*sizeof(BN_ULONG)/sizeof(unsigned int)]; 569 unsigned int ui[BN_NIST_224_TOP *
485 } buf; 570 sizeof(BN_ULONG) / sizeof(unsigned int)];
486 BN_ULONG c_d[BN_NIST_224_TOP], 571 } buf;
487 *res; 572 BN_ULONG c_d[BN_NIST_224_TOP], *res;
488 uintptr_t mask; 573 uintptr_t mask;
489 union { bn_addsub_f f; uintptr_t p; } u; 574 union {
575 bn_addsub_f f;
576 uintptr_t p;
577 } u;
490 static const BIGNUM _bignum_nist_p_224_sqr = { 578 static const BIGNUM _bignum_nist_p_224_sqr = {
491 (BN_ULONG *)_nist_p_224_sqr, 579 (BN_ULONG *)_nist_p_224_sqr,
492 sizeof(_nist_p_224_sqr)/sizeof(_nist_p_224_sqr[0]), 580 sizeof(_nist_p_224_sqr) / sizeof(_nist_p_224_sqr[0]),
493 sizeof(_nist_p_224_sqr)/sizeof(_nist_p_224_sqr[0]), 581 sizeof(_nist_p_224_sqr) / sizeof(_nist_p_224_sqr[0]),
494 0,BN_FLG_STATIC_DATA }; 582 0,
495 583 BN_FLG_STATIC_DATA
584 };
496 585
497 field = &_bignum_nist_p_224; /* just to make sure */ 586 field = &_bignum_nist_p_224; /* just to make sure */
498 587
499 if (BN_is_negative(a) || BN_ucmp(a,&_bignum_nist_p_224_sqr)>=0) 588 if (BN_is_negative(a) || BN_ucmp(a, &_bignum_nist_p_224_sqr) >= 0)
500 return BN_nnmod(r, a, field, ctx); 589 return BN_nnmod(r, a, field, ctx);
501 590
502 i = BN_ucmp(field, a); 591 i = BN_ucmp(field, a);
503 if (i == 0) 592 if (i == 0) {
504 {
505 BN_zero(r); 593 BN_zero(r);
506 return 1; 594 return 1;
507 } 595 } else if (i > 0)
508 else if (i > 0) 596 return (r == a) ? 1 : (BN_copy(r, a) != NULL);
509 return (r == a)? 1 : (BN_copy(r ,a) != NULL);
510 597
511 if (r != a) 598 if (r != a) {
512 {
513 if (!bn_wexpand(r, BN_NIST_224_TOP)) 599 if (!bn_wexpand(r, BN_NIST_224_TOP))
514 return 0; 600 return 0;
515 r_d = r->d; 601 r_d = r->d;
516 nist_cp_bn(r_d, a_d, BN_NIST_224_TOP); 602 nist_cp_bn(r_d, a_d, BN_NIST_224_TOP);
517 } 603 } else
518 else
519 r_d = a_d; 604 r_d = a_d;
520 605
521#if BN_BITS2==64 606#if BN_BITS2==64
522 /* copy upper 256 bits of 448 bit number ... */ 607 /* copy upper 256 bits of 448 bit number ... */
523 nist_cp_bn_0(c_d, a_d + (BN_NIST_224_TOP-1), top - (BN_NIST_224_TOP-1), BN_NIST_224_TOP); 608 nist_cp_bn_0(c_d, a_d + (BN_NIST_224_TOP - 1),
609 top - (BN_NIST_224_TOP - 1), BN_NIST_224_TOP);
524 /* ... and right shift by 32 to obtain upper 224 bits */ 610 /* ... and right shift by 32 to obtain upper 224 bits */
525 nist_set_224(buf.bn, c_d, 14, 13, 12, 11, 10, 9, 8); 611 nist_set_224(buf.bn, c_d, 14, 13, 12, 11, 10, 9, 8);
526 /* truncate lower part to 224 bits too */ 612 /* truncate lower part to 224 bits too */
527 r_d[BN_NIST_224_TOP-1] &= BN_MASK2l; 613 r_d[BN_NIST_224_TOP - 1] &= BN_MASK2l;
528#else 614#else
529 nist_cp_bn_0(buf.bn, a_d + BN_NIST_224_TOP, top - BN_NIST_224_TOP, BN_NIST_224_TOP); 615 nist_cp_bn_0(buf.bn, a_d + BN_NIST_224_TOP,
616 top - BN_NIST_224_TOP, BN_NIST_224_TOP);
530#endif 617#endif
531 618
532#if defined(NIST_INT64) && BN_BITS2!=64 619#if defined(NIST_INT64) && BN_BITS2!=64
533 { 620 {
534 NIST_INT64 acc; /* accumulator */ 621 NIST_INT64 acc; /* accumulator */
535 unsigned int *rp=(unsigned int *)r_d; 622 unsigned int *rp = (unsigned int *)r_d;
536 const unsigned int *bp=(const unsigned int *)buf.ui; 623 const unsigned int *bp = (const unsigned int *)buf.ui;
537 624
538 acc = rp[0]; acc -= bp[7-7]; 625 acc = rp[0];
539 acc -= bp[11-7]; rp[0] = (unsigned int)acc; acc >>= 32; 626 acc -= bp[7 - 7];
540 627 acc -= bp[11 - 7];
541 acc += rp[1]; acc -= bp[8-7]; 628 rp[0] = (unsigned int)acc;
542 acc -= bp[12-7]; rp[1] = (unsigned int)acc; acc >>= 32; 629 acc >>= 32;
543 630
544 acc += rp[2]; acc -= bp[9-7]; 631 acc += rp[1];
545 acc -= bp[13-7]; rp[2] = (unsigned int)acc; acc >>= 32; 632 acc -= bp[8 - 7];
546 633 acc -= bp[12 - 7];
547 acc += rp[3]; acc += bp[7-7]; 634 rp[1] = (unsigned int)acc;
548 acc += bp[11-7]; 635 acc >>= 32;
549 acc -= bp[10-7]; rp[3] = (unsigned int)acc; acc>>= 32; 636
550 637 acc += rp[2];
551 acc += rp[4]; acc += bp[8-7]; 638 acc -= bp[9 - 7];
552 acc += bp[12-7]; 639 acc -= bp[13 - 7];
553 acc -= bp[11-7]; rp[4] = (unsigned int)acc; acc >>= 32; 640 rp[2] = (unsigned int)acc;
554 641 acc >>= 32;
555 acc += rp[5]; acc += bp[9-7]; 642
556 acc += bp[13-7]; 643 acc += rp[3];
557 acc -= bp[12-7]; rp[5] = (unsigned int)acc; acc >>= 32; 644 acc += bp[7 - 7];
558 645 acc += bp[11 - 7];
559 acc += rp[6]; acc += bp[10-7]; 646 acc -= bp[10 - 7];
560 acc -= bp[13-7]; rp[6] = (unsigned int)acc; 647 rp[3] = (unsigned int)acc;
561 648 acc >>= 32;
562 carry = (int)(acc>>32); 649
650 acc += rp[4];
651 acc += bp[8 - 7];
652 acc += bp[12 - 7];
653 acc -= bp[11 - 7];
654 rp[4] = (unsigned int)acc;
655 acc >>= 32;
656
657 acc += rp[5];
658 acc += bp[9 - 7];
659 acc += bp[13 - 7];
660 acc -= bp[12 - 7];
661 rp[5] = (unsigned int)acc;
662 acc >>= 32;
663
664 acc += rp[6];
665 acc += bp[10 - 7];
666 acc -= bp[13 - 7];
667 rp[6] = (unsigned int)acc;
668
669 carry = (int)(acc >> 32);
563# if BN_BITS2==64 670# if BN_BITS2==64
564 rp[7] = carry; 671 rp[7] = carry;
565# endif 672# endif
566 } 673 }
567#else 674#else
568 { 675 {
569 BN_ULONG t_d[BN_NIST_224_TOP]; 676 BN_ULONG t_d[BN_NIST_224_TOP];
570 677
571 nist_set_224(t_d, buf.bn, 10, 9, 8, 7, 0, 0, 0); 678 nist_set_224(t_d, buf.bn, 10, 9, 8, 7, 0, 0, 0);
572 carry = (int)bn_add_words(r_d, r_d, t_d, BN_NIST_224_TOP); 679 carry = (int)bn_add_words(r_d, r_d, t_d, BN_NIST_224_TOP);
573 nist_set_224(t_d, buf.bn, 0, 13, 12, 11, 0, 0, 0); 680 nist_set_224(t_d, buf.bn, 0, 13, 12, 11, 0, 0, 0);
574 carry += (int)bn_add_words(r_d, r_d, t_d, BN_NIST_224_TOP); 681 carry += (int)bn_add_words(r_d, r_d, t_d, BN_NIST_224_TOP);
575 nist_set_224(t_d, buf.bn, 13, 12, 11, 10, 9, 8, 7); 682 nist_set_224(t_d, buf.bn, 13, 12, 11, 10, 9, 8, 7);
576 carry -= (int)bn_sub_words(r_d, r_d, t_d, BN_NIST_224_TOP); 683 carry -= (int)bn_sub_words(r_d, r_d, t_d, BN_NIST_224_TOP);
577 nist_set_224(t_d, buf.bn, 0, 0, 0, 0, 13, 12, 11); 684 nist_set_224(t_d, buf.bn, 0, 0, 0, 0, 13, 12, 11);
578 carry -= (int)bn_sub_words(r_d, r_d, t_d, BN_NIST_224_TOP); 685 carry -= (int)bn_sub_words(r_d, r_d, t_d, BN_NIST_224_TOP);
579 686
580#if BN_BITS2==64 687#if BN_BITS2==64
581 carry = (int)(r_d[BN_NIST_224_TOP-1]>>32); 688 carry = (int)(r_d[BN_NIST_224_TOP - 1] >> 32);
582#endif 689#endif
583 } 690 }
584#endif 691#endif
585 u.f = bn_sub_words; 692 u.f = bn_sub_words;
586 if (carry > 0) 693 if (carry > 0) {
587 { 694 carry = (int)bn_sub_words(r_d, r_d, _nist_p_224[carry - 1],
588 carry = (int)bn_sub_words(r_d,r_d,_nist_p_224[carry-1],BN_NIST_224_TOP); 695 BN_NIST_224_TOP);
589#if BN_BITS2==64 696#if BN_BITS2==64
590 carry=(int)(~(r_d[BN_NIST_224_TOP-1]>>32))&1; 697 carry = (int)(~(r_d[BN_NIST_224_TOP - 1] >> 32)) & 1;
591#endif 698#endif
592 } 699 } else if (carry < 0) {
593 else if (carry < 0)
594 {
595 /* it's a bit more complicated logic in this case. 700 /* it's a bit more complicated logic in this case.
596 * if bn_add_words yields no carry, then result 701 * if bn_add_words yields no carry, then result
597 * has to be adjusted by unconditionally *adding* 702 * has to be adjusted by unconditionally *adding*
598 * the modulus. but if it does, then result has 703 * the modulus. but if it does, then result has
599 * to be compared to the modulus and conditionally 704 * to be compared to the modulus and conditionally
600 * adjusted by *subtracting* the latter. */ 705 * adjusted by *subtracting* the latter. */
601 carry = (int)bn_add_words(r_d,r_d,_nist_p_224[-carry-1],BN_NIST_224_TOP); 706 carry = (int)bn_add_words(r_d, r_d, _nist_p_224[-carry - 1],
602 mask = 0-(uintptr_t)carry; 707 BN_NIST_224_TOP);
603 u.p = ((uintptr_t)bn_sub_words&mask) | 708 mask = 0 - (uintptr_t)carry;
604 ((uintptr_t)bn_add_words&~mask); 709 u.p = ((uintptr_t)bn_sub_words & mask) |
605 } 710 ((uintptr_t)bn_add_words & ~mask);
606 else 711 } else
607 carry = 1; 712 carry = 1;
608 713
609 /* otherwise it's effectively same as in BN_nist_mod_192... */ 714 /* otherwise it's effectively same as in BN_nist_mod_192... */
610 mask = 0-(uintptr_t)(*u.f)(c_d,r_d,_nist_p_224[0],BN_NIST_224_TOP); 715 mask = 0 - (uintptr_t)(*u.f)(c_d, r_d, _nist_p_224[0], BN_NIST_224_TOP);
611 mask &= 0-(uintptr_t)carry; 716 mask &= 0 - (uintptr_t)carry;
612 res = c_d; 717 res = c_d;
613 res = (BN_ULONG *)(((uintptr_t)res&~mask) | ((uintptr_t)r_d&mask)); 718 res = (BN_ULONG *)(((uintptr_t)res & ~mask) | ((uintptr_t)r_d & mask));
614 nist_cp_bn(r_d, res, BN_NIST_224_TOP); 719 nist_cp_bn(r_d, res, BN_NIST_224_TOP);
615 r->top = BN_NIST_224_TOP; 720 r->top = BN_NIST_224_TOP;
616 bn_correct_top(r); 721 bn_correct_top(r);
617 722
618 return 1; 723 return 1;
619 } 724}
620 725
621#define nist_set_256(to, from, a1, a2, a3, a4, a5, a6, a7, a8) \ 726#define nist_set_256(to, from, a1, a2, a3, a4, a5, a6, a7, a8) \
622 { \ 727 { \
@@ -630,192 +735,216 @@ int BN_nist_mod_224(BIGNUM *r, const BIGNUM *a, const BIGNUM *field,
630 bn_cp_32(to, 7, from, (a1) - 8) \ 735 bn_cp_32(to, 7, from, (a1) - 8) \
631 } 736 }
632 737
633int BN_nist_mod_256(BIGNUM *r, const BIGNUM *a, const BIGNUM *field, 738int
634 BN_CTX *ctx) 739BN_nist_mod_256(BIGNUM *r, const BIGNUM *a, const BIGNUM *field, BN_CTX *ctx)
635 { 740{
636 int i, top = a->top; 741 int i, top = a->top;
637 int carry = 0; 742 int carry = 0;
638 register BN_ULONG *a_d = a->d, *r_d; 743 register BN_ULONG *a_d = a->d, *r_d;
639 union { 744 union {
640 BN_ULONG bn[BN_NIST_256_TOP]; 745 BN_ULONG bn[BN_NIST_256_TOP];
641 unsigned int ui[BN_NIST_256_TOP*sizeof(BN_ULONG)/sizeof(unsigned int)]; 746 unsigned int ui[BN_NIST_256_TOP *
642 } buf; 747 sizeof(BN_ULONG) / sizeof(unsigned int)];
643 BN_ULONG c_d[BN_NIST_256_TOP], 748 } buf;
644 *res; 749 BN_ULONG c_d[BN_NIST_256_TOP], *res;
645 uintptr_t mask; 750 uintptr_t mask;
646 union { bn_addsub_f f; uintptr_t p; } u; 751 union {
752 bn_addsub_f f;
753 uintptr_t p;
754 } u;
647 static const BIGNUM _bignum_nist_p_256_sqr = { 755 static const BIGNUM _bignum_nist_p_256_sqr = {
648 (BN_ULONG *)_nist_p_256_sqr, 756 (BN_ULONG *)_nist_p_256_sqr,
649 sizeof(_nist_p_256_sqr)/sizeof(_nist_p_256_sqr[0]), 757 sizeof(_nist_p_256_sqr) / sizeof(_nist_p_256_sqr[0]),
650 sizeof(_nist_p_256_sqr)/sizeof(_nist_p_256_sqr[0]), 758 sizeof(_nist_p_256_sqr) / sizeof(_nist_p_256_sqr[0]),
651 0,BN_FLG_STATIC_DATA }; 759 0,
760 BN_FLG_STATIC_DATA
761 };
652 762
653 field = &_bignum_nist_p_256; /* just to make sure */ 763 field = &_bignum_nist_p_256; /* just to make sure */
654 764
655 if (BN_is_negative(a) || BN_ucmp(a,&_bignum_nist_p_256_sqr)>=0) 765 if (BN_is_negative(a) || BN_ucmp(a, &_bignum_nist_p_256_sqr) >= 0)
656 return BN_nnmod(r, a, field, ctx); 766 return BN_nnmod(r, a, field, ctx);
657 767
658 i = BN_ucmp(field, a); 768 i = BN_ucmp(field, a);
659 if (i == 0) 769 if (i == 0) {
660 {
661 BN_zero(r); 770 BN_zero(r);
662 return 1; 771 return 1;
663 } 772 } else if (i > 0)
664 else if (i > 0) 773 return (r == a) ? 1 : (BN_copy(r, a) != NULL);
665 return (r == a)? 1 : (BN_copy(r ,a) != NULL);
666 774
667 if (r != a) 775 if (r != a) {
668 {
669 if (!bn_wexpand(r, BN_NIST_256_TOP)) 776 if (!bn_wexpand(r, BN_NIST_256_TOP))
670 return 0; 777 return 0;
671 r_d = r->d; 778 r_d = r->d;
672 nist_cp_bn(r_d, a_d, BN_NIST_256_TOP); 779 nist_cp_bn(r_d, a_d, BN_NIST_256_TOP);
673 } 780 } else
674 else
675 r_d = a_d; 781 r_d = a_d;
676 782
677 nist_cp_bn_0(buf.bn, a_d + BN_NIST_256_TOP, top - BN_NIST_256_TOP, BN_NIST_256_TOP); 783 nist_cp_bn_0(buf.bn, a_d + BN_NIST_256_TOP,
784 top - BN_NIST_256_TOP, BN_NIST_256_TOP);
678 785
679#if defined(NIST_INT64) 786#if defined(NIST_INT64)
680 { 787 {
681 NIST_INT64 acc; /* accumulator */ 788 NIST_INT64 acc; /* accumulator */
682 unsigned int *rp=(unsigned int *)r_d; 789 unsigned int *rp = (unsigned int *)r_d;
683 const unsigned int *bp=(const unsigned int *)buf.ui; 790 const unsigned int *bp = (const unsigned int *)buf.ui;
684 791
685 acc = rp[0]; acc += bp[8-8]; 792 acc = rp[0];
686 acc += bp[9-8]; 793 acc += bp[8 - 8];
687 acc -= bp[11-8]; 794 acc += bp[9 - 8];
688 acc -= bp[12-8]; 795 acc -= bp[11 - 8];
689 acc -= bp[13-8]; 796 acc -= bp[12 - 8];
690 acc -= bp[14-8]; rp[0] = (unsigned int)acc; acc >>= 32; 797 acc -= bp[13 - 8];
691 798 acc -= bp[14 - 8];
692 acc += rp[1]; acc += bp[9-8]; 799 rp[0] = (unsigned int)acc;
693 acc += bp[10-8]; 800 acc >>= 32;
694 acc -= bp[12-8]; 801
695 acc -= bp[13-8]; 802 acc += rp[1];
696 acc -= bp[14-8]; 803 acc += bp[9 - 8];
697 acc -= bp[15-8]; rp[1] = (unsigned int)acc; acc >>= 32; 804 acc += bp[10 - 8];
698 805 acc -= bp[12 - 8];
699 acc += rp[2]; acc += bp[10-8]; 806 acc -= bp[13 - 8];
700 acc += bp[11-8]; 807 acc -= bp[14 - 8];
701 acc -= bp[13-8]; 808 acc -= bp[15 - 8];
702 acc -= bp[14-8]; 809 rp[1] = (unsigned int)acc;
703 acc -= bp[15-8]; rp[2] = (unsigned int)acc; acc >>= 32; 810 acc >>= 32;
704 811
705 acc += rp[3]; acc += bp[11-8]; 812 acc += rp[2];
706 acc += bp[11-8]; 813 acc += bp[10 - 8];
707 acc += bp[12-8]; 814 acc += bp[11 - 8];
708 acc += bp[12-8]; 815 acc -= bp[13 - 8];
709 acc += bp[13-8]; 816 acc -= bp[14 - 8];
710 acc -= bp[15-8]; 817 acc -= bp[15 - 8];
711 acc -= bp[8-8]; 818 rp[2] = (unsigned int)acc;
712 acc -= bp[9-8]; rp[3] = (unsigned int)acc; acc >>= 32; 819 acc >>= 32;
713 820
714 acc += rp[4]; acc += bp[12-8]; 821 acc += rp[3];
715 acc += bp[12-8]; 822 acc += bp[11 - 8];
716 acc += bp[13-8]; 823 acc += bp[11 - 8];
717 acc += bp[13-8]; 824 acc += bp[12 - 8];
718 acc += bp[14-8]; 825 acc += bp[12 - 8];
719 acc -= bp[9-8]; 826 acc += bp[13 - 8];
720 acc -= bp[10-8]; rp[4] = (unsigned int)acc; acc >>= 32; 827 acc -= bp[15 - 8];
721 828 acc -= bp[8 - 8];
722 acc += rp[5]; acc += bp[13-8]; 829 acc -= bp[9 - 8];
723 acc += bp[13-8]; 830 rp[3] = (unsigned int)acc;
724 acc += bp[14-8]; 831 acc >>= 32;
725 acc += bp[14-8]; 832
726 acc += bp[15-8]; 833 acc += rp[4];
727 acc -= bp[10-8]; 834 acc += bp[12 - 8];
728 acc -= bp[11-8]; rp[5] = (unsigned int)acc; acc >>= 32; 835 acc += bp[12 - 8];
729 836 acc += bp[13 - 8];
730 acc += rp[6]; acc += bp[14-8]; 837 acc += bp[13 - 8];
731 acc += bp[14-8]; 838 acc += bp[14 - 8];
732 acc += bp[15-8]; 839 acc -= bp[9 - 8];
733 acc += bp[15-8]; 840 acc -= bp[10 - 8];
734 acc += bp[14-8]; 841 rp[4] = (unsigned int)acc;
735 acc += bp[13-8]; 842 acc >>= 32;
736 acc -= bp[8-8]; 843
737 acc -= bp[9-8]; rp[6] = (unsigned int)acc; acc >>= 32; 844 acc += rp[5];
738 845 acc += bp[13 - 8];
739 acc += rp[7]; acc += bp[15-8]; 846 acc += bp[13 - 8];
740 acc += bp[15-8]; 847 acc += bp[14 - 8];
741 acc += bp[15-8]; 848 acc += bp[14 - 8];
742 acc += bp[8 -8]; 849 acc += bp[15 - 8];
743 acc -= bp[10-8]; 850 acc -= bp[10 - 8];
744 acc -= bp[11-8]; 851 acc -= bp[11 - 8];
745 acc -= bp[12-8]; 852 rp[5] = (unsigned int)acc;
746 acc -= bp[13-8]; rp[7] = (unsigned int)acc; 853 acc >>= 32;
747 854
748 carry = (int)(acc>>32); 855 acc += rp[6];
856 acc += bp[14 - 8];
857 acc += bp[14 - 8];
858 acc += bp[15 - 8];
859 acc += bp[15 - 8];
860 acc += bp[14 - 8];
861 acc += bp[13 - 8];
862 acc -= bp[8 - 8];
863 acc -= bp[9 - 8];
864 rp[6] = (unsigned int)acc;
865 acc >>= 32;
866
867 acc += rp[7];
868 acc += bp[15 - 8];
869 acc += bp[15 - 8];
870 acc += bp[15 - 8];
871 acc += bp[8 - 8];
872 acc -= bp[10 - 8];
873 acc -= bp[11 - 8];
874 acc -= bp[12 - 8];
875 acc -= bp[13 - 8];
876 rp[7] = (unsigned int)acc;
877
878 carry = (int)(acc >> 32);
749 } 879 }
750#else 880#else
751 { 881 {
752 BN_ULONG t_d[BN_NIST_256_TOP]; 882 BN_ULONG t_d[BN_NIST_256_TOP];
753 883
754 /*S1*/ 884 /*S1*/
755 nist_set_256(t_d, buf.bn, 15, 14, 13, 12, 11, 0, 0, 0); 885 nist_set_256(t_d, buf.bn, 15, 14, 13, 12, 11, 0, 0, 0);
756 /*S2*/ 886 /*S2*/
757 nist_set_256(c_d, buf.bn, 0, 15, 14, 13, 12, 0, 0, 0); 887 nist_set_256(c_d, buf.bn, 0, 15, 14, 13, 12, 0, 0, 0);
758 carry = (int)bn_add_words(t_d, t_d, c_d, BN_NIST_256_TOP); 888 carry = (int)bn_add_words(t_d, t_d, c_d, BN_NIST_256_TOP);
759 /* left shift */ 889 /* left shift */
760 { 890 {
761 register BN_ULONG *ap,t,c; 891 register BN_ULONG *ap, t, c;
762 ap = t_d; 892 ap = t_d;
763 c=0; 893 c = 0;
764 for (i = BN_NIST_256_TOP; i != 0; --i) 894 for (i = BN_NIST_256_TOP; i != 0; --i) {
765 { 895 t = *ap;
766 t= *ap; 896 *(ap++) = ((t << 1) | c) & BN_MASK2;
767 *(ap++)=((t<<1)|c)&BN_MASK2; 897 c = (t & BN_TBIT) ? 1 : 0;
768 c=(t & BN_TBIT)?1:0;
769 } 898 }
770 carry <<= 1; 899 carry <<= 1;
771 carry |= c; 900 carry |= c;
772 } 901 }
773 carry += (int)bn_add_words(r_d, r_d, t_d, BN_NIST_256_TOP); 902 carry += (int)bn_add_words(r_d, r_d, t_d, BN_NIST_256_TOP);
774 /*S3*/ 903 /*S3*/
775 nist_set_256(t_d, buf.bn, 15, 14, 0, 0, 0, 10, 9, 8); 904 nist_set_256(t_d, buf.bn, 15, 14, 0, 0, 0, 10, 9, 8);
776 carry += (int)bn_add_words(r_d, r_d, t_d, BN_NIST_256_TOP); 905 carry += (int)bn_add_words(r_d, r_d, t_d, BN_NIST_256_TOP);
777 /*S4*/ 906 /*S4*/
778 nist_set_256(t_d, buf.bn, 8, 13, 15, 14, 13, 11, 10, 9); 907 nist_set_256(t_d, buf.bn, 8, 13, 15, 14, 13, 11, 10, 9);
779 carry += (int)bn_add_words(r_d, r_d, t_d, BN_NIST_256_TOP); 908 carry += (int)bn_add_words(r_d, r_d, t_d, BN_NIST_256_TOP);
780 /*D1*/ 909 /*D1*/
781 nist_set_256(t_d, buf.bn, 10, 8, 0, 0, 0, 13, 12, 11); 910 nist_set_256(t_d, buf.bn, 10, 8, 0, 0, 0, 13, 12, 11);
782 carry -= (int)bn_sub_words(r_d, r_d, t_d, BN_NIST_256_TOP); 911 carry -= (int)bn_sub_words(r_d, r_d, t_d, BN_NIST_256_TOP);
783 /*D2*/ 912 /*D2*/
784 nist_set_256(t_d, buf.bn, 11, 9, 0, 0, 15, 14, 13, 12); 913 nist_set_256(t_d, buf.bn, 11, 9, 0, 0, 15, 14, 13, 12);
785 carry -= (int)bn_sub_words(r_d, r_d, t_d, BN_NIST_256_TOP); 914 carry -= (int)bn_sub_words(r_d, r_d, t_d, BN_NIST_256_TOP);
786 /*D3*/ 915 /*D3*/
787 nist_set_256(t_d, buf.bn, 12, 0, 10, 9, 8, 15, 14, 13); 916 nist_set_256(t_d, buf.bn, 12, 0, 10, 9, 8, 15, 14, 13);
788 carry -= (int)bn_sub_words(r_d, r_d, t_d, BN_NIST_256_TOP); 917 carry -= (int)bn_sub_words(r_d, r_d, t_d, BN_NIST_256_TOP);
789 /*D4*/ 918 /*D4*/
790 nist_set_256(t_d, buf.bn, 13, 0, 11, 10, 9, 0, 15, 14); 919 nist_set_256(t_d, buf.bn, 13, 0, 11, 10, 9, 0, 15, 14);
791 carry -= (int)bn_sub_words(r_d, r_d, t_d, BN_NIST_256_TOP); 920 carry -= (int)bn_sub_words(r_d, r_d, t_d, BN_NIST_256_TOP);
792 921
793 } 922 }
794#endif 923#endif
795 /* see BN_nist_mod_224 for explanation */ 924 /* see BN_nist_mod_224 for explanation */
796 u.f = bn_sub_words; 925 u.f = bn_sub_words;
797 if (carry > 0) 926 if (carry > 0)
798 carry = (int)bn_sub_words(r_d,r_d,_nist_p_256[carry-1],BN_NIST_256_TOP); 927 carry = (int)bn_sub_words(r_d, r_d, _nist_p_256[carry - 1],
799 else if (carry < 0) 928 BN_NIST_256_TOP);
800 { 929 else if (carry < 0) {
801 carry = (int)bn_add_words(r_d,r_d,_nist_p_256[-carry-1],BN_NIST_256_TOP); 930 carry = (int)bn_add_words(r_d, r_d, _nist_p_256[-carry - 1],
802 mask = 0-(uintptr_t)carry; 931 BN_NIST_256_TOP);
803 u.p = ((uintptr_t)bn_sub_words&mask) | 932 mask = 0 - (uintptr_t)carry;
804 ((uintptr_t)bn_add_words&~mask); 933 u.p = ((uintptr_t)bn_sub_words & mask) |
805 } 934 ((uintptr_t)bn_add_words & ~mask);
806 else 935 } else
807 carry = 1; 936 carry = 1;
808 937
809 mask = 0-(uintptr_t)(*u.f)(c_d,r_d,_nist_p_256[0],BN_NIST_256_TOP); 938 mask = 0 - (uintptr_t)(*u.f)(c_d, r_d, _nist_p_256[0], BN_NIST_256_TOP);
810 mask &= 0-(uintptr_t)carry; 939 mask &= 0 - (uintptr_t)carry;
811 res = c_d; 940 res = c_d;
812 res = (BN_ULONG *)(((uintptr_t)res&~mask) | ((uintptr_t)r_d&mask)); 941 res = (BN_ULONG *)(((uintptr_t)res & ~mask) | ((uintptr_t)r_d & mask));
813 nist_cp_bn(r_d, res, BN_NIST_256_TOP); 942 nist_cp_bn(r_d, res, BN_NIST_256_TOP);
814 r->top = BN_NIST_256_TOP; 943 r->top = BN_NIST_256_TOP;
815 bn_correct_top(r); 944 bn_correct_top(r);
816 945
817 return 1; 946 return 1;
818 } 947}
819 948
820#define nist_set_384(to,from,a1,a2,a3,a4,a5,a6,a7,a8,a9,a10,a11,a12) \ 949#define nist_set_384(to,from,a1,a2,a3,a4,a5,a6,a7,a8,a9,a10,a11,a12) \
821 { \ 950 { \
@@ -833,273 +962,309 @@ int BN_nist_mod_256(BIGNUM *r, const BIGNUM *a, const BIGNUM *field,
833 bn_cp_32(to, 11, from, (a1) - 12) \ 962 bn_cp_32(to, 11, from, (a1) - 12) \
834 } 963 }
835 964
836int BN_nist_mod_384(BIGNUM *r, const BIGNUM *a, const BIGNUM *field, 965int
837 BN_CTX *ctx) 966BN_nist_mod_384(BIGNUM *r, const BIGNUM *a, const BIGNUM *field, BN_CTX *ctx)
838 { 967{
839 int i, top = a->top; 968 int i, top = a->top;
840 int carry = 0; 969 int carry = 0;
841 register BN_ULONG *r_d, *a_d = a->d; 970 register BN_ULONG *r_d, *a_d = a->d;
842 union { 971 union {
843 BN_ULONG bn[BN_NIST_384_TOP]; 972 BN_ULONG bn[BN_NIST_384_TOP];
844 unsigned int ui[BN_NIST_384_TOP*sizeof(BN_ULONG)/sizeof(unsigned int)]; 973 unsigned int ui[BN_NIST_384_TOP *
845 } buf; 974 sizeof(BN_ULONG) / sizeof(unsigned int)];
846 BN_ULONG c_d[BN_NIST_384_TOP], 975 } buf;
847 *res; 976 BN_ULONG c_d[BN_NIST_384_TOP], *res;
848 uintptr_t mask; 977 uintptr_t mask;
849 union { bn_addsub_f f; uintptr_t p; } u; 978 union {
979 bn_addsub_f f;
980 uintptr_t p;
981 } u;
850 static const BIGNUM _bignum_nist_p_384_sqr = { 982 static const BIGNUM _bignum_nist_p_384_sqr = {
851 (BN_ULONG *)_nist_p_384_sqr, 983 (BN_ULONG *)_nist_p_384_sqr,
852 sizeof(_nist_p_384_sqr)/sizeof(_nist_p_384_sqr[0]), 984 sizeof(_nist_p_384_sqr) / sizeof(_nist_p_384_sqr[0]),
853 sizeof(_nist_p_384_sqr)/sizeof(_nist_p_384_sqr[0]), 985 sizeof(_nist_p_384_sqr) / sizeof(_nist_p_384_sqr[0]),
854 0,BN_FLG_STATIC_DATA }; 986 0,
855 987 BN_FLG_STATIC_DATA
988 };
856 989
857 field = &_bignum_nist_p_384; /* just to make sure */ 990 field = &_bignum_nist_p_384; /* just to make sure */
858 991
859 if (BN_is_negative(a) || BN_ucmp(a,&_bignum_nist_p_384_sqr)>=0) 992 if (BN_is_negative(a) || BN_ucmp(a, &_bignum_nist_p_384_sqr) >= 0)
860 return BN_nnmod(r, a, field, ctx); 993 return BN_nnmod(r, a, field, ctx);
861 994
862 i = BN_ucmp(field, a); 995 i = BN_ucmp(field, a);
863 if (i == 0) 996 if (i == 0) {
864 {
865 BN_zero(r); 997 BN_zero(r);
866 return 1; 998 return 1;
867 } 999 } else if (i > 0)
868 else if (i > 0) 1000 return (r == a) ? 1 : (BN_copy(r, a) != NULL);
869 return (r == a)? 1 : (BN_copy(r ,a) != NULL);
870 1001
871 if (r != a) 1002 if (r != a) {
872 {
873 if (!bn_wexpand(r, BN_NIST_384_TOP)) 1003 if (!bn_wexpand(r, BN_NIST_384_TOP))
874 return 0; 1004 return 0;
875 r_d = r->d; 1005 r_d = r->d;
876 nist_cp_bn(r_d, a_d, BN_NIST_384_TOP); 1006 nist_cp_bn(r_d, a_d, BN_NIST_384_TOP);
877 } 1007 } else
878 else
879 r_d = a_d; 1008 r_d = a_d;
880 1009
881 nist_cp_bn_0(buf.bn, a_d + BN_NIST_384_TOP, top - BN_NIST_384_TOP, BN_NIST_384_TOP); 1010 nist_cp_bn_0(buf.bn, a_d + BN_NIST_384_TOP,
1011 top - BN_NIST_384_TOP, BN_NIST_384_TOP);
882 1012
883#if defined(NIST_INT64) 1013#if defined(NIST_INT64)
884 { 1014 {
885 NIST_INT64 acc; /* accumulator */ 1015 NIST_INT64 acc; /* accumulator */
886 unsigned int *rp=(unsigned int *)r_d; 1016 unsigned int *rp = (unsigned int *)r_d;
887 const unsigned int *bp=(const unsigned int *)buf.ui; 1017 const unsigned int *bp = (const unsigned int *)buf.ui;
888 1018
889 acc = rp[0]; acc += bp[12-12]; 1019 acc = rp[0];
890 acc += bp[21-12]; 1020 acc += bp[12 - 12];
891 acc += bp[20-12]; 1021 acc += bp[21 - 12];
892 acc -= bp[23-12]; rp[0] = (unsigned int)acc; acc >>= 32; 1022 acc += bp[20 - 12];
893 1023 acc -= bp[23 - 12];
894 acc += rp[1]; acc += bp[13-12]; 1024 rp[0] = (unsigned int)acc;
895 acc += bp[22-12]; 1025 acc >>= 32;
896 acc += bp[23-12]; 1026
897 acc -= bp[12-12]; 1027 acc += rp[1];
898 acc -= bp[20-12]; rp[1] = (unsigned int)acc; acc >>= 32; 1028 acc += bp[13 - 12];
899 1029 acc += bp[22 - 12];
900 acc += rp[2]; acc += bp[14-12]; 1030 acc += bp[23 - 12];
901 acc += bp[23-12]; 1031 acc -= bp[12 - 12];
902 acc -= bp[13-12]; 1032 acc -= bp[20 - 12];
903 acc -= bp[21-12]; rp[2] = (unsigned int)acc; acc >>= 32; 1033 rp[1] = (unsigned int)acc;
904 1034 acc >>= 32;
905 acc += rp[3]; acc += bp[15-12]; 1035
906 acc += bp[12-12]; 1036 acc += rp[2];
907 acc += bp[20-12]; 1037 acc += bp[14 - 12];
908 acc += bp[21-12]; 1038 acc += bp[23 - 12];
909 acc -= bp[14-12]; 1039 acc -= bp[13 - 12];
910 acc -= bp[22-12]; 1040 acc -= bp[21 - 12];
911 acc -= bp[23-12]; rp[3] = (unsigned int)acc; acc >>= 32; 1041 rp[2] = (unsigned int)acc;
912 1042 acc >>= 32;
913 acc += rp[4]; acc += bp[21-12]; 1043
914 acc += bp[21-12]; 1044 acc += rp[3];
915 acc += bp[16-12]; 1045 acc += bp[15 - 12];
916 acc += bp[13-12]; 1046 acc += bp[12 - 12];
917 acc += bp[12-12]; 1047 acc += bp[20 - 12];
918 acc += bp[20-12]; 1048 acc += bp[21 - 12];
919 acc += bp[22-12]; 1049 acc -= bp[14 - 12];
920 acc -= bp[15-12]; 1050 acc -= bp[22 - 12];
921 acc -= bp[23-12]; 1051 acc -= bp[23 - 12];
922 acc -= bp[23-12]; rp[4] = (unsigned int)acc; acc >>= 32; 1052 rp[3] = (unsigned int)acc;
923 1053 acc >>= 32;
924 acc += rp[5]; acc += bp[22-12]; 1054
925 acc += bp[22-12]; 1055 acc += rp[4];
926 acc += bp[17-12]; 1056 acc += bp[21 - 12];
927 acc += bp[14-12]; 1057 acc += bp[21 - 12];
928 acc += bp[13-12]; 1058 acc += bp[16 - 12];
929 acc += bp[21-12]; 1059 acc += bp[13 - 12];
930 acc += bp[23-12]; 1060 acc += bp[12 - 12];
931 acc -= bp[16-12]; rp[5] = (unsigned int)acc; acc >>= 32; 1061 acc += bp[20 - 12];
932 1062 acc += bp[22 - 12];
933 acc += rp[6]; acc += bp[23-12]; 1063 acc -= bp[15 - 12];
934 acc += bp[23-12]; 1064 acc -= bp[23 - 12];
935 acc += bp[18-12]; 1065 acc -= bp[23 - 12];
936 acc += bp[15-12]; 1066 rp[4] = (unsigned int)acc;
937 acc += bp[14-12]; 1067 acc >>= 32;
938 acc += bp[22-12]; 1068
939 acc -= bp[17-12]; rp[6] = (unsigned int)acc; acc >>= 32; 1069 acc += rp[5];
940 1070 acc += bp[22 - 12];
941 acc += rp[7]; acc += bp[19-12]; 1071 acc += bp[22 - 12];
942 acc += bp[16-12]; 1072 acc += bp[17 - 12];
943 acc += bp[15-12]; 1073 acc += bp[14 - 12];
944 acc += bp[23-12]; 1074 acc += bp[13 - 12];
945 acc -= bp[18-12]; rp[7] = (unsigned int)acc; acc >>= 32; 1075 acc += bp[21 - 12];
946 1076 acc += bp[23 - 12];
947 acc += rp[8]; acc += bp[20-12]; 1077 acc -= bp[16 - 12];
948 acc += bp[17-12]; 1078 rp[5] = (unsigned int)acc;
949 acc += bp[16-12]; 1079 acc >>= 32;
950 acc -= bp[19-12]; rp[8] = (unsigned int)acc; acc >>= 32; 1080
951 1081 acc += rp[6];
952 acc += rp[9]; acc += bp[21-12]; 1082 acc += bp[23 - 12];
953 acc += bp[18-12]; 1083 acc += bp[23 - 12];
954 acc += bp[17-12]; 1084 acc += bp[18 - 12];
955 acc -= bp[20-12]; rp[9] = (unsigned int)acc; acc >>= 32; 1085 acc += bp[15 - 12];
956 1086 acc += bp[14 - 12];
957 acc += rp[10]; acc += bp[22-12]; 1087 acc += bp[22 - 12];
958 acc += bp[19-12]; 1088 acc -= bp[17 - 12];
959 acc += bp[18-12]; 1089 rp[6] = (unsigned int)acc;
960 acc -= bp[21-12]; rp[10] = (unsigned int)acc; acc >>= 32; 1090 acc >>= 32;
961 1091
962 acc += rp[11]; acc += bp[23-12]; 1092 acc += rp[7];
963 acc += bp[20-12]; 1093 acc += bp[19 - 12];
964 acc += bp[19-12]; 1094 acc += bp[16 - 12];
965 acc -= bp[22-12]; rp[11] = (unsigned int)acc; 1095 acc += bp[15 - 12];
966 1096 acc += bp[23 - 12];
967 carry = (int)(acc>>32); 1097 acc -= bp[18 - 12];
1098 rp[7] = (unsigned int)acc;
1099 acc >>= 32;
1100
1101 acc += rp[8];
1102 acc += bp[20 - 12];
1103 acc += bp[17 - 12];
1104 acc += bp[16 - 12];
1105 acc -= bp[19 - 12];
1106 rp[8] = (unsigned int)acc;
1107 acc >>= 32;
1108
1109 acc += rp[9];
1110 acc += bp[21 - 12];
1111 acc += bp[18 - 12];
1112 acc += bp[17 - 12];
1113 acc -= bp[20 - 12];
1114 rp[9] = (unsigned int)acc;
1115 acc >>= 32;
1116
1117 acc += rp[10];
1118 acc += bp[22 - 12];
1119 acc += bp[19 - 12];
1120 acc += bp[18 - 12];
1121 acc -= bp[21 - 12];
1122 rp[10] = (unsigned int)acc;
1123 acc >>= 32;
1124
1125 acc += rp[11];
1126 acc += bp[23 - 12];
1127 acc += bp[20 - 12];
1128 acc += bp[19 - 12];
1129 acc -= bp[22 - 12];
1130 rp[11] = (unsigned int)acc;
1131
1132 carry = (int)(acc >> 32);
968 } 1133 }
969#else 1134#else
970 { 1135 {
971 BN_ULONG t_d[BN_NIST_384_TOP]; 1136 BN_ULONG t_d[BN_NIST_384_TOP];
972 1137
973 /*S1*/ 1138 /*S1*/
974 nist_set_256(t_d, buf.bn, 0, 0, 0, 0, 0, 23-4, 22-4, 21-4); 1139 nist_set_256(t_d, buf.bn, 0, 0, 0, 0, 0, 23 - 4, 22 - 4,
1140 21 - 4);
975 /* left shift */ 1141 /* left shift */
976 { 1142 {
977 register BN_ULONG *ap,t,c; 1143 register BN_ULONG *ap, t, c;
978 ap = t_d; 1144 ap = t_d;
979 c=0; 1145 c = 0;
980 for (i = 3; i != 0; --i) 1146 for (i = 3; i != 0; --i) {
981 { 1147 t= *ap;
982 t= *ap; 1148 *(ap++) = ((t << 1)|c) & BN_MASK2;
983 *(ap++)=((t<<1)|c)&BN_MASK2; 1149 c = (t & BN_TBIT) ? 1 : 0;
984 c=(t & BN_TBIT)?1:0;
985 } 1150 }
986 *ap=c; 1151 *ap = c;
987 } 1152 }
988 carry = (int)bn_add_words(r_d+(128/BN_BITS2), r_d+(128/BN_BITS2), 1153 carry = (int)bn_add_words(r_d + (128 / BN_BITS2),
989 t_d, BN_NIST_256_TOP); 1154 r_d + (128 / BN_BITS2), t_d, BN_NIST_256_TOP);
990 /*S2 */ 1155 /*S2 */
991 carry += (int)bn_add_words(r_d, r_d, buf.bn, BN_NIST_384_TOP); 1156 carry += (int)bn_add_words(r_d, r_d, buf.bn, BN_NIST_384_TOP);
992 /*S3*/ 1157 /*S3*/
993 nist_set_384(t_d,buf.bn,20,19,18,17,16,15,14,13,12,23,22,21); 1158 nist_set_384(t_d, buf.bn, 20, 19, 18, 17, 16, 15, 14, 13, 12,
994 carry += (int)bn_add_words(r_d, r_d, t_d, BN_NIST_384_TOP); 1159 23, 22, 21);
995 /*S4*/ 1160 carry += (int)bn_add_words(r_d, r_d, t_d, BN_NIST_384_TOP);
996 nist_set_384(t_d,buf.bn,19,18,17,16,15,14,13,12,20,0,23,0); 1161 /*S4*/
997 carry += (int)bn_add_words(r_d, r_d, t_d, BN_NIST_384_TOP); 1162 nist_set_384(t_d, buf.bn, 19, 18, 17, 16, 15, 14, 13, 12, 20,
998 /*S5*/ 1163 0, 23, 0);
999 nist_set_384(t_d, buf.bn,0,0,0,0,23,22,21,20,0,0,0,0); 1164 carry += (int)bn_add_words(r_d, r_d, t_d, BN_NIST_384_TOP);
1000 carry += (int)bn_add_words(r_d, r_d, t_d, BN_NIST_384_TOP); 1165 /*S5*/
1001 /*S6*/ 1166 nist_set_384(t_d, buf.bn, 0,0, 0,0, 23, 22, 21, 20, 0,0, 0, 0);
1002 nist_set_384(t_d,buf.bn,0,0,0,0,0,0,23,22,21,0,0,20); 1167 carry += (int)bn_add_words(r_d, r_d, t_d, BN_NIST_384_TOP);
1003 carry += (int)bn_add_words(r_d, r_d, t_d, BN_NIST_384_TOP); 1168 /*S6*/
1004 /*D1*/ 1169 nist_set_384(t_d, buf.bn, 0,0, 0,0, 0,0, 23, 22, 21, 0,0, 20);
1005 nist_set_384(t_d,buf.bn,22,21,20,19,18,17,16,15,14,13,12,23); 1170 carry += (int)bn_add_words(r_d, r_d, t_d, BN_NIST_384_TOP);
1006 carry -= (int)bn_sub_words(r_d, r_d, t_d, BN_NIST_384_TOP); 1171 /*D1*/
1007 /*D2*/ 1172 nist_set_384(t_d, buf.bn, 22, 21, 20, 19, 18, 17, 16, 15, 14,
1008 nist_set_384(t_d,buf.bn,0,0,0,0,0,0,0,23,22,21,20,0); 1173 13, 12, 23);
1009 carry -= (int)bn_sub_words(r_d, r_d, t_d, BN_NIST_384_TOP); 1174 carry -= (int)bn_sub_words(r_d, r_d, t_d, BN_NIST_384_TOP);
1010 /*D3*/ 1175 /*D2*/
1011 nist_set_384(t_d,buf.bn,0,0,0,0,0,0,0,23,23,0,0,0); 1176 nist_set_384(t_d, buf.bn, 0,0, 0,0, 0,0, 0,23, 22, 21, 20, 0);
1012 carry -= (int)bn_sub_words(r_d, r_d, t_d, BN_NIST_384_TOP); 1177 carry -= (int)bn_sub_words(r_d, r_d, t_d, BN_NIST_384_TOP);
1178 /*D3*/
1179 nist_set_384(t_d, buf.bn, 0,0, 0,0, 0,0, 0,23, 23, 0,0, 0);
1180 carry -= (int)bn_sub_words(r_d, r_d, t_d, BN_NIST_384_TOP);
1013 1181
1014 } 1182 }
1015#endif 1183#endif
1016 /* see BN_nist_mod_224 for explanation */ 1184 /* see BN_nist_mod_224 for explanation */
1017 u.f = bn_sub_words; 1185 u.f = bn_sub_words;
1018 if (carry > 0) 1186 if (carry > 0)
1019 carry = (int)bn_sub_words(r_d,r_d,_nist_p_384[carry-1],BN_NIST_384_TOP); 1187 carry = (int)bn_sub_words(r_d, r_d, _nist_p_384[carry - 1],
1020 else if (carry < 0) 1188 BN_NIST_384_TOP);
1021 { 1189 else if (carry < 0) {
1022 carry = (int)bn_add_words(r_d,r_d,_nist_p_384[-carry-1],BN_NIST_384_TOP); 1190 carry = (int)bn_add_words(r_d, r_d, _nist_p_384[-carry - 1],
1023 mask = 0-(uintptr_t)carry; 1191 BN_NIST_384_TOP);
1024 u.p = ((uintptr_t)bn_sub_words&mask) | 1192 mask = 0 - (uintptr_t)carry;
1025 ((uintptr_t)bn_add_words&~mask); 1193 u.p = ((uintptr_t)bn_sub_words & mask) |
1026 } 1194 ((uintptr_t)bn_add_words & ~mask);
1027 else 1195 } else
1028 carry = 1; 1196 carry = 1;
1029 1197
1030 mask = 0-(uintptr_t)(*u.f)(c_d,r_d,_nist_p_384[0],BN_NIST_384_TOP); 1198 mask = 0 - (uintptr_t)(*u.f)(c_d, r_d, _nist_p_384[0], BN_NIST_384_TOP);
1031 mask &= 0-(uintptr_t)carry; 1199 mask &= 0 - (uintptr_t)carry;
1032 res = c_d; 1200 res = c_d;
1033 res = (BN_ULONG *)(((uintptr_t)res&~mask) | ((uintptr_t)r_d&mask)); 1201 res = (BN_ULONG *)(((uintptr_t)res & ~mask) | ((uintptr_t)r_d & mask));
1034 nist_cp_bn(r_d, res, BN_NIST_384_TOP); 1202 nist_cp_bn(r_d, res, BN_NIST_384_TOP);
1035 r->top = BN_NIST_384_TOP; 1203 r->top = BN_NIST_384_TOP;
1036 bn_correct_top(r); 1204 bn_correct_top(r);
1037 1205
1038 return 1; 1206 return 1;
1039 } 1207}
1040 1208
1041#define BN_NIST_521_RSHIFT (521%BN_BITS2) 1209#define BN_NIST_521_RSHIFT (521%BN_BITS2)
1042#define BN_NIST_521_LSHIFT (BN_BITS2-BN_NIST_521_RSHIFT) 1210#define BN_NIST_521_LSHIFT (BN_BITS2-BN_NIST_521_RSHIFT)
1043#define BN_NIST_521_TOP_MASK ((BN_ULONG)BN_MASK2>>BN_NIST_521_LSHIFT) 1211#define BN_NIST_521_TOP_MASK ((BN_ULONG)BN_MASK2>>BN_NIST_521_LSHIFT)
1044 1212
1045int BN_nist_mod_521(BIGNUM *r, const BIGNUM *a, const BIGNUM *field, 1213int
1046 BN_CTX *ctx) 1214BN_nist_mod_521(BIGNUM *r, const BIGNUM *a, const BIGNUM *field, BN_CTX *ctx)
1047 { 1215{
1048 int top = a->top, i; 1216 int top = a->top, i;
1049 BN_ULONG *r_d, *a_d = a->d, 1217 BN_ULONG *r_d, *a_d = a->d, t_d[BN_NIST_521_TOP], val, tmp, *res;
1050 t_d[BN_NIST_521_TOP],
1051 val,tmp,*res;
1052 uintptr_t mask; 1218 uintptr_t mask;
1053 static const BIGNUM _bignum_nist_p_521_sqr = { 1219 static const BIGNUM _bignum_nist_p_521_sqr = {
1054 (BN_ULONG *)_nist_p_521_sqr, 1220 (BN_ULONG *)_nist_p_521_sqr,
1055 sizeof(_nist_p_521_sqr)/sizeof(_nist_p_521_sqr[0]), 1221 sizeof(_nist_p_521_sqr) / sizeof(_nist_p_521_sqr[0]),
1056 sizeof(_nist_p_521_sqr)/sizeof(_nist_p_521_sqr[0]), 1222 sizeof(_nist_p_521_sqr) / sizeof(_nist_p_521_sqr[0]),
1057 0,BN_FLG_STATIC_DATA }; 1223 0,
1224 BN_FLG_STATIC_DATA
1225 };
1058 1226
1059 field = &_bignum_nist_p_521; /* just to make sure */ 1227 field = &_bignum_nist_p_521; /* just to make sure */
1060 1228
1061 if (BN_is_negative(a) || BN_ucmp(a,&_bignum_nist_p_521_sqr)>=0) 1229 if (BN_is_negative(a) || BN_ucmp(a, &_bignum_nist_p_521_sqr) >= 0)
1062 return BN_nnmod(r, a, field, ctx); 1230 return BN_nnmod(r, a, field, ctx);
1063 1231
1064 i = BN_ucmp(field, a); 1232 i = BN_ucmp(field, a);
1065 if (i == 0) 1233 if (i == 0) {
1066 {
1067 BN_zero(r); 1234 BN_zero(r);
1068 return 1; 1235 return 1;
1069 } 1236 } else if (i > 0)
1070 else if (i > 0) 1237 return (r == a) ? 1 : (BN_copy(r, a) != NULL);
1071 return (r == a)? 1 : (BN_copy(r ,a) != NULL);
1072 1238
1073 if (r != a) 1239 if (r != a) {
1074 { 1240 if (!bn_wexpand(r, BN_NIST_521_TOP))
1075 if (!bn_wexpand(r,BN_NIST_521_TOP))
1076 return 0; 1241 return 0;
1077 r_d = r->d; 1242 r_d = r->d;
1078 nist_cp_bn(r_d,a_d, BN_NIST_521_TOP); 1243 nist_cp_bn(r_d, a_d, BN_NIST_521_TOP);
1079 } 1244 } else
1080 else
1081 r_d = a_d; 1245 r_d = a_d;
1082 1246
1083 /* upper 521 bits, copy ... */ 1247 /* upper 521 bits, copy ... */
1084 nist_cp_bn_0(t_d,a_d + (BN_NIST_521_TOP-1), top - (BN_NIST_521_TOP-1),BN_NIST_521_TOP); 1248 nist_cp_bn_0(t_d, a_d + (BN_NIST_521_TOP - 1),
1249 top - (BN_NIST_521_TOP - 1), BN_NIST_521_TOP);
1085 /* ... and right shift */ 1250 /* ... and right shift */
1086 for (val=t_d[0],i=0; i<BN_NIST_521_TOP-1; i++) 1251 for (val = t_d[0], i = 0; i < BN_NIST_521_TOP - 1; i++) {
1087 { 1252 tmp = val >> BN_NIST_521_RSHIFT;
1088 tmp = val>>BN_NIST_521_RSHIFT; 1253 val = t_d[i + 1];
1089 val = t_d[i+1]; 1254 t_d[i] = (tmp | val << BN_NIST_521_LSHIFT) & BN_MASK2;
1090 t_d[i] = (tmp | val<<BN_NIST_521_LSHIFT) & BN_MASK2; 1255 }
1091 } 1256 t_d[i] = val >> BN_NIST_521_RSHIFT;
1092 t_d[i] = val>>BN_NIST_521_RSHIFT;
1093 /* lower 521 bits */ 1257 /* lower 521 bits */
1094 r_d[i] &= BN_NIST_521_TOP_MASK; 1258 r_d[i] &= BN_NIST_521_TOP_MASK;
1095 1259
1096 bn_add_words(r_d,r_d,t_d,BN_NIST_521_TOP); 1260 bn_add_words(r_d, r_d, t_d, BN_NIST_521_TOP);
1097 mask = 0-(uintptr_t)bn_sub_words(t_d,r_d,_nist_p_521,BN_NIST_521_TOP); 1261 mask = 0 - (uintptr_t)bn_sub_words(t_d, r_d, _nist_p_521,
1098 res = t_d; 1262 BN_NIST_521_TOP);
1099 res = (BN_ULONG *)(((uintptr_t)res&~mask) | ((uintptr_t)r_d&mask)); 1263 res = t_d;
1100 nist_cp_bn(r_d,res,BN_NIST_521_TOP); 1264 res = (BN_ULONG *)(((uintptr_t)res & ~mask) | ((uintptr_t)r_d & mask));
1265 nist_cp_bn(r_d, res, BN_NIST_521_TOP);
1101 r->top = BN_NIST_521_TOP; 1266 r->top = BN_NIST_521_TOP;
1102 bn_correct_top(r); 1267 bn_correct_top(r);
1103 1268
1104 return 1; 1269 return 1;
1105 } 1270}
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-20 19:40:52 +0000