aboutsummaryrefslogtreecommitdiff
path: root/crypto/pkcs12/p12_add.c
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>1999-04-24 13:28:57 +0000
committerDr. Stephen Henson <steve@openssl.org>1999-04-24 13:28:57 +0000
commit6e781e8e076545b5a15e189bbaccbd7aae60d03b (patch)
tree67d66d12fefd9b1082b0b0b1557f9c09a11355a1 /crypto/pkcs12/p12_add.c
parentad38bedbac71059fa85ee84888e308d50ae6f593 (diff)
downloadopenssl-6e781e8e076545b5a15e189bbaccbd7aae60d03b.zip
openssl-6e781e8e076545b5a15e189bbaccbd7aae60d03b.tar.gz
openssl-6e781e8e076545b5a15e189bbaccbd7aae60d03b.tar.bz2
Delete the unnecessary ERR and ERRC lines in makefiles, add some functionality
to error code script: it can now find untranslatable function codes (usually because the function is static and not defined in a header: occasionally because of a typo...) and unreferenced function and reason codes. To see this try: perl util/mkerr.pl -recurse -debug Also fixed some typos in crypto/pkcs12 that this found :-) Also tidy up some error calls that had to be all on one line: the old error script couldn't find codes unless the call was all on one line.
Diffstat (limited to 'crypto/pkcs12/p12_add.c')
-rw-r--r--crypto/pkcs12/p12_add.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/crypto/pkcs12/p12_add.c b/crypto/pkcs12/p12_add.c
index 3e203a1..b5858d1 100644
--- a/crypto/pkcs12/p12_add.c
+++ b/crypto/pkcs12/p12_add.c
@@ -91,7 +91,7 @@ PKCS12_SAFEBAG *PKCS12_MAKE_KEYBAG (PKCS8_PRIV_KEY_INFO *p8)
{
PKCS12_SAFEBAG *bag;
if (!(bag = PKCS12_SAFEBAG_new())) {
- PKCS12err(PKCS12_F_PKCS12_MAKE_SAFEBAG, ERR_R_MALLOC_FAILURE);
+ PKCS12err(PKCS12_F_PKCS12_MAKE_KEYBAG,ERR_R_MALLOC_FAILURE);
return NULL;
}
bag->type = OBJ_nid2obj(NID_keyBag);
@@ -128,12 +128,12 @@ PKCS7 *PKCS12_pack_p7data (STACK *sk)
{
PKCS7 *p7;
if (!(p7 = PKCS7_new())) {
- PKCS12err(PKCS12_F_PKCS12_PACK_P7_DATA, ERR_R_MALLOC_FAILURE);
+ PKCS12err(PKCS12_F_PKCS12_PACK_P7DATA, ERR_R_MALLOC_FAILURE);
return NULL;
}
p7->type = OBJ_nid2obj(NID_pkcs7_data);
if (!(p7->d.data = ASN1_OCTET_STRING_new())) {
- PKCS12err(PKCS12_F_PKCS12_PACK_P7_DATA, ERR_R_MALLOC_FAILURE);
+ PKCS12err(PKCS12_F_PKCS12_PACK_P7DATA, ERR_R_MALLOC_FAILURE);
return NULL;
}