diff options
-rw-r--r-- | src/lib/libcrypto/evp/e_des3.c | 21 | ||||
-rw-r--r-- | src/lib/libssl/src/crypto/evp/e_des3.c | 21 |
2 files changed, 0 insertions, 42 deletions
diff --git a/src/lib/libcrypto/evp/e_des3.c b/src/lib/libcrypto/evp/e_des3.c index 6463326a78..a6093c2ddb 100644 --- a/src/lib/libcrypto/evp/e_des3.c +++ b/src/lib/libcrypto/evp/e_des3.c | |||
@@ -118,17 +118,6 @@ static int | |||
118 | des_ede_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, | 118 | des_ede_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, |
119 | const unsigned char *in, size_t inl) | 119 | const unsigned char *in, size_t inl) |
120 | { | 120 | { |
121 | #ifdef KSSL_DEBUG | ||
122 | { | ||
123 | int i; | ||
124 | char *cp; | ||
125 | printf("des_ede_cbc_cipher(ctx=%lx, buflen=%d)\n", ctx, ctx->buf_len); | ||
126 | printf("\t iv= "); | ||
127 | for (i = 0; i < 8; i++) | ||
128 | printf("%02X",ctx->iv[i]); | ||
129 | printf("\n"); | ||
130 | } | ||
131 | #endif /* KSSL_DEBUG */ | ||
132 | while (inl >= EVP_MAXCHUNK) { | 121 | while (inl >= EVP_MAXCHUNK) { |
133 | DES_ede3_cbc_encrypt(in, out, (long)EVP_MAXCHUNK, | 122 | DES_ede3_cbc_encrypt(in, out, (long)EVP_MAXCHUNK, |
134 | &data(ctx)->ks1, &data(ctx)->ks2, &data(ctx)->ks3, | 123 | &data(ctx)->ks1, &data(ctx)->ks2, &data(ctx)->ks3, |
@@ -257,16 +246,6 @@ des_ede3_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, | |||
257 | { | 246 | { |
258 | DES_cblock *deskey = (DES_cblock *)key; | 247 | DES_cblock *deskey = (DES_cblock *)key; |
259 | 248 | ||
260 | #ifdef KSSL_DEBUG | ||
261 | { | ||
262 | int i; | ||
263 | printf("des_ede3_init_key(ctx=%lx)\n", ctx); | ||
264 | printf("\tKEY= "); | ||
265 | for(i=0;i<24;i++) printf("%02X",key[i]); printf("\n"); | ||
266 | printf("\t IV= "); | ||
267 | for(i=0;i<8;i++) printf("%02X",iv[i]); printf("\n"); | ||
268 | } | ||
269 | #endif /* KSSL_DEBUG */ | ||
270 | 249 | ||
271 | #ifdef EVP_CHECK_DES_KEY | 250 | #ifdef EVP_CHECK_DES_KEY |
272 | if (DES_set_key_checked(&deskey[0], &data(ctx)->ks1) || | 251 | if (DES_set_key_checked(&deskey[0], &data(ctx)->ks1) || |
diff --git a/src/lib/libssl/src/crypto/evp/e_des3.c b/src/lib/libssl/src/crypto/evp/e_des3.c index 6463326a78..a6093c2ddb 100644 --- a/src/lib/libssl/src/crypto/evp/e_des3.c +++ b/src/lib/libssl/src/crypto/evp/e_des3.c | |||
@@ -118,17 +118,6 @@ static int | |||
118 | des_ede_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, | 118 | des_ede_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, |
119 | const unsigned char *in, size_t inl) | 119 | const unsigned char *in, size_t inl) |
120 | { | 120 | { |
121 | #ifdef KSSL_DEBUG | ||
122 | { | ||
123 | int i; | ||
124 | char *cp; | ||
125 | printf("des_ede_cbc_cipher(ctx=%lx, buflen=%d)\n", ctx, ctx->buf_len); | ||
126 | printf("\t iv= "); | ||
127 | for (i = 0; i < 8; i++) | ||
128 | printf("%02X",ctx->iv[i]); | ||
129 | printf("\n"); | ||
130 | } | ||
131 | #endif /* KSSL_DEBUG */ | ||
132 | while (inl >= EVP_MAXCHUNK) { | 121 | while (inl >= EVP_MAXCHUNK) { |
133 | DES_ede3_cbc_encrypt(in, out, (long)EVP_MAXCHUNK, | 122 | DES_ede3_cbc_encrypt(in, out, (long)EVP_MAXCHUNK, |
134 | &data(ctx)->ks1, &data(ctx)->ks2, &data(ctx)->ks3, | 123 | &data(ctx)->ks1, &data(ctx)->ks2, &data(ctx)->ks3, |
@@ -257,16 +246,6 @@ des_ede3_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, | |||
257 | { | 246 | { |
258 | DES_cblock *deskey = (DES_cblock *)key; | 247 | DES_cblock *deskey = (DES_cblock *)key; |
259 | 248 | ||
260 | #ifdef KSSL_DEBUG | ||
261 | { | ||
262 | int i; | ||
263 | printf("des_ede3_init_key(ctx=%lx)\n", ctx); | ||
264 | printf("\tKEY= "); | ||
265 | for(i=0;i<24;i++) printf("%02X",key[i]); printf("\n"); | ||
266 | printf("\t IV= "); | ||
267 | for(i=0;i<8;i++) printf("%02X",iv[i]); printf("\n"); | ||
268 | } | ||
269 | #endif /* KSSL_DEBUG */ | ||
270 | 249 | ||
271 | #ifdef EVP_CHECK_DES_KEY | 250 | #ifdef EVP_CHECK_DES_KEY |
272 | if (DES_set_key_checked(&deskey[0], &data(ctx)->ks1) || | 251 | if (DES_set_key_checked(&deskey[0], &data(ctx)->ks1) || |