Skip to content
This repository was archived by the owner on Feb 17, 2025. It is now read-only.

Commit 4dcb9b1

Browse files
nemothenoonenemothenoone
committed
Minor renamings done #3 
1 parent b814bcb commit 4dcb9b1

File tree

2 files changed

+34
-34
lines changed

2 files changed

+34
-34
lines changed

‎include/nil/crypto3/pubkey/bls.hpp

+33-33
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
#include <nil/crypto3/hash/sha2.hpp>
4848

4949
#include <nil/crypto3/pubkey/detail/bls/bls_basic_policy.hpp>
50-
#include <nil/crypto3/pubkey/detail/bls/bls_core_functions.hpp>
50+
#include <nil/crypto3/pubkey/detail/bls/bls_basic_functions.hpp>
5151
#include <nil/crypto3/pubkey/detail/stream_processor.hpp>
5252
#include <nil/crypto3/pubkey/private_key.hpp>
5353
#include <nil/crypto3/pubkey/no_key_ops.hpp>
@@ -64,53 +64,53 @@ namespace nil {
6464
struct bls_basic_scheme {
6565
typedef SignatureVariant signature_variant;
6666
typedef typename signature_variant::policy_type policy_type;
67-
typedef typename signature_variant::core_functions core_functions;
67+
typedef typename signature_variant::basic_functions basic_functions;
6868

6969
typedef typename policy_type::private_key_type private_key_type;
7070
typedef typename policy_type::public_key_type public_key_type;
7171
typedef typename policy_type::signature_type signature_type;
7272
typedef typename policy_type::pubkey_id_type pubkey_id_type;
7373

7474
static inline pubkey_id_type get_pubkey_bits(const public_key_type &pubkey) {
75-
return core_functions::get_pubkey_bits(pubkey);
75+
return basic_functions::get_pubkey_bits(pubkey);
7676
}
7777

7878
static inline public_key_type generate_public_key(const private_key_type &privkey) {
79-
return core_functions::privkey_to_pubkey(privkey);
79+
return basic_functions::privkey_to_pubkey(privkey);
8080
}
8181

8282
template<typename MsgRange>
8383
static inline signature_type sign(const private_key_type &privkey, const MsgRange &message) {
84-
return core_functions::core_sign(privkey, message, public_params::dst);
84+
return basic_functions::core_sign(privkey, message, public_params::dst);
8585
}
8686

8787
template<typename MsgRange>
8888
static inline bool verify(const public_key_type &pubkey, const MsgRange &message,
8989
const signature_type &signature) {
90-
return core_functions::core_verify(pubkey, message, public_params::dst, signature);
90+
return basic_functions::core_verify(pubkey, message, public_params::dst, signature);
9191
}
9292

9393
static inline signature_type aggregate(const signature_type &init_signature,
9494
const signature_type &signature) {
95-
return core_functions::core_aggregate(init_signature, signature);
95+
return basic_functions::core_aggregate(init_signature, signature);
9696
}
9797

9898
template<typename SignatureRange>
9999
static inline signature_type aggregate(const SignatureRange &signatures) {
100-
return core_functions::core_aggregate(signatures);
100+
return basic_functions::core_aggregate(signatures);
101101
}
102102

103103
template<typename SignatureRange>
104104
static inline signature_type aggregate(const signature_type &init_signature,
105105
const SignatureRange &signatures) {
106-
return core_functions::core_aggregate(init_signature, signatures);
106+
return basic_functions::core_aggregate(init_signature, signatures);
107107
}
108108

109109
template<typename PubkeyRange, typename MsgsRange>
110110
static inline bool aggregate_verify(const PubkeyRange &pubkeys, const MsgsRange &messages,
111111
const signature_type &signature) {
112112
// TODO: add check - If any two input messages are equal, return INVALID.
113-
return core_functions::core_aggregate_verify(pubkeys, messages, public_params::dst, signature);
113+
return basic_functions::core_aggregate_verify(pubkeys, messages, public_params::dst, signature);
114114
}
115115
};
116116

@@ -122,51 +122,51 @@ namespace nil {
122122
struct bls_aug_scheme {
123123
typedef SignatureVariant signature_variant;
124124
typedef typename signature_variant::policy_type policy_type;
125-
typedef typename signature_variant::core_functions core_functions;
125+
typedef typename signature_variant::basic_functions basic_functions;
126126

127127
typedef typename policy_type::private_key_type private_key_type;
128128
typedef typename policy_type::public_key_type public_key_type;
129129
typedef typename policy_type::signature_type signature_type;
130130
typedef typename policy_type::pubkey_id_type pubkey_id_type;
131131

132132
static inline pubkey_id_type get_pubkey_bits(const public_key_type &pubkey) {
133-
return core_functions::get_pubkey_bits(pubkey);
133+
return basic_functions::get_pubkey_bits(pubkey);
134134
}
135135

136136
static inline public_key_type generate_public_key(const private_key_type &privkey) {
137-
return core_functions::privkey_to_pubkey(privkey);
137+
return basic_functions::privkey_to_pubkey(privkey);
138138
}
139139

140140
// TODO: implement an interface that takes the public key as input
141141
template<typename MsgRange>
142142
static inline signature_type sign(const private_key_type &privkey, const MsgRange &message) {
143143
public_key_type pubkey = generate_public_key(privkey);
144-
return core_functions::core_sign(privkey, core_functions::pk_conc_msg(pubkey, message),
145-
public_params::dst);
144+
return basic_functions::core_sign(privkey, basic_functions::pk_conc_msg(pubkey, message),
145+
public_params::dst);
146146
}
147147

148148
template<typename MsgRange>
149149
static inline bool verify(const public_key_type &pubkey, const MsgRange &message,
150150
const signature_type &signature) {
151-
return core_functions::core_verify(pubkey, core_functions::pk_conc_msg(pubkey, message),
152-
public_params::dst, signature);
151+
return basic_functions::core_verify(pubkey, basic_functions::pk_conc_msg(pubkey, message),
152+
public_params::dst, signature);
153153
}
154154

155155
template<typename SignatureRange>
156156
static inline signature_type aggregate(const SignatureRange &signatures) {
157-
return core_functions::core_aggregate(signatures);
157+
return basic_functions::core_aggregate(signatures);
158158
}
159159

160160
template<typename SignatureRange>
161161
static inline signature_type aggregate(const signature_type &init_signature,
162162
const SignatureRange &signatures) {
163-
return core_functions::core_aggregate(init_signature, signatures);
163+
return basic_functions::core_aggregate(init_signature, signatures);
164164
}
165165

166166
template<typename PubkeyRange, typename MsgsRange>
167167
static inline bool aggregate_verify(const PubkeyRange &pubkeys, const MsgsRange &messages,
168168
const signature_type &signature) {
169-
return core_functions::aug_aggregate_verify(pubkeys, messages, public_params::dst, signature);
169+
return basic_functions::aug_aggregate_verify(pubkeys, messages, public_params::dst, signature);
170170
}
171171
};
172172

@@ -178,62 +178,62 @@ namespace nil {
178178
struct bls_pop_scheme {
179179
typedef SignatureVariant signature_variant;
180180
typedef typename signature_variant::policy_type policy_type;
181-
typedef typename signature_variant::core_functions core_functions;
181+
typedef typename signature_variant::basic_functions basic_functions;
182182

183183
typedef typename policy_type::private_key_type private_key_type;
184184
typedef typename policy_type::public_key_type public_key_type;
185185
typedef typename policy_type::signature_type signature_type;
186186
typedef typename policy_type::pubkey_id_type pubkey_id_type;
187187

188188
static inline pubkey_id_type get_pubkey_bits(const public_key_type &pubkey) {
189-
return core_functions::get_pubkey_bits(pubkey);
189+
return basic_functions::get_pubkey_bits(pubkey);
190190
}
191191

192192
static inline public_key_type generate_public_key(const private_key_type &privkey) {
193-
return core_functions::privkey_to_pubkey(privkey);
193+
return basic_functions::privkey_to_pubkey(privkey);
194194
}
195195

196196
static inline signature_type pop_prove(const private_key_type &privkey) {
197-
return core_functions::pop_prove(privkey, public_params::pop_dst);
197+
return basic_functions::pop_prove(privkey, public_params::pop_dst);
198198
}
199199

200200
static inline bool pop_verify(const public_key_type &pubkey, const signature_type &proof) {
201-
return core_functions::pop_verify(pubkey, public_params::pop_dst, proof);
201+
return basic_functions::pop_verify(pubkey, public_params::pop_dst, proof);
202202
}
203203

204204
template<typename PubkeyRange, typename MsgRange>
205205
static inline bool fast_aggregate_verify(const PubkeyRange &pubkeys, const MsgRange &message,
206206
const signature_type &signature) {
207-
return core_functions::fast_aggregate_verify(pubkeys, message, public_params::dst, signature);
207+
return basic_functions::fast_aggregate_verify(pubkeys, message, public_params::dst, signature);
208208
}
209209

210210
// protected:
211211
template<typename MsgRange>
212212
static inline signature_type sign(const private_key_type &privkey, const MsgRange &message) {
213-
return core_functions::core_sign(privkey, message, public_params::dst);
213+
return basic_functions::core_sign(privkey, message, public_params::dst);
214214
}
215215

216216
template<typename MsgRange>
217217
static inline bool verify(const public_key_type &pubkey, const MsgRange &message,
218218
const signature_type &signature) {
219-
return core_functions::core_verify(pubkey, message, public_params::dst, signature);
219+
return basic_functions::core_verify(pubkey, message, public_params::dst, signature);
220220
}
221221

222222
template<typename SignatureRange>
223223
static inline signature_type aggregate(const SignatureRange &signatures) {
224-
return core_functions::core_aggregate(signatures);
224+
return basic_functions::core_aggregate(signatures);
225225
}
226226

227227
template<typename SignatureRange>
228228
static inline signature_type aggregate(const signature_type &init_signature,
229229
const SignatureRange &signatures) {
230-
return core_functions::core_aggregate(init_signature, signatures);
230+
return basic_functions::core_aggregate(init_signature, signatures);
231231
}
232232

233233
template<typename PubkeyRange, typename MsgsRange>
234234
static inline bool aggregate_verify(const PubkeyRange &pubkeys, const MsgsRange &messages,
235235
const signature_type &signature) {
236-
return core_functions::core_aggregate_verify(pubkeys, messages, public_params::dst, signature);
236+
return basic_functions::core_aggregate_verify(pubkeys, messages, public_params::dst, signature);
237237
}
238238
};
239239
} // namespace detail
@@ -248,7 +248,7 @@ namespace nil {
248248
typedef HashType hash_type;
249249

250250
typedef detail::bls_mss_ro_policy<curve_type, hash_type> policy_type;
251-
typedef detail::bls_core_functions<policy_type> core_functions;
251+
typedef detail::bls_basic_functions<policy_type> basic_functions;
252252
};
253253

254254
//
@@ -261,7 +261,7 @@ namespace nil {
261261
typedef HashType hash_type;
262262

263263
typedef detail::bls_mps_ro_policy<curve_type, hash_type> policy_type;
264-
typedef detail::bls_core_functions<policy_type> core_functions;
264+
typedef detail::bls_basic_functions<policy_type> basic_functions;
265265
};
266266

267267
enum class bls_scheme_enum { basic, aug, pop };

‎include/nil/crypto3/pubkey/detail/bls/bls_core_functions.hpp ‎include/nil/crypto3/pubkey/detail/bls/bls_basic_functions.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ namespace nil {
4747
using namespace nil::crypto3::algebra::curves::detail;
4848

4949
template<typename policy_type>
50-
struct bls_core_functions {
50+
struct bls_basic_functions {
5151
typedef typename policy_type::curve_type curve_type;
5252
typedef typename policy_type::hash_type hash_type;
5353
typedef typename policy_type::modulus_type modulus_type;

0 commit comments

Comments
 (0)