diff options
-rw-r--r-- | src/lib/libcrypto/evp/bio_b64.c | 2 | ||||
-rw-r--r-- | src/lib/libcrypto/evp/bio_enc.c | 2 | ||||
-rw-r--r-- | src/lib/libcrypto/evp/e_old.c | 33 | ||||
-rw-r--r-- | src/lib/libcrypto/evp/evp_err.c | 4 | ||||
-rw-r--r-- | src/lib/libcrypto/evp/evp_key.c | 2 | ||||
-rw-r--r-- | src/lib/libssl/src/crypto/evp/bio_b64.c | 2 | ||||
-rw-r--r-- | src/lib/libssl/src/crypto/evp/bio_enc.c | 2 | ||||
-rw-r--r-- | src/lib/libssl/src/crypto/evp/e_old.c | 33 | ||||
-rw-r--r-- | src/lib/libssl/src/crypto/evp/evp_err.c | 4 | ||||
-rw-r--r-- | src/lib/libssl/src/crypto/evp/evp_key.c | 2 |
10 files changed, 54 insertions, 32 deletions
diff --git a/src/lib/libcrypto/evp/bio_b64.c b/src/lib/libcrypto/evp/bio_b64.c index f963b606d2..465753cf16 100644 --- a/src/lib/libcrypto/evp/bio_b64.c +++ b/src/lib/libcrypto/evp/bio_b64.c | |||
@@ -147,7 +147,7 @@ b64_free(BIO *a) | |||
147 | static int | 147 | static int |
148 | b64_read(BIO *b, char *out, int outl) | 148 | b64_read(BIO *b, char *out, int outl) |
149 | { | 149 | { |
150 | int ret = 0, i, ii, j,k, x,n, num, ret_code = 0; | 150 | int ret = 0, i, ii, j, k, x, n, num, ret_code = 0; |
151 | BIO_B64_CTX *ctx; | 151 | BIO_B64_CTX *ctx; |
152 | unsigned char *p, *q; | 152 | unsigned char *p, *q; |
153 | 153 | ||
diff --git a/src/lib/libcrypto/evp/bio_enc.c b/src/lib/libcrypto/evp/bio_enc.c index 46cd2a6a60..df817b9d8f 100644 --- a/src/lib/libcrypto/evp/bio_enc.c +++ b/src/lib/libcrypto/evp/bio_enc.c | |||
@@ -419,7 +419,7 @@ BIO_set_cipher(BIO *b, const EVP_CIPHER *c, const unsigned char *k, | |||
419 | 419 | ||
420 | b->init = 1; | 420 | b->init = 1; |
421 | ctx = (BIO_ENC_CTX *)b->ptr; | 421 | ctx = (BIO_ENC_CTX *)b->ptr; |
422 | EVP_CipherInit_ex(&(ctx->cipher), c,NULL, k, i, e); | 422 | EVP_CipherInit_ex(&(ctx->cipher), c, NULL, k, i, e); |
423 | 423 | ||
424 | if (b->callback != NULL) | 424 | if (b->callback != NULL) |
425 | b->callback(b, BIO_CB_CTRL, (const char *)c, BIO_CTRL_SET, e, 1L); | 425 | b->callback(b, BIO_CB_CTRL, (const char *)c, BIO_CTRL_SET, e, 1L); |
diff --git a/src/lib/libcrypto/evp/e_old.c b/src/lib/libcrypto/evp/e_old.c index c27b61a4bf..6d63ea4269 100644 --- a/src/lib/libcrypto/evp/e_old.c +++ b/src/lib/libcrypto/evp/e_old.c | |||
@@ -71,7 +71,8 @@ static void *dummy = &dummy; | |||
71 | #ifndef OPENSSL_NO_BF | 71 | #ifndef OPENSSL_NO_BF |
72 | #undef EVP_bf_cfb | 72 | #undef EVP_bf_cfb |
73 | const EVP_CIPHER *EVP_bf_cfb(void); | 73 | const EVP_CIPHER *EVP_bf_cfb(void); |
74 | const EVP_CIPHER *EVP_bf_cfb(void) | 74 | const EVP_CIPHER * |
75 | EVP_bf_cfb(void) | ||
75 | { | 76 | { |
76 | return EVP_bf_cfb64(); | 77 | return EVP_bf_cfb64(); |
77 | } | 78 | } |
@@ -80,19 +81,22 @@ const EVP_CIPHER *EVP_bf_cfb(void) | |||
80 | #ifndef OPENSSL_NO_DES | 81 | #ifndef OPENSSL_NO_DES |
81 | #undef EVP_des_cfb | 82 | #undef EVP_des_cfb |
82 | const EVP_CIPHER *EVP_des_cfb(void); | 83 | const EVP_CIPHER *EVP_des_cfb(void); |
83 | const EVP_CIPHER *EVP_des_cfb(void) | 84 | const EVP_CIPHER * |
85 | EVP_des_cfb(void) | ||
84 | { | 86 | { |
85 | return EVP_des_cfb64(); | 87 | return EVP_des_cfb64(); |
86 | } | 88 | } |
87 | #undef EVP_des_ede3_cfb | 89 | #undef EVP_des_ede3_cfb |
88 | const EVP_CIPHER *EVP_des_ede3_cfb(void); | 90 | const EVP_CIPHER *EVP_des_ede3_cfb(void); |
89 | const EVP_CIPHER *EVP_des_ede3_cfb(void) | 91 | const EVP_CIPHER * |
92 | EVP_des_ede3_cfb(void) | ||
90 | { | 93 | { |
91 | return EVP_des_ede3_cfb64(); | 94 | return EVP_des_ede3_cfb64(); |
92 | } | 95 | } |
93 | #undef EVP_des_ede_cfb | 96 | #undef EVP_des_ede_cfb |
94 | const EVP_CIPHER *EVP_des_ede_cfb(void); | 97 | const EVP_CIPHER *EVP_des_ede_cfb(void); |
95 | const EVP_CIPHER *EVP_des_ede_cfb(void) | 98 | const EVP_CIPHER * |
99 | EVP_des_ede_cfb(void) | ||
96 | { | 100 | { |
97 | return EVP_des_ede_cfb64(); | 101 | return EVP_des_ede_cfb64(); |
98 | } | 102 | } |
@@ -101,7 +105,8 @@ const EVP_CIPHER *EVP_des_ede_cfb(void) | |||
101 | #ifndef OPENSSL_NO_IDEA | 105 | #ifndef OPENSSL_NO_IDEA |
102 | #undef EVP_idea_cfb | 106 | #undef EVP_idea_cfb |
103 | const EVP_CIPHER *EVP_idea_cfb(void); | 107 | const EVP_CIPHER *EVP_idea_cfb(void); |
104 | const EVP_CIPHER *EVP_idea_cfb(void) | 108 | const EVP_CIPHER * |
109 | EVP_idea_cfb(void) | ||
105 | { | 110 | { |
106 | return EVP_idea_cfb64(); | 111 | return EVP_idea_cfb64(); |
107 | } | 112 | } |
@@ -110,7 +115,8 @@ const EVP_CIPHER *EVP_idea_cfb(void) | |||
110 | #ifndef OPENSSL_NO_RC2 | 115 | #ifndef OPENSSL_NO_RC2 |
111 | #undef EVP_rc2_cfb | 116 | #undef EVP_rc2_cfb |
112 | const EVP_CIPHER *EVP_rc2_cfb(void); | 117 | const EVP_CIPHER *EVP_rc2_cfb(void); |
113 | const EVP_CIPHER *EVP_rc2_cfb(void) | 118 | const EVP_CIPHER * |
119 | EVP_rc2_cfb(void) | ||
114 | { | 120 | { |
115 | return EVP_rc2_cfb64(); | 121 | return EVP_rc2_cfb64(); |
116 | } | 122 | } |
@@ -119,7 +125,8 @@ const EVP_CIPHER *EVP_rc2_cfb(void) | |||
119 | #ifndef OPENSSL_NO_CAST | 125 | #ifndef OPENSSL_NO_CAST |
120 | #undef EVP_cast5_cfb | 126 | #undef EVP_cast5_cfb |
121 | const EVP_CIPHER *EVP_cast5_cfb(void); | 127 | const EVP_CIPHER *EVP_cast5_cfb(void); |
122 | const EVP_CIPHER *EVP_cast5_cfb(void) | 128 | const EVP_CIPHER * |
129 | EVP_cast5_cfb(void) | ||
123 | { | 130 | { |
124 | return EVP_cast5_cfb64(); | 131 | return EVP_cast5_cfb64(); |
125 | } | 132 | } |
@@ -128,7 +135,8 @@ const EVP_CIPHER *EVP_cast5_cfb(void) | |||
128 | #ifndef OPENSSL_NO_RC5 | 135 | #ifndef OPENSSL_NO_RC5 |
129 | #undef EVP_rc5_32_12_16_cfb | 136 | #undef EVP_rc5_32_12_16_cfb |
130 | const EVP_CIPHER *EVP_rc5_32_12_16_cfb(void); | 137 | const EVP_CIPHER *EVP_rc5_32_12_16_cfb(void); |
131 | const EVP_CIPHER *EVP_rc5_32_12_16_cfb(void) | 138 | const EVP_CIPHER * |
139 | EVP_rc5_32_12_16_cfb(void) | ||
132 | { | 140 | { |
133 | return EVP_rc5_32_12_16_cfb64(); | 141 | return EVP_rc5_32_12_16_cfb64(); |
134 | } | 142 | } |
@@ -137,19 +145,22 @@ const EVP_CIPHER *EVP_rc5_32_12_16_cfb(void) | |||
137 | #ifndef OPENSSL_NO_AES | 145 | #ifndef OPENSSL_NO_AES |
138 | #undef EVP_aes_128_cfb | 146 | #undef EVP_aes_128_cfb |
139 | const EVP_CIPHER *EVP_aes_128_cfb(void); | 147 | const EVP_CIPHER *EVP_aes_128_cfb(void); |
140 | const EVP_CIPHER *EVP_aes_128_cfb(void) | 148 | const EVP_CIPHER * |
149 | EVP_aes_128_cfb(void) | ||
141 | { | 150 | { |
142 | return EVP_aes_128_cfb128(); | 151 | return EVP_aes_128_cfb128(); |
143 | } | 152 | } |
144 | #undef EVP_aes_192_cfb | 153 | #undef EVP_aes_192_cfb |
145 | const EVP_CIPHER *EVP_aes_192_cfb(void); | 154 | const EVP_CIPHER *EVP_aes_192_cfb(void); |
146 | const EVP_CIPHER *EVP_aes_192_cfb(void) | 155 | const EVP_CIPHER * |
156 | EVP_aes_192_cfb(void) | ||
147 | { | 157 | { |
148 | return EVP_aes_192_cfb128(); | 158 | return EVP_aes_192_cfb128(); |
149 | } | 159 | } |
150 | #undef EVP_aes_256_cfb | 160 | #undef EVP_aes_256_cfb |
151 | const EVP_CIPHER *EVP_aes_256_cfb(void); | 161 | const EVP_CIPHER *EVP_aes_256_cfb(void); |
152 | const EVP_CIPHER *EVP_aes_256_cfb(void) | 162 | const EVP_CIPHER * |
163 | EVP_aes_256_cfb(void) | ||
153 | { | 164 | { |
154 | return EVP_aes_256_cfb128(); | 165 | return EVP_aes_256_cfb128(); |
155 | } | 166 | } |
diff --git a/src/lib/libcrypto/evp/evp_err.c b/src/lib/libcrypto/evp/evp_err.c index 790459fab4..8024731938 100644 --- a/src/lib/libcrypto/evp/evp_err.c +++ b/src/lib/libcrypto/evp/evp_err.c | |||
@@ -68,7 +68,7 @@ | |||
68 | #define ERR_FUNC(func) ERR_PACK(ERR_LIB_EVP,func,0) | 68 | #define ERR_FUNC(func) ERR_PACK(ERR_LIB_EVP,func,0) |
69 | #define ERR_REASON(reason) ERR_PACK(ERR_LIB_EVP,0,reason) | 69 | #define ERR_REASON(reason) ERR_PACK(ERR_LIB_EVP,0,reason) |
70 | 70 | ||
71 | static ERR_STRING_DATA EVP_str_functs[]= { | 71 | static ERR_STRING_DATA EVP_str_functs[] = { |
72 | {ERR_FUNC(EVP_F_AESNI_INIT_KEY), "AESNI_INIT_KEY"}, | 72 | {ERR_FUNC(EVP_F_AESNI_INIT_KEY), "AESNI_INIT_KEY"}, |
73 | {ERR_FUNC(EVP_F_AESNI_XTS_CIPHER), "AESNI_XTS_CIPHER"}, | 73 | {ERR_FUNC(EVP_F_AESNI_XTS_CIPHER), "AESNI_XTS_CIPHER"}, |
74 | {ERR_FUNC(EVP_F_AES_INIT_KEY), "AES_INIT_KEY"}, | 74 | {ERR_FUNC(EVP_F_AES_INIT_KEY), "AES_INIT_KEY"}, |
@@ -149,7 +149,7 @@ static ERR_STRING_DATA EVP_str_functs[]= { | |||
149 | {0, NULL} | 149 | {0, NULL} |
150 | }; | 150 | }; |
151 | 151 | ||
152 | static ERR_STRING_DATA EVP_str_reasons[]= { | 152 | static ERR_STRING_DATA EVP_str_reasons[] = { |
153 | {ERR_REASON(EVP_R_AES_IV_SETUP_FAILED) , "aes iv setup failed"}, | 153 | {ERR_REASON(EVP_R_AES_IV_SETUP_FAILED) , "aes iv setup failed"}, |
154 | {ERR_REASON(EVP_R_AES_KEY_SETUP_FAILED) , "aes key setup failed"}, | 154 | {ERR_REASON(EVP_R_AES_KEY_SETUP_FAILED) , "aes key setup failed"}, |
155 | {ERR_REASON(EVP_R_ASN1_LIB) , "asn1 lib"}, | 155 | {ERR_REASON(EVP_R_ASN1_LIB) , "asn1 lib"}, |
diff --git a/src/lib/libcrypto/evp/evp_key.c b/src/lib/libcrypto/evp/evp_key.c index 445456d3a7..48d8d41189 100644 --- a/src/lib/libcrypto/evp/evp_key.c +++ b/src/lib/libcrypto/evp/evp_key.c | |||
@@ -105,7 +105,7 @@ EVP_read_pw_string_min(char *buf, int min, int len, const char *prompt, | |||
105 | if ((prompt == NULL) && (prompt_string[0] != '\0')) | 105 | if ((prompt == NULL) && (prompt_string[0] != '\0')) |
106 | prompt = prompt_string; | 106 | prompt = prompt_string; |
107 | ui = UI_new(); | 107 | ui = UI_new(); |
108 | UI_add_input_string(ui, prompt, 0,buf, min, | 108 | UI_add_input_string(ui, prompt, 0, buf, min, |
109 | (len >= BUFSIZ) ? BUFSIZ - 1 : len); | 109 | (len >= BUFSIZ) ? BUFSIZ - 1 : len); |
110 | if (verify) | 110 | if (verify) |
111 | UI_add_verify_string(ui, prompt, 0, buff, min, | 111 | UI_add_verify_string(ui, prompt, 0, buff, min, |
diff --git a/src/lib/libssl/src/crypto/evp/bio_b64.c b/src/lib/libssl/src/crypto/evp/bio_b64.c index f963b606d2..465753cf16 100644 --- a/src/lib/libssl/src/crypto/evp/bio_b64.c +++ b/src/lib/libssl/src/crypto/evp/bio_b64.c | |||
@@ -147,7 +147,7 @@ b64_free(BIO *a) | |||
147 | static int | 147 | static int |
148 | b64_read(BIO *b, char *out, int outl) | 148 | b64_read(BIO *b, char *out, int outl) |
149 | { | 149 | { |
150 | int ret = 0, i, ii, j,k, x,n, num, ret_code = 0; | 150 | int ret = 0, i, ii, j, k, x, n, num, ret_code = 0; |
151 | BIO_B64_CTX *ctx; | 151 | BIO_B64_CTX *ctx; |
152 | unsigned char *p, *q; | 152 | unsigned char *p, *q; |
153 | 153 | ||
diff --git a/src/lib/libssl/src/crypto/evp/bio_enc.c b/src/lib/libssl/src/crypto/evp/bio_enc.c index 46cd2a6a60..df817b9d8f 100644 --- a/src/lib/libssl/src/crypto/evp/bio_enc.c +++ b/src/lib/libssl/src/crypto/evp/bio_enc.c | |||
@@ -419,7 +419,7 @@ BIO_set_cipher(BIO *b, const EVP_CIPHER *c, const unsigned char *k, | |||
419 | 419 | ||
420 | b->init = 1; | 420 | b->init = 1; |
421 | ctx = (BIO_ENC_CTX *)b->ptr; | 421 | ctx = (BIO_ENC_CTX *)b->ptr; |
422 | EVP_CipherInit_ex(&(ctx->cipher), c,NULL, k, i, e); | 422 | EVP_CipherInit_ex(&(ctx->cipher), c, NULL, k, i, e); |
423 | 423 | ||
424 | if (b->callback != NULL) | 424 | if (b->callback != NULL) |
425 | b->callback(b, BIO_CB_CTRL, (const char *)c, BIO_CTRL_SET, e, 1L); | 425 | b->callback(b, BIO_CB_CTRL, (const char *)c, BIO_CTRL_SET, e, 1L); |
diff --git a/src/lib/libssl/src/crypto/evp/e_old.c b/src/lib/libssl/src/crypto/evp/e_old.c index c27b61a4bf..6d63ea4269 100644 --- a/src/lib/libssl/src/crypto/evp/e_old.c +++ b/src/lib/libssl/src/crypto/evp/e_old.c | |||
@@ -71,7 +71,8 @@ static void *dummy = &dummy; | |||
71 | #ifndef OPENSSL_NO_BF | 71 | #ifndef OPENSSL_NO_BF |
72 | #undef EVP_bf_cfb | 72 | #undef EVP_bf_cfb |
73 | const EVP_CIPHER *EVP_bf_cfb(void); | 73 | const EVP_CIPHER *EVP_bf_cfb(void); |
74 | const EVP_CIPHER *EVP_bf_cfb(void) | 74 | const EVP_CIPHER * |
75 | EVP_bf_cfb(void) | ||
75 | { | 76 | { |
76 | return EVP_bf_cfb64(); | 77 | return EVP_bf_cfb64(); |
77 | } | 78 | } |
@@ -80,19 +81,22 @@ const EVP_CIPHER *EVP_bf_cfb(void) | |||
80 | #ifndef OPENSSL_NO_DES | 81 | #ifndef OPENSSL_NO_DES |
81 | #undef EVP_des_cfb | 82 | #undef EVP_des_cfb |
82 | const EVP_CIPHER *EVP_des_cfb(void); | 83 | const EVP_CIPHER *EVP_des_cfb(void); |
83 | const EVP_CIPHER *EVP_des_cfb(void) | 84 | const EVP_CIPHER * |
85 | EVP_des_cfb(void) | ||
84 | { | 86 | { |
85 | return EVP_des_cfb64(); | 87 | return EVP_des_cfb64(); |
86 | } | 88 | } |
87 | #undef EVP_des_ede3_cfb | 89 | #undef EVP_des_ede3_cfb |
88 | const EVP_CIPHER *EVP_des_ede3_cfb(void); | 90 | const EVP_CIPHER *EVP_des_ede3_cfb(void); |
89 | const EVP_CIPHER *EVP_des_ede3_cfb(void) | 91 | const EVP_CIPHER * |
92 | EVP_des_ede3_cfb(void) | ||
90 | { | 93 | { |
91 | return EVP_des_ede3_cfb64(); | 94 | return EVP_des_ede3_cfb64(); |
92 | } | 95 | } |
93 | #undef EVP_des_ede_cfb | 96 | #undef EVP_des_ede_cfb |
94 | const EVP_CIPHER *EVP_des_ede_cfb(void); | 97 | const EVP_CIPHER *EVP_des_ede_cfb(void); |
95 | const EVP_CIPHER *EVP_des_ede_cfb(void) | 98 | const EVP_CIPHER * |
99 | EVP_des_ede_cfb(void) | ||
96 | { | 100 | { |
97 | return EVP_des_ede_cfb64(); | 101 | return EVP_des_ede_cfb64(); |
98 | } | 102 | } |
@@ -101,7 +105,8 @@ const EVP_CIPHER *EVP_des_ede_cfb(void) | |||
101 | #ifndef OPENSSL_NO_IDEA | 105 | #ifndef OPENSSL_NO_IDEA |
102 | #undef EVP_idea_cfb | 106 | #undef EVP_idea_cfb |
103 | const EVP_CIPHER *EVP_idea_cfb(void); | 107 | const EVP_CIPHER *EVP_idea_cfb(void); |
104 | const EVP_CIPHER *EVP_idea_cfb(void) | 108 | const EVP_CIPHER * |
109 | EVP_idea_cfb(void) | ||
105 | { | 110 | { |
106 | return EVP_idea_cfb64(); | 111 | return EVP_idea_cfb64(); |
107 | } | 112 | } |
@@ -110,7 +115,8 @@ const EVP_CIPHER *EVP_idea_cfb(void) | |||
110 | #ifndef OPENSSL_NO_RC2 | 115 | #ifndef OPENSSL_NO_RC2 |
111 | #undef EVP_rc2_cfb | 116 | #undef EVP_rc2_cfb |
112 | const EVP_CIPHER *EVP_rc2_cfb(void); | 117 | const EVP_CIPHER *EVP_rc2_cfb(void); |
113 | const EVP_CIPHER *EVP_rc2_cfb(void) | 118 | const EVP_CIPHER * |
119 | EVP_rc2_cfb(void) | ||
114 | { | 120 | { |
115 | return EVP_rc2_cfb64(); | 121 | return EVP_rc2_cfb64(); |
116 | } | 122 | } |
@@ -119,7 +125,8 @@ const EVP_CIPHER *EVP_rc2_cfb(void) | |||
119 | #ifndef OPENSSL_NO_CAST | 125 | #ifndef OPENSSL_NO_CAST |
120 | #undef EVP_cast5_cfb | 126 | #undef EVP_cast5_cfb |
121 | const EVP_CIPHER *EVP_cast5_cfb(void); | 127 | const EVP_CIPHER *EVP_cast5_cfb(void); |
122 | const EVP_CIPHER *EVP_cast5_cfb(void) | 128 | const EVP_CIPHER * |
129 | EVP_cast5_cfb(void) | ||
123 | { | 130 | { |
124 | return EVP_cast5_cfb64(); | 131 | return EVP_cast5_cfb64(); |
125 | } | 132 | } |
@@ -128,7 +135,8 @@ const EVP_CIPHER *EVP_cast5_cfb(void) | |||
128 | #ifndef OPENSSL_NO_RC5 | 135 | #ifndef OPENSSL_NO_RC5 |
129 | #undef EVP_rc5_32_12_16_cfb | 136 | #undef EVP_rc5_32_12_16_cfb |
130 | const EVP_CIPHER *EVP_rc5_32_12_16_cfb(void); | 137 | const EVP_CIPHER *EVP_rc5_32_12_16_cfb(void); |
131 | const EVP_CIPHER *EVP_rc5_32_12_16_cfb(void) | 138 | const EVP_CIPHER * |
139 | EVP_rc5_32_12_16_cfb(void) | ||
132 | { | 140 | { |
133 | return EVP_rc5_32_12_16_cfb64(); | 141 | return EVP_rc5_32_12_16_cfb64(); |
134 | } | 142 | } |
@@ -137,19 +145,22 @@ const EVP_CIPHER *EVP_rc5_32_12_16_cfb(void) | |||
137 | #ifndef OPENSSL_NO_AES | 145 | #ifndef OPENSSL_NO_AES |
138 | #undef EVP_aes_128_cfb | 146 | #undef EVP_aes_128_cfb |
139 | const EVP_CIPHER *EVP_aes_128_cfb(void); | 147 | const EVP_CIPHER *EVP_aes_128_cfb(void); |
140 | const EVP_CIPHER *EVP_aes_128_cfb(void) | 148 | const EVP_CIPHER * |
149 | EVP_aes_128_cfb(void) | ||
141 | { | 150 | { |
142 | return EVP_aes_128_cfb128(); | 151 | return EVP_aes_128_cfb128(); |
143 | } | 152 | } |
144 | #undef EVP_aes_192_cfb | 153 | #undef EVP_aes_192_cfb |
145 | const EVP_CIPHER *EVP_aes_192_cfb(void); | 154 | const EVP_CIPHER *EVP_aes_192_cfb(void); |
146 | const EVP_CIPHER *EVP_aes_192_cfb(void) | 155 | const EVP_CIPHER * |
156 | EVP_aes_192_cfb(void) | ||
147 | { | 157 | { |
148 | return EVP_aes_192_cfb128(); | 158 | return EVP_aes_192_cfb128(); |
149 | } | 159 | } |
150 | #undef EVP_aes_256_cfb | 160 | #undef EVP_aes_256_cfb |
151 | const EVP_CIPHER *EVP_aes_256_cfb(void); | 161 | const EVP_CIPHER *EVP_aes_256_cfb(void); |
152 | const EVP_CIPHER *EVP_aes_256_cfb(void) | 162 | const EVP_CIPHER * |
163 | EVP_aes_256_cfb(void) | ||
153 | { | 164 | { |
154 | return EVP_aes_256_cfb128(); | 165 | return EVP_aes_256_cfb128(); |
155 | } | 166 | } |
diff --git a/src/lib/libssl/src/crypto/evp/evp_err.c b/src/lib/libssl/src/crypto/evp/evp_err.c index 790459fab4..8024731938 100644 --- a/src/lib/libssl/src/crypto/evp/evp_err.c +++ b/src/lib/libssl/src/crypto/evp/evp_err.c | |||
@@ -68,7 +68,7 @@ | |||
68 | #define ERR_FUNC(func) ERR_PACK(ERR_LIB_EVP,func,0) | 68 | #define ERR_FUNC(func) ERR_PACK(ERR_LIB_EVP,func,0) |
69 | #define ERR_REASON(reason) ERR_PACK(ERR_LIB_EVP,0,reason) | 69 | #define ERR_REASON(reason) ERR_PACK(ERR_LIB_EVP,0,reason) |
70 | 70 | ||
71 | static ERR_STRING_DATA EVP_str_functs[]= { | 71 | static ERR_STRING_DATA EVP_str_functs[] = { |
72 | {ERR_FUNC(EVP_F_AESNI_INIT_KEY), "AESNI_INIT_KEY"}, | 72 | {ERR_FUNC(EVP_F_AESNI_INIT_KEY), "AESNI_INIT_KEY"}, |
73 | {ERR_FUNC(EVP_F_AESNI_XTS_CIPHER), "AESNI_XTS_CIPHER"}, | 73 | {ERR_FUNC(EVP_F_AESNI_XTS_CIPHER), "AESNI_XTS_CIPHER"}, |
74 | {ERR_FUNC(EVP_F_AES_INIT_KEY), "AES_INIT_KEY"}, | 74 | {ERR_FUNC(EVP_F_AES_INIT_KEY), "AES_INIT_KEY"}, |
@@ -149,7 +149,7 @@ static ERR_STRING_DATA EVP_str_functs[]= { | |||
149 | {0, NULL} | 149 | {0, NULL} |
150 | }; | 150 | }; |
151 | 151 | ||
152 | static ERR_STRING_DATA EVP_str_reasons[]= { | 152 | static ERR_STRING_DATA EVP_str_reasons[] = { |
153 | {ERR_REASON(EVP_R_AES_IV_SETUP_FAILED) , "aes iv setup failed"}, | 153 | {ERR_REASON(EVP_R_AES_IV_SETUP_FAILED) , "aes iv setup failed"}, |
154 | {ERR_REASON(EVP_R_AES_KEY_SETUP_FAILED) , "aes key setup failed"}, | 154 | {ERR_REASON(EVP_R_AES_KEY_SETUP_FAILED) , "aes key setup failed"}, |
155 | {ERR_REASON(EVP_R_ASN1_LIB) , "asn1 lib"}, | 155 | {ERR_REASON(EVP_R_ASN1_LIB) , "asn1 lib"}, |
diff --git a/src/lib/libssl/src/crypto/evp/evp_key.c b/src/lib/libssl/src/crypto/evp/evp_key.c index 445456d3a7..48d8d41189 100644 --- a/src/lib/libssl/src/crypto/evp/evp_key.c +++ b/src/lib/libssl/src/crypto/evp/evp_key.c | |||
@@ -105,7 +105,7 @@ EVP_read_pw_string_min(char *buf, int min, int len, const char *prompt, | |||
105 | if ((prompt == NULL) && (prompt_string[0] != '\0')) | 105 | if ((prompt == NULL) && (prompt_string[0] != '\0')) |
106 | prompt = prompt_string; | 106 | prompt = prompt_string; |
107 | ui = UI_new(); | 107 | ui = UI_new(); |
108 | UI_add_input_string(ui, prompt, 0,buf, min, | 108 | UI_add_input_string(ui, prompt, 0, buf, min, |
109 | (len >= BUFSIZ) ? BUFSIZ - 1 : len); | 109 | (len >= BUFSIZ) ? BUFSIZ - 1 : len); |
110 | if (verify) | 110 | if (verify) |
111 | UI_add_verify_string(ui, prompt, 0, buff, min, | 111 | UI_add_verify_string(ui, prompt, 0, buff, min, |