*/
#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <err.h>
-#include <hmac.h>
-#include <rand.h>
+#include "cryptlib.h"
+#include "hmac.h"
+#include "rand.h"
#include "pkcs12.h"
/* Generate a MAC */
-int PKCS12_gen_mac (p12, pass, passlen, mac, maclen)
-PKCS12 *p12;
-unsigned char *pass;
-int passlen;
-unsigned char *mac;
-unsigned int *maclen;
+int PKCS12_gen_mac (PKCS12 *p12, unsigned char *pass, int passlen,
+ unsigned char *mac, unsigned int *maclen)
{
- EVP_MD *md_type;
+ const EVP_MD *md_type;
HMAC_CTX hmac;
unsigned char key[PKCS12_MAC_KEY_LENGTH], *salt;
int saltlen, iter;
}
/* Verify the mac */
-int PKCS12_verify_mac (p12, pass, passlen)
-PKCS12 *p12;
-unsigned char *pass;
-int passlen;
+int PKCS12_verify_mac (PKCS12 *p12, unsigned char *pass, int passlen)
{
unsigned char mac[EVP_MAX_MD_SIZE];
unsigned int maclen;
/* Set a mac */
-int PKCS12_set_mac (p12, pass, passlen, salt, saltlen, iter, md_type)
-PKCS12 *p12;
-unsigned char *pass;
-int passlen;
-unsigned char *salt;
-int saltlen;
-int iter;
-EVP_MD *md_type;
+int PKCS12_set_mac (PKCS12 *p12, unsigned char *pass, int passlen,
+ unsigned char *salt, int saltlen, int iter, EVP_MD *md_type)
{
unsigned char mac[EVP_MAX_MD_SIZE];
int maclen;
}
/* Set up a mac structure */
-int PKCS12_setup_mac (p12, iter, salt, saltlen, md_type)
-PKCS12 *p12;
-int iter;
-unsigned char *salt;
-int saltlen;
-EVP_MD *md_type;
+int PKCS12_setup_mac (PKCS12 *p12, int iter, unsigned char *salt, int saltlen,
+ EVP_MD *md_type)
{
if (!(p12->mac = PKCS12_MAC_DATA_new ())) return PKCS12_ERROR;
if (iter > 1) {
}
if (!salt) RAND_bytes (p12->mac->salt->data, saltlen);
else memcpy (p12->mac->salt->data, salt, saltlen);
- M_ASN1_OBJECT_set(p12->mac->dinfo->algor->algorithm,
- EVP_MD_type(md_type));
+ p12->mac->dinfo->algor->algorithm = OBJ_nid2obj(EVP_MD_type(md_type));
if (!(p12->mac->dinfo->algor->parameter = ASN1_TYPE_new())) {
PKCS12err(PKCS12_F_PKCS12_SETUP_MAC, ERR_R_MALLOC_FAILURE);
return 0;