#include <stdio.h>
#include "cryptlib.h"
-#include "pkcs12.h"
+#include <openssl/pkcs12.h>
/* Uncomment out this line to get debugging info about key generation */
/*#define DEBUG_KEYGEN*/
#ifdef DEBUG_KEYGEN
-#include <bio.h>
+#include <openssl/bio.h>
extern BIO *bio_err;
void h__dump (unsigned char *p, int len);
#endif
#ifdef DEBUG_KEYGEN
unsigned char *tmpout = out;
int tmpn = n;
- BIO_printf (bio_err, "KEYGEN DEBUG\n");
- BIO_printf (bio_err, "ID %d, ITER %d\n", id, iter);
- BIO_printf (bio_err, "Password (length %d):\n", passlen);
- h__dump (pass, passlen);
- BIO_printf (bio_err, "Salt (length %d):\n", saltlen);
- h__dump (salt, saltlen);
- BIO_printf (bio_err, "ID %d, ITER %d\n\n", id, iter);
+#endif
+
+ if (!pass) {
+ PKCS12err(PKCS12_F_PKCS12_KEY_GEN_UNI,ERR_R_PASSED_NULL_PARAMETER);
+ return 0;
+ }
+
+#ifdef DEBUG_KEYGEN
+ fprintf(stderr, "KEYGEN DEBUG\n");
+ fprintf(stderr, "ID %d, ITER %d\n", id, iter);
+ fprintf(stderr, "Password (length %d):\n", passlen);
+ h__dump(pass, passlen);
+ fprintf(stderr, "Salt (length %d):\n", saltlen);
+ h__dump(salt, saltlen);
#endif
v = EVP_MD_block_size (md_type);
u = EVP_MD_size (md_type);
BN_free (Ij);
BN_free (Bpl1);
#ifdef DEBUG_KEYGEN
- BIO_printf (bio_err, "Output KEY (length %d)\n", tmpn);
- h__dump (tmpout, tmpn);
+ fprintf(stderr, "Output KEY (length %d)\n", tmpn);
+ h__dump(tmpout, tmpn);
#endif
return 1;
}
} else BN_bn2bin (Ij, I + j);
}
}
- return 0; /* This can't happen */
}
#ifdef DEBUG_KEYGEN
void h__dump (unsigned char *p, int len)
{
- for (; len --; p++) BIO_printf (bio_err, "%02X", *p);
- BIO_printf (bio_err, "\n");
+ for (; len --; p++) fprintf(stderr, "%02X", *p);
+ fprintf(stderr, "\n");
}
#endif