Skip to content

Commit cfcffd0

Browse files
guanzhiguanzhi
committed
Clean SM2 and SM3
1 parent 934a66e commit cfcffd0

7 files changed

Lines changed: 5123 additions & 5346 deletions

File tree

‎crypto/sm2/build.info‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
LIBS=../../libcrypto
22
SOURCE[../../libcrypto]=sm2_err.c sm2_asn1.c sm2_id.c sm2_sign.c sm2_enc.c \
3-
sm2_oct.c sm2_exch.c sm2_kmeth.c sm2_cosign.c
3+
sm2_oct.c sm2_exch.c sm2_kmeth.c

‎crypto/sm2/sm2_asn1.c‎

Lines changed: 0 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -142,71 +142,3 @@ int i2d_SM2CiphertextValue_fp(FILE *fp, SM2CiphertextValue *a)
142142
return ASN1_item_i2d_fp(ASN1_ITEM_rptr(SM2CiphertextValue), fp, a);
143143
}
144144
#endif
145-
146-
ASN1_SEQUENCE(SM2_COSIGNER1_SHARE) = {
147-
ASN1_SIMPLE(SM2_COSIGNER1_SHARE, a, BIGNUM),
148-
ASN1_SIMPLE(SM2_COSIGNER1_SHARE, b, BIGNUM)
149-
} ASN1_SEQUENCE_END(SM2_COSIGNER1_SHARE)
150-
IMPLEMENT_ASN1_FUNCTIONS(SM2_COSIGNER1_SHARE)
151-
IMPLEMENT_ASN1_DUP_FUNCTION(SM2_COSIGNER1_SHARE)
152-
153-
ASN1_SEQUENCE(SM2_COSIGNER2_SHARE) = {
154-
ASN1_SIMPLE(SM2_COSIGNER2_SHARE, a, BIGNUM),
155-
ASN1_SIMPLE(SM2_COSIGNER2_SHARE, b, BIGNUM)
156-
} ASN1_SEQUENCE_END(SM2_COSIGNER2_SHARE)
157-
IMPLEMENT_ASN1_FUNCTIONS(SM2_COSIGNER2_SHARE)
158-
IMPLEMENT_ASN1_DUP_FUNCTION(SM2_COSIGNER2_SHARE)
159-
160-
ASN1_SEQUENCE(SM2_COSIGNER1_PROOF) = {
161-
ASN1_SIMPLE(SM2_COSIGNER1_PROOF, a, BIGNUM),
162-
ASN1_SIMPLE(SM2_COSIGNER1_PROOF, b, BIGNUM)
163-
} ASN1_SEQUENCE_END(SM2_COSIGNER1_PROOF)
164-
IMPLEMENT_ASN1_FUNCTIONS(SM2_COSIGNER1_PROOF)
165-
IMPLEMENT_ASN1_DUP_FUNCTION(SM2_COSIGNER1_PROOF)
166-
167-
ASN1_SEQUENCE(SM2_COSIGNER2_PROOF) = {
168-
ASN1_SIMPLE(SM2_COSIGNER2_PROOF, a, BIGNUM),
169-
ASN1_SIMPLE(SM2_COSIGNER2_PROOF, b, BIGNUM)
170-
} ASN1_SEQUENCE_END(SM2_COSIGNER2_PROOF)
171-
IMPLEMENT_ASN1_FUNCTIONS(SM2_COSIGNER2_PROOF)
172-
IMPLEMENT_ASN1_DUP_FUNCTION(SM2_COSIGNER2_PROOF)
173-
174-
int i2d_SM2_COSIGNER1_SHARE_bio(BIO *bp, SM2_COSIGNER1_SHARE *a)
175-
{
176-
return ASN1_item_i2d_bio(ASN1_ITEM_rptr(SM2_COSIGNER1_SHARE), bp, a);
177-
}
178-
179-
SM2_COSIGNER1_SHARE *d2i_SM2_COSIGNER1_SHARE_bio(BIO *bp, SM2_COSIGNER1_SHARE **a)
180-
{
181-
return ASN1_item_d2i_bio(ASN1_ITEM_rptr(SM2_COSIGNER1_SHARE), bp, a);
182-
}
183-
184-
int i2d_SM2_COSIGNER2_SHARE_bio(BIO *bp, SM2_COSIGNER2_SHARE *a)
185-
{
186-
return ASN1_item_i2d_bio(ASN1_ITEM_rptr(SM2_COSIGNER2_SHARE), bp, a);
187-
}
188-
189-
SM2_COSIGNER2_SHARE *d2i_SM2_COSIGNER2_SHARE_bio(BIO *bp, SM2_COSIGNER2_SHARE **a)
190-
{
191-
return ASN1_item_d2i_bio(ASN1_ITEM_rptr(SM2_COSIGNER2_SHARE), bp, a);
192-
}
193-
194-
int i2d_SM2_COSIGNER1_PROOF_bio(BIO *bp, SM2_COSIGNER1_PROOF *a)
195-
{
196-
return ASN1_item_i2d_bio(ASN1_ITEM_rptr(SM2_COSIGNER1_PROOF), bp, a);
197-
}
198-
199-
SM2_COSIGNER1_PROOF *d2i_SM2_COSIGNER1_PROOF_bio(BIO *bp, SM2_COSIGNER1_PROOF **a)
200-
{
201-
return ASN1_item_d2i_bio(ASN1_ITEM_rptr(SM2_COSIGNER1_PROOF), bp, a);
202-
}
203-
204-
int i2d_SM2_COSIGNER2_PROOF_bio(BIO *bp, SM2_COSIGNER2_PROOF *a)
205-
{
206-
return ASN1_item_i2d_bio(ASN1_ITEM_rptr(SM2_COSIGNER2_PROOF), bp, a);
207-
}
208-
209-
SM2_COSIGNER2_PROOF *d2i_SM2_COSIGNER2_PROOF_bio(BIO *bp, SM2_COSIGNER2_PROOF **a)
210-
{
211-
return ASN1_item_d2i_bio(ASN1_ITEM_rptr(SM2_COSIGNER2_PROOF), bp, a);
212-
}

‎crypto/sm2/sm2_cosign.c‎

Lines changed: 0 additions & 90 deletions
This file was deleted.

‎crypto/sm3/sm3.c‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,6 @@
4646
* OF THE POSSIBILITY OF SUCH DAMAGE.
4747
* ====================================================================
4848
*/
49-
/* This implementation is a very straitforward implementaton of the SM3
50-
* specification without any optimization tricks. It is also designed
51-
* as a standalone module that can be ported.
52-
*/
5349

5450
#include <string.h>
5551
#include <openssl/sm3.h>
@@ -148,7 +144,6 @@ void sm3_compress(uint32_t digest[8], const unsigned char block[64])
148144
uint32_t SS1, SS2, TT1, TT2;
149145
int j;
150146

151-
152147
for (j = 0; j < 16; j++)
153148
W[j] = cpu_to_be32(pblock[j]);
154149

@@ -210,18 +205,3 @@ void sm3(const unsigned char *msg, size_t msglen,
210205

211206
memset(&ctx, 0, sizeof(sm3_ctx_t));
212207
}
213-
214-
#define DATA_ORDER_IS_BIG_ENDIAN
215-
216-
#define HASH_LONG SM3_LONG
217-
#define HASH_CTX SM3_CTX
218-
#define HASH_CBLOCK SM3_CBLOCK
219-
220-
221-
222-
223-
224-
225-
226-
227-

‎include/openssl/sm2.h‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -245,22 +245,6 @@ void EC_KEY_METHOD_get_decrypt(EC_KEY_METHOD *meth,
245245
EVP_PKEY_OP_ENCRYPT|EVP_PKEY_OP_DECRYPT, \
246246
EVP_PKEY_CTRL_EC_ENCRYPT_PARAM, -2, NULL)
247247

248-
typedef struct SM2_COSIGNER1_SHARE_st SM2_COSIGNER1_SHARE;
249-
typedef struct SM2_COSIGNER2_SHARE_st SM2_COSIGNER2_SHARE;
250-
typedef struct SM2_COSIGNER1_PROOF_st SM2_COSIGNER1_PROOF;
251-
typedef struct SM2_COSIGNER2_PROOF_st SM2_COSIGNER2_PROOF;
252-
DECLARE_ASN1_FUNCTIONS(SM2_COSIGNER1_SHARE)
253-
DECLARE_ASN1_FUNCTIONS(SM2_COSIGNER2_SHARE)
254-
DECLARE_ASN1_FUNCTIONS(SM2_COSIGNER1_PROOF)
255-
DECLARE_ASN1_FUNCTIONS(SM2_COSIGNER2_PROOF)
256-
257-
/* the following API not finished */
258-
SM2_COSIGNER1_SHARE *SM2_cosigner1_setup(BIGNUM **k1, EC_KEY *ec_key, PAILLIER *pk);
259-
SM2_COSIGNER2_SHARE *SM2_cosigner2_setup(const SM2_COSIGNER1_SHARE *s1, BIGNUM **k2, EC_KEY *ec_key, PAILLIER *pk);
260-
SM2_COSIGNER1_PROOF *SM2_cosigner1_generate_proof(EC_KEY *ec_key, PAILLIER *pk);
261-
SM2_COSIGNER2_PROOF *SM2_cosigner2_generate_proof(EC_KEY *ec_key, PAILLIER *pk);
262-
ECDSA_SIG *SM2_cosigner1_generate_signature(EC_KEY *ec_key, PAILLIER *pk);
263-
264248

265249
/* BEGIN ERROR CODES */
266250
/*

0 commit comments

Comments
 (0)