summaryrefslogtreecommitdiffstats
path: root/crypto/pkcs12/pkcs12.h
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/pkcs12.h
parentad38bedbac71059fa85ee84888e308d50ae6f593 (diff)
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/pkcs12.h')
-rw-r--r--crypto/pkcs12/pkcs12.h10
1 files changed, 4 insertions, 6 deletions
diff --git a/crypto/pkcs12/pkcs12.h b/crypto/pkcs12/pkcs12.h
index 4dd0d28955..4ba27db171 100644
--- a/crypto/pkcs12/pkcs12.h
+++ b/crypto/pkcs12/pkcs12.h
@@ -321,10 +321,10 @@ PKCS12 *d2i_PKCS12_fp();
/* Error codes for the PKCS12 functions. */
/* Function codes. */
-#define PKCS12_F_ADD_FRIENDLYNAME 100
-#define PKCS12_F_ADD_FRIENDLYNAME_ASC 101
-#define PKCS12_F_ADD_FRIENDLYNAME_UNI 102
#define PKCS12_F_PARSE_BAGS 103
+#define PKCS12_F_PKCS12_ADD_FRIENDLYNAME 100
+#define PKCS12_F_PKCS12_ADD_FRIENDLYNAME_ASC 127
+#define PKCS12_F_PKCS12_ADD_FRIENDLYNAME_UNI 102
#define PKCS12_F_PKCS12_ADD_LOCALKEYID 104
#define PKCS12_F_PKCS12_CREATE 105
#define PKCS12_F_PKCS12_DECRYPT_D2I 106
@@ -333,16 +333,14 @@ PKCS12 *d2i_PKCS12_fp();
#define PKCS12_F_PKCS12_INIT 109
#define PKCS12_F_PKCS12_KEY_GEN_ASC 110
#define PKCS12_F_PKCS12_KEY_GEN_UNI 111
-#define PKCS12_F_PKCS12_MAKE_SAFEBAG 112
+#define PKCS12_F_PKCS12_MAKE_KEYBAG 112
#define PKCS12_F_PKCS12_MAKE_SHKEYBAG 113
#define PKCS12_F_PKCS12_PACK_P7DATA 114
#define PKCS12_F_PKCS12_PACK_P7ENCDATA 115
-#define PKCS12_F_PKCS12_PACK_P7_DATA 116
#define PKCS12_F_PKCS12_PACK_SAFEBAG 117
#define PKCS12_F_PKCS12_PARSE 118
#define PKCS12_F_PKCS12_PBE_CRYPT 119
#define PKCS12_F_PKCS12_PBE_KEYIVGEN 120
-#define PKCS12_F_PKCS12_PKCS12_SET_MAC 121
#define PKCS12_F_PKCS12_SETUP_MAC 122
#define PKCS12_F_PKCS12_SET_MAC 123
#define PKCS12_F_PKCS8_ADD_KEYUSAGE 124