summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/pkcs12/p12_decr.c
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/lib/libcrypto/pkcs12/p12_decr.c17
1 files changed, 1 insertions, 16 deletions
diff --git a/src/lib/libcrypto/pkcs12/p12_decr.c b/src/lib/libcrypto/pkcs12/p12_decr.c
index 577bb06f80..c06f580de2 100644
--- a/src/lib/libcrypto/pkcs12/p12_decr.c
+++ b/src/lib/libcrypto/pkcs12/p12_decr.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: p12_decr.c,v 1.11 2014/07/08 09:24:53 jsing Exp $ */ 1/* $OpenBSD: p12_decr.c,v 1.12 2014/07/10 10:01:23 miod Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project 1999. 3 * project 1999.
4 */ 4 */
@@ -60,9 +60,6 @@
60#include "cryptlib.h" 60#include "cryptlib.h"
61#include <openssl/pkcs12.h> 61#include <openssl/pkcs12.h>
62 62
63/* Define this to dump decrypted output to files called DERnnn */
64/*#define DEBUG_DECRYPT*/
65
66 63
67/* Encrypt/Decrypt a buffer based on password and algor, result in a 64/* Encrypt/Decrypt a buffer based on password and algor, result in a
68 * malloc'ed buffer 65 * malloc'ed buffer
@@ -137,18 +134,6 @@ PKCS12_item_decrypt_d2i(X509_ALGOR *algor, const ASN1_ITEM *it,
137 return NULL; 134 return NULL;
138 } 135 }
139 p = out; 136 p = out;
140#ifdef DEBUG_DECRYPT
141 {
142 FILE *op;
143
144 char fname[30];
145 static int fnm = 1;
146 sprintf(fname, "DER%d", fnm++);
147 op = fopen(fname, "wb");
148 fwrite (p, 1, outlen, op);
149 fclose(op);
150 }
151#endif
152 ret = ASN1_item_d2i(NULL, &p, outlen, it); 137 ret = ASN1_item_d2i(NULL, &p, outlen, it);
153 if (zbuf) 138 if (zbuf)
154 OPENSSL_cleanse(out, outlen); 139 OPENSSL_cleanse(out, outlen);