Skip to content
This repository was archived by the owner on Oct 16, 2024. It is now read-only.

Commit 4692aad

Browse files
leeendlleeendl
committed
cleanup
1 parent 51a3c72 commit 4692aad

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

132 files changed

+15424
-15892
lines changed

‎include/openssl/__DECC_INCLUDE_EPILOGUE.H

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

‎include/openssl/__DECC_INCLUDE_PROLOGUE.H

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

‎include/openssl/aes.h

Lines changed: 61 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -32,78 +32,76 @@ extern "C" {
3232

3333
# define AES_MAXNR 14
3434

35-
36-
/* This should be a hidden type, but EVP requires that the size be known */
37-
struct aes_key_st {
35+
/* This should be a hidden type, but EVP requires that the size be known */
36+
struct aes_key_st {
3837
# ifdef AES_LONG
39-
unsigned long rd_key[4 * (AES_MAXNR + 1)];
38+
unsigned long rd_key[4 * (AES_MAXNR + 1)];
4039
# else
41-
unsigned int rd_key[4 * (AES_MAXNR + 1)];
40+
unsigned int rd_key[4 * (AES_MAXNR + 1)];
4241
# endif
43-
int rounds;
44-
};
45-
typedef struct aes_key_st AES_KEY;
42+
int rounds;
43+
};
44+
typedef struct aes_key_st AES_KEY;
4645

4746
# endif
4847
# ifndef OPENSSL_NO_DEPRECATED_3_0
49-
OSSL_DEPRECATEDIN_3_0 const char *AES_options(void);
50-
OSSL_DEPRECATEDIN_3_0
51-
int AES_set_encrypt_key(const unsigned char *userKey, const int bits,
52-
AES_KEY *key);
53-
OSSL_DEPRECATEDIN_3_0
54-
int AES_set_decrypt_key(const unsigned char *userKey, const int bits,
55-
AES_KEY *key);
56-
OSSL_DEPRECATEDIN_3_0
57-
void AES_encrypt(const unsigned char *in, unsigned char *out,
58-
const AES_KEY *key);
59-
OSSL_DEPRECATEDIN_3_0
60-
void AES_decrypt(const unsigned char *in, unsigned char *out,
61-
const AES_KEY *key);
62-
OSSL_DEPRECATEDIN_3_0
63-
void AES_ecb_encrypt(const unsigned char *in, unsigned char *out,
64-
const AES_KEY *key, const int enc);
65-
OSSL_DEPRECATEDIN_3_0
66-
void AES_cbc_encrypt(const unsigned char *in, unsigned char *out,
67-
size_t length, const AES_KEY *key,
68-
unsigned char *ivec, const int enc);
69-
OSSL_DEPRECATEDIN_3_0
70-
void AES_cfb128_encrypt(const unsigned char *in, unsigned char *out,
71-
size_t length, const AES_KEY *key,
72-
unsigned char *ivec, int *num, const int enc);
73-
OSSL_DEPRECATEDIN_3_0
74-
void AES_cfb1_encrypt(const unsigned char *in, unsigned char *out,
75-
size_t length, const AES_KEY *key,
76-
unsigned char *ivec, int *num, const int enc);
77-
OSSL_DEPRECATEDIN_3_0
78-
void AES_cfb8_encrypt(const unsigned char *in, unsigned char *out,
79-
size_t length, const AES_KEY *key,
80-
unsigned char *ivec, int *num, const int enc);
81-
OSSL_DEPRECATEDIN_3_0
82-
void AES_ofb128_encrypt(const unsigned char *in, unsigned char *out,
83-
size_t length, const AES_KEY *key,
84-
unsigned char *ivec, int *num);
48+
OSSL_DEPRECATEDIN_3_0 const char* AES_options(void);
49+
OSSL_DEPRECATEDIN_3_0
50+
int AES_set_encrypt_key(const unsigned char* userKey, const int bits,
51+
AES_KEY* key);
52+
OSSL_DEPRECATEDIN_3_0
53+
int AES_set_decrypt_key(const unsigned char* userKey, const int bits,
54+
AES_KEY* key);
55+
OSSL_DEPRECATEDIN_3_0
56+
void AES_encrypt(const unsigned char* in, unsigned char* out,
57+
const AES_KEY* key);
58+
OSSL_DEPRECATEDIN_3_0
59+
void AES_decrypt(const unsigned char* in, unsigned char* out,
60+
const AES_KEY* key);
61+
OSSL_DEPRECATEDIN_3_0
62+
void AES_ecb_encrypt(const unsigned char* in, unsigned char* out,
63+
const AES_KEY* key, const int enc);
64+
OSSL_DEPRECATEDIN_3_0
65+
void AES_cbc_encrypt(const unsigned char* in, unsigned char* out,
66+
size_t length, const AES_KEY* key,
67+
unsigned char* ivec, const int enc);
68+
OSSL_DEPRECATEDIN_3_0
69+
void AES_cfb128_encrypt(const unsigned char* in, unsigned char* out,
70+
size_t length, const AES_KEY* key,
71+
unsigned char* ivec, int* num, const int enc);
72+
OSSL_DEPRECATEDIN_3_0
73+
void AES_cfb1_encrypt(const unsigned char* in, unsigned char* out,
74+
size_t length, const AES_KEY* key,
75+
unsigned char* ivec, int* num, const int enc);
76+
OSSL_DEPRECATEDIN_3_0
77+
void AES_cfb8_encrypt(const unsigned char* in, unsigned char* out,
78+
size_t length, const AES_KEY* key,
79+
unsigned char* ivec, int* num, const int enc);
80+
OSSL_DEPRECATEDIN_3_0
81+
void AES_ofb128_encrypt(const unsigned char* in, unsigned char* out,
82+
size_t length, const AES_KEY* key,
83+
unsigned char* ivec, int* num);
8584

86-
/* NB: the IV is _two_ blocks long */
87-
OSSL_DEPRECATEDIN_3_0
88-
void AES_ige_encrypt(const unsigned char *in, unsigned char *out,
89-
size_t length, const AES_KEY *key,
90-
unsigned char *ivec, const int enc);
91-
/* NB: the IV is _four_ blocks long */
92-
OSSL_DEPRECATEDIN_3_0
93-
void AES_bi_ige_encrypt(const unsigned char *in, unsigned char *out,
94-
size_t length, const AES_KEY *key, const AES_KEY *key2,
95-
const unsigned char *ivec, const int enc);
96-
OSSL_DEPRECATEDIN_3_0
97-
int AES_wrap_key(AES_KEY *key, const unsigned char *iv,
98-
unsigned char *out, const unsigned char *in,
99-
unsigned int inlen);
100-
OSSL_DEPRECATEDIN_3_0
101-
int AES_unwrap_key(AES_KEY *key, const unsigned char *iv,
102-
unsigned char *out, const unsigned char *in,
103-
unsigned int inlen);
85+
/* NB: the IV is _two_ blocks long */
86+
OSSL_DEPRECATEDIN_3_0
87+
void AES_ige_encrypt(const unsigned char* in, unsigned char* out,
88+
size_t length, const AES_KEY* key,
89+
unsigned char* ivec, const int enc);
90+
/* NB: the IV is _four_ blocks long */
91+
OSSL_DEPRECATEDIN_3_0
92+
void AES_bi_ige_encrypt(const unsigned char* in, unsigned char* out,
93+
size_t length, const AES_KEY* key, const AES_KEY* key2,
94+
const unsigned char* ivec, const int enc);
95+
OSSL_DEPRECATEDIN_3_0
96+
int AES_wrap_key(AES_KEY* key, const unsigned char* iv,
97+
unsigned char* out, const unsigned char* in,
98+
unsigned int inlen);
99+
OSSL_DEPRECATEDIN_3_0
100+
int AES_unwrap_key(AES_KEY* key, const unsigned char* iv,
101+
unsigned char* out, const unsigned char* in,
102+
unsigned int inlen);
104103
# endif
105104

106-
107105
# ifdef __cplusplus
108106
}
109107
# endif

‎include/openssl/applink.c

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

0 commit comments

Comments
 (0)