26a3a48d65
like Malloc, Realloc and especially Free conflict with already existing names on some operating systems or other packages. That is reason enough to change the names of the OpenSSL memory allocation macros to something that has a better chance of being unique, like prepending them with OPENSSL_. This change includes all the name changes needed throughout all C files.
89 lines
2.5 KiB
C
89 lines
2.5 KiB
C
/* pk7_attr.c */
|
|
/* S/MIME code.
|
|
* Copyright (C) 1997-8 Dr S N Henson (shenson@bigfoot.com)
|
|
* All Rights Reserved.
|
|
* Redistribution of this code without the authors permission is expressly
|
|
* prohibited.
|
|
*/
|
|
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <openssl/bio.h>
|
|
#include <openssl/asn1.h>
|
|
#include <openssl/pem.h>
|
|
#include <openssl/pkcs7.h>
|
|
#include <openssl/x509.h>
|
|
#include <openssl/err.h>
|
|
|
|
int PKCS7_add_attrib_smimecap(PKCS7_SIGNER_INFO *si, STACK_OF(X509_ALGOR) *cap)
|
|
{
|
|
ASN1_STRING *seq;
|
|
unsigned char *p, *pp;
|
|
int len;
|
|
len=i2d_ASN1_SET_OF_X509_ALGOR(cap,NULL,i2d_X509_ALGOR,
|
|
V_ASN1_SEQUENCE,V_ASN1_UNIVERSAL,
|
|
IS_SEQUENCE);
|
|
if(!(pp=(unsigned char *)OPENSSL_malloc(len))) {
|
|
PKCS7err(PKCS7_F_PKCS7_ADD_ATTRIB_SMIMECAP,ERR_R_MALLOC_FAILURE);
|
|
return 0;
|
|
}
|
|
p=pp;
|
|
i2d_ASN1_SET_OF_X509_ALGOR(cap,&p,i2d_X509_ALGOR, V_ASN1_SEQUENCE,
|
|
V_ASN1_UNIVERSAL, IS_SEQUENCE);
|
|
if(!(seq = ASN1_STRING_new())) {
|
|
PKCS7err(PKCS7_F_PKCS7_ADD_ATTRIB_SMIMECAP,ERR_R_MALLOC_FAILURE);
|
|
return 0;
|
|
}
|
|
if(!ASN1_STRING_set (seq, pp, len)) {
|
|
PKCS7err(PKCS7_F_PKCS7_ADD_ATTRIB_SMIMECAP,ERR_R_MALLOC_FAILURE);
|
|
return 0;
|
|
}
|
|
OPENSSL_free (pp);
|
|
return PKCS7_add_signed_attribute(si, NID_SMIMECapabilities,
|
|
V_ASN1_SEQUENCE, seq);
|
|
}
|
|
|
|
STACK_OF(X509_ALGOR) *PKCS7_get_smimecap(PKCS7_SIGNER_INFO *si)
|
|
{
|
|
ASN1_TYPE *cap;
|
|
unsigned char *p;
|
|
cap = PKCS7_get_signed_attribute(si, NID_SMIMECapabilities);
|
|
if (!cap) return NULL;
|
|
p = cap->value.sequence->data;
|
|
return d2i_ASN1_SET_OF_X509_ALGOR(NULL, &p,
|
|
cap->value.sequence->length,
|
|
d2i_X509_ALGOR, X509_ALGOR_free,
|
|
V_ASN1_SEQUENCE, V_ASN1_UNIVERSAL);
|
|
}
|
|
|
|
/* Basic smime-capabilities OID and optional integer arg */
|
|
int PKCS7_simple_smimecap(STACK_OF(X509_ALGOR) *sk, int nid, int arg)
|
|
{
|
|
X509_ALGOR *alg;
|
|
|
|
if(!(alg = X509_ALGOR_new())) {
|
|
PKCS7err(PKCS7_F_PKCS7_SIMPLE_SMIMECAP,ERR_R_MALLOC_FAILURE);
|
|
return 0;
|
|
}
|
|
ASN1_OBJECT_free(alg->algorithm);
|
|
alg->algorithm = OBJ_nid2obj (nid);
|
|
if (arg > 0) {
|
|
ASN1_INTEGER *nbit;
|
|
if(!(alg->parameter = ASN1_TYPE_new())) {
|
|
PKCS7err(PKCS7_F_PKCS7_SIMPLE_SMIMECAP,ERR_R_MALLOC_FAILURE);
|
|
return 0;
|
|
}
|
|
if(!(nbit = ASN1_INTEGER_new())) {
|
|
PKCS7err(PKCS7_F_PKCS7_SIMPLE_SMIMECAP,ERR_R_MALLOC_FAILURE);
|
|
return 0;
|
|
}
|
|
if(!ASN1_INTEGER_set (nbit, arg)) {
|
|
PKCS7err(PKCS7_F_PKCS7_SIMPLE_SMIMECAP,ERR_R_MALLOC_FAILURE);
|
|
return 0;
|
|
}
|
|
alg->parameter->value.integer = nbit;
|
|
alg->parameter->type = V_ASN1_INTEGER;
|
|
}
|
|
sk_X509_ALGOR_push (sk, alg);
|
|
return 1;
|
|
}
|