summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortb <>2018-04-23 09:37:50 +0000
committertb <>2018-04-23 09:37:50 +0000
commitb60026392c0597e05b7195e5619792287b4e747d (patch)
tree10de1bfc9825e4985d0747c3a21337c9a2ee830f
parent4ad57f9d67461c385bea411f91fcb7d49965a296 (diff)
downloadopenbsd-b60026392c0597e05b7195e5619792287b4e747d.tar.gz
openbsd-b60026392c0597e05b7195e5619792287b4e747d.tar.bz2
openbsd-b60026392c0597e05b7195e5619792287b4e747d.zip
Make whitespace between functions and structs a bit more consistent.
-rw-r--r--src/lib/libcrypto/ec/ec_asn1.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/lib/libcrypto/ec/ec_asn1.c b/src/lib/libcrypto/ec/ec_asn1.c
index 381addfcf6..8e960e0112 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.25 2018/03/12 13:14:21 inoguchi Exp $ */ 1/* $OpenBSD: ec_asn1.c,v 1.26 2018/04/23 09:37:50 tb Exp $ */
2/* 2/*
3 * Written by Nils Larsch for the OpenSSL project. 3 * Written by Nils Larsch for the OpenSSL project.
4 */ 4 */
@@ -86,6 +86,7 @@ EC_GROUP_get_basis_type(const EC_GROUP * group)
86 /* everything else is currently not supported */ 86 /* everything else is currently not supported */
87 return 0; 87 return 0;
88} 88}
89
89#ifndef OPENSSL_NO_EC2M 90#ifndef OPENSSL_NO_EC2M
90int 91int
91EC_GROUP_get_trinomial_basis(const EC_GROUP * group, unsigned int *k) 92EC_GROUP_get_trinomial_basis(const EC_GROUP * group, unsigned int *k)
@@ -104,6 +105,7 @@ EC_GROUP_get_trinomial_basis(const EC_GROUP * group, unsigned int *k)
104 105
105 return 1; 106 return 1;
106} 107}
108
107int 109int
108EC_GROUP_get_pentanomial_basis(const EC_GROUP * group, unsigned int *k1, 110EC_GROUP_get_pentanomial_basis(const EC_GROUP * group, unsigned int *k1,
109 unsigned int *k2, unsigned int *k3) 111 unsigned int *k2, unsigned int *k3)
@@ -128,7 +130,6 @@ EC_GROUP_get_pentanomial_basis(const EC_GROUP * group, unsigned int *k1,
128} 130}
129#endif 131#endif
130 132
131
132/* some structures needed for the asn1 encoding */ 133/* some structures needed for the asn1 encoding */
133typedef struct x9_62_pentanomial_st { 134typedef struct x9_62_pentanomial_st {
134 long k1; 135 long k1;
@@ -334,6 +335,7 @@ const ASN1_ITEM X9_62_CHARACTERISTIC_TWO_it = {
334 .size = sizeof(X9_62_CHARACTERISTIC_TWO), 335 .size = sizeof(X9_62_CHARACTERISTIC_TWO),
335 .sname = "X9_62_CHARACTERISTIC_TWO", 336 .sname = "X9_62_CHARACTERISTIC_TWO",
336}; 337};
338
337X9_62_CHARACTERISTIC_TWO *X9_62_CHARACTERISTIC_TWO_new(void); 339X9_62_CHARACTERISTIC_TWO *X9_62_CHARACTERISTIC_TWO_new(void);
338void X9_62_CHARACTERISTIC_TWO_free(X9_62_CHARACTERISTIC_TWO *a); 340void X9_62_CHARACTERISTIC_TWO_free(X9_62_CHARACTERISTIC_TWO *a);
339 341
@@ -348,6 +350,7 @@ X9_62_CHARACTERISTIC_TWO_free(X9_62_CHARACTERISTIC_TWO *a)
348{ 350{
349 ASN1_item_free((ASN1_VALUE *)a, &X9_62_CHARACTERISTIC_TWO_it); 351 ASN1_item_free((ASN1_VALUE *)a, &X9_62_CHARACTERISTIC_TWO_it);
350} 352}
353
351static const ASN1_TEMPLATE fieldID_def_tt = { 354static const ASN1_TEMPLATE fieldID_def_tt = {
352 .flags = 0, 355 .flags = 0,
353 .tag = 0, 356 .tag = 0,
@@ -506,6 +509,7 @@ const ASN1_ITEM ECPARAMETERS_it = {
506 .size = sizeof(ECPARAMETERS), 509 .size = sizeof(ECPARAMETERS),
507 .sname = "ECPARAMETERS", 510 .sname = "ECPARAMETERS",
508}; 511};
512
509ECPARAMETERS *ECPARAMETERS_new(void); 513ECPARAMETERS *ECPARAMETERS_new(void);
510void ECPARAMETERS_free(ECPARAMETERS *a); 514void ECPARAMETERS_free(ECPARAMETERS *a);
511 515
@@ -655,6 +659,7 @@ EC_PRIVATEKEY_free(EC_PRIVATEKEY *a)
655{ 659{
656 ASN1_item_free((ASN1_VALUE *)a, &EC_PRIVATEKEY_it); 660 ASN1_item_free((ASN1_VALUE *)a, &EC_PRIVATEKEY_it);
657} 661}
662
658/* some declarations of internal function */ 663/* some declarations of internal function */
659 664
660/* ec_asn1_group2field() sets the values in a X9_62_FIELDID object */ 665/* ec_asn1_group2field() sets the values in a X9_62_FIELDID object */
@@ -675,7 +680,6 @@ static EC_GROUP *ec_asn1_pkparameters2group(const ECPKPARAMETERS *);
675static ECPKPARAMETERS *ec_asn1_group2pkparameters(const EC_GROUP *, 680static ECPKPARAMETERS *ec_asn1_group2pkparameters(const EC_GROUP *,
676 ECPKPARAMETERS *); 681 ECPKPARAMETERS *);
677 682
678
679/* the function definitions */ 683/* the function definitions */
680 684
681static int 685static int