← Back to branch summary

~andersk/ubuntu/oneiric/openssl/spurious-reboot

« back to all changes in this revision

Viewing changes to crypto/pkcs12/p12_attr.c

  • Committer: Bazaar Package Importer
  • Author(s): Kurt Roeckx
  • Date: 2010-12-12 15:37:21 UTC
  • mto: (1.2.1 upstream) (11.2.1 experimental)
  • mto: This revision was merged to the branch mainline in revision 55.
  • Revision ID: james.westby@ubuntu.com-20101212153721-mfw51stum5hwztpd
Tags: upstream-1.0.0c
Import upstream version 1.0.0c

Show diffs side-by-side

added added

removed removed

Lines of Context:
crypto/pkcs12/p12_attr.c
60
60
#include "cryptlib.h"
61
61
#include <openssl/pkcs12.h>
62
62
 
63
 
#ifdef OPENSSL_SYS_NETWARE
64
 
/* Rename these functions to avoid name clashes on NetWare OS */
65
 
#define uni2asc OPENSSL_uni2asc
66
 
#define asc2uni OPENSSL_asc2uni
67
 
#endif
68
 
 
69
63
/* Add a local keyid to a safebag */
70
64
 
71
65
int PKCS12_add_localkeyid(PKCS12_SAFEBAG *bag, unsigned char *name,
145
139
        ASN1_TYPE *atype;
146
140
        if (!(atype = PKCS12_get_attr(bag, NID_friendlyName))) return NULL;
147
141
        if (atype->type != V_ASN1_BMPSTRING) return NULL;
148
 
        return uni2asc(atype->value.bmpstring->data,
 
142
        return OPENSSL_uni2asc(atype->value.bmpstring->data,
149
143
                                 atype->value.bmpstring->length);
150
144
}
151
145