Skip to content

Commit cb78796

Browse files
committed
fix build error
1 parent cbf7cbb commit cb78796

5 files changed

Lines changed: 5148 additions & 5145 deletions

File tree

crypto/sms4/sms4_lcl.h

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -97,14 +97,4 @@ extern const uint32_t SMS4_D[65536];
9797
ROUND(x0, x1, x2, x3, x4, 30); \
9898
ROUND(x1, x2, x3, x4, x0, 31)
9999

100-
void sms4_ctr32_encrypt_blocks(const unsigned char *in, unsigned char *out,
101-
size_t blocks, const sms4_key_t *key, const unsigned char iv[16]);
102-
103-
# ifdef SMS4_AVX2
104-
void sms4_avx2_ecb_encrypt_blocks(const unsigned char *in, unsigned char *out,
105-
size_t blocks, const sms4_key_t *key);
106-
void sms4_avx2_ctr32_encrypt_blocks(const unsigned char *in, unsigned char *out,
107-
size_t blocks, const sms4_key_t *key, const unsigned char iv[16]);
108-
# endif
109-
110100
#endif

include/openssl/sms4.h

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,16 @@ int sms4_wrap_key(sms4_key_t *key, const unsigned char *iv,
9494
int sms4_unwrap_key(sms4_key_t *key, const unsigned char *iv,
9595
unsigned char *out, const unsigned char *in, unsigned int inlen);
9696

97+
void sms4_ctr32_encrypt_blocks(const unsigned char *in, unsigned char *out,
98+
size_t blocks, const sms4_key_t *key, const unsigned char iv[16]);
99+
100+
# ifdef SMS4_AVX2
101+
void sms4_avx2_ecb_encrypt_blocks(const unsigned char *in,
102+
unsigned char *out, size_t blocks, const sms4_key_t *key);
103+
void sms4_avx2_ctr32_encrypt_blocks(const unsigned char *in,
104+
unsigned char *out, size_t blocks, const sms4_key_t *key,
105+
const unsigned char iv[16]);
106+
# endif
97107

98108
# define SMS4_EDE_KEY_LENGTH (SMS4_KEY_LENGTH * 3)
99109

test/sms4test.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ int main(int argc, char **argv)
6262
# include <openssl/evp.h>
6363
# include <openssl/sms4.h>
6464
# include <openssl/rand.h>
65-
# include "../crypto/sms4/sms4_lcl.h"
65+
6666

6767
static int test_ecb(int avx)
6868
{

0 commit comments

Comments
 (0)