diff options
| author | tb <> | 2023-05-03 06:30:11 +0000 |
|---|---|---|
| committer | tb <> | 2023-05-03 06:30:11 +0000 |
| commit | 1a56c1c948cf165ef0ce5510c3bf7802747ad59b (patch) | |
| tree | 943a9f3b21ecff342074c3b2bca9887e6669ff34 /src | |
| parent | 139ed337f60fd763a12e67f61bdf1d767326e9ad (diff) | |
| download | openbsd-1a56c1c948cf165ef0ce5510c3bf7802747ad59b.tar.gz openbsd-1a56c1c948cf165ef0ce5510c3bf7802747ad59b.tar.bz2 openbsd-1a56c1c948cf165ef0ce5510c3bf7802747ad59b.zip | |
Fix a few KNF/whitespace issues
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/libcrypto/ec/ec_asn1.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/lib/libcrypto/ec/ec_asn1.c b/src/lib/libcrypto/ec/ec_asn1.c index c62ba226f0..7cec5bbcfa 100644 --- a/src/lib/libcrypto/ec/ec_asn1.c +++ b/src/lib/libcrypto/ec/ec_asn1.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: ec_asn1.c,v 1.42 2023/04/25 19:53:30 tb Exp $ */ | 1 | /* $OpenBSD: ec_asn1.c,v 1.43 2023/05/03 06:30:11 tb Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * Written by Nils Larsch for the OpenSSL project. | 3 | * Written by Nils Larsch for the OpenSSL project. |
| 4 | */ | 4 | */ |
| @@ -225,7 +225,6 @@ static const ASN1_ADB_TABLE X9_62_CHARACTERISTIC_TWO_adbtbl[] = { | |||
| 225 | .field_name = "p.onBasis", | 225 | .field_name = "p.onBasis", |
| 226 | .item = &ASN1_NULL_it, | 226 | .item = &ASN1_NULL_it, |
| 227 | }, | 227 | }, |
| 228 | |||
| 229 | }, | 228 | }, |
| 230 | { | 229 | { |
| 231 | .value = NID_X9_62_tpBasis, | 230 | .value = NID_X9_62_tpBasis, |
| @@ -236,7 +235,6 @@ static const ASN1_ADB_TABLE X9_62_CHARACTERISTIC_TWO_adbtbl[] = { | |||
| 236 | .field_name = "p.tpBasis", | 235 | .field_name = "p.tpBasis", |
| 237 | .item = &ASN1_INTEGER_it, | 236 | .item = &ASN1_INTEGER_it, |
| 238 | }, | 237 | }, |
| 239 | |||
| 240 | }, | 238 | }, |
| 241 | { | 239 | { |
| 242 | .value = NID_X9_62_ppBasis, | 240 | .value = NID_X9_62_ppBasis, |
| @@ -327,7 +325,6 @@ static const ASN1_ADB_TABLE X9_62_FIELDID_adbtbl[] = { | |||
| 327 | .field_name = "p.prime", | 325 | .field_name = "p.prime", |
| 328 | .item = &ASN1_INTEGER_it, | 326 | .item = &ASN1_INTEGER_it, |
| 329 | }, | 327 | }, |
| 330 | |||
| 331 | }, | 328 | }, |
| 332 | { | 329 | { |
| 333 | .value = NID_X9_62_characteristic_two_field, | 330 | .value = NID_X9_62_characteristic_two_field, |
| @@ -338,7 +335,6 @@ static const ASN1_ADB_TABLE X9_62_FIELDID_adbtbl[] = { | |||
| 338 | .field_name = "p.char_two", | 335 | .field_name = "p.char_two", |
| 339 | .item = &X9_62_CHARACTERISTIC_TWO_it, | 336 | .item = &X9_62_CHARACTERISTIC_TWO_it, |
| 340 | }, | 337 | }, |
| 341 | |||
| 342 | }, | 338 | }, |
| 343 | }; | 339 | }; |
| 344 | 340 | ||
| @@ -1098,7 +1094,7 @@ ec_asn1_pkparameters2group(const ECPKPARAMETERS *params) | |||
| 1098 | /* EC_GROUP <-> DER encoding of ECPKPARAMETERS */ | 1094 | /* EC_GROUP <-> DER encoding of ECPKPARAMETERS */ |
| 1099 | 1095 | ||
| 1100 | EC_GROUP * | 1096 | EC_GROUP * |
| 1101 | d2i_ECPKParameters(EC_GROUP ** a, const unsigned char **in, long len) | 1097 | d2i_ECPKParameters(EC_GROUP **a, const unsigned char **in, long len) |
| 1102 | { | 1098 | { |
| 1103 | EC_GROUP *group = NULL; | 1099 | EC_GROUP *group = NULL; |
| 1104 | ECPKPARAMETERS *params; | 1100 | ECPKPARAMETERS *params; |
| @@ -1143,7 +1139,7 @@ i2d_ECPKParameters(const EC_GROUP *a, unsigned char **out) | |||
| 1143 | /* some EC_KEY functions */ | 1139 | /* some EC_KEY functions */ |
| 1144 | 1140 | ||
| 1145 | EC_KEY * | 1141 | EC_KEY * |
| 1146 | d2i_ECPrivateKey(EC_KEY ** a, const unsigned char **in, long len) | 1142 | d2i_ECPrivateKey(EC_KEY **a, const unsigned char **in, long len) |
| 1147 | { | 1143 | { |
| 1148 | EC_KEY *ret = NULL; | 1144 | EC_KEY *ret = NULL; |
| 1149 | EC_PRIVATEKEY *priv_key = NULL; | 1145 | EC_PRIVATEKEY *priv_key = NULL; |
| @@ -1329,7 +1325,7 @@ i2d_ECParameters(EC_KEY *a, unsigned char **out) | |||
| 1329 | } | 1325 | } |
| 1330 | 1326 | ||
| 1331 | EC_KEY * | 1327 | EC_KEY * |
| 1332 | d2i_ECParameters(EC_KEY ** a, const unsigned char **in, long len) | 1328 | d2i_ECParameters(EC_KEY **a, const unsigned char **in, long len) |
| 1333 | { | 1329 | { |
| 1334 | EC_KEY *ret; | 1330 | EC_KEY *ret; |
| 1335 | 1331 | ||
| @@ -1358,7 +1354,7 @@ d2i_ECParameters(EC_KEY ** a, const unsigned char **in, long len) | |||
| 1358 | } | 1354 | } |
| 1359 | 1355 | ||
| 1360 | EC_KEY * | 1356 | EC_KEY * |
| 1361 | o2i_ECPublicKey(EC_KEY ** a, const unsigned char **in, long len) | 1357 | o2i_ECPublicKey(EC_KEY **a, const unsigned char **in, long len) |
| 1362 | { | 1358 | { |
| 1363 | EC_KEY *ret = NULL; | 1359 | EC_KEY *ret = NULL; |
| 1364 | 1360 | ||
