josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated OpenSSL lib. Thanks to Neo2003. Author: tomrus88

Browse Source 
--HG--
branch : trunk
This commit is contained in:
megamage
2009-03-21 14:39:04 -06:00
parent 59ce40e484
commit f1afff1a5b
63 changed files with 12216 additions and 10676 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dep/include/openssl/aes.h
+38 -29
View File
@@ -58,14 +58,18 @@
#error AES is disabled. #error AES is disabled.
#endif #endif
#define AES_ENCRYPT 1 #define AES_ENCRYPT 1
#define AES_DECRYPT 0 #define AES_DECRYPT 0
/* Because array size can't be a const in C, the following two are macros. /* Because array size can't be a const in C, the following two are macros.
Both sizes are in bytes. */ Both sizes are in bytes. */
#define AES_MAXNR 14 #define AES_MAXNR 14
#define AES_BLOCK_SIZE 16 #define AES_BLOCK_SIZE 16
#ifdef OPENSSL_FIPS
#define FIPS_AES_SIZE_T int
#endif
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
@@ -84,56 +88,61 @@ typedef struct aes_key_st AES_KEY;
const char *AES_options(void); const char *AES_options(void);
int AES_set_encrypt_key(const unsigned char *userKey, const int bits, int AES_set_encrypt_key(const unsigned char *userKey, const int bits,
AES_KEY *key); AES_KEY *key);
int AES_set_decrypt_key(const unsigned char *userKey, const int bits, int AES_set_decrypt_key(const unsigned char *userKey, const int bits,
AES_KEY *key); AES_KEY *key);
void AES_encrypt(const unsigned char *in, unsigned char *out, void AES_encrypt(const unsigned char *in, unsigned char *out,
const AES_KEY *key); const AES_KEY *key);
void AES_decrypt(const unsigned char *in, unsigned char *out, void AES_decrypt(const unsigned char *in, unsigned char *out,
const AES_KEY *key); const AES_KEY *key);
void AES_ecb_encrypt(const unsigned char *in, unsigned char *out, void AES_ecb_encrypt(const unsigned char *in, unsigned char *out,
const AES_KEY *key, const int enc); const AES_KEY *key, const int enc);
void AES_cbc_encrypt(const unsigned char *in, unsigned char *out, void AES_cbc_encrypt(const unsigned char *in, unsigned char *out,
const unsigned long length, const AES_KEY *key, const unsigned long length, const AES_KEY *key,
unsigned char *ivec, const int enc); unsigned char *ivec, const int enc);
void AES_cfb128_encrypt(const unsigned char *in, unsigned char *out, void AES_cfb128_encrypt(const unsigned char *in, unsigned char *out,
const unsigned long length, const AES_KEY *key, const unsigned long length, const AES_KEY *key,
unsigned char *ivec, int *num, const int enc); unsigned char *ivec, int *num, const int enc);
void AES_cfb1_encrypt(const unsigned char *in, unsigned char *out, void AES_cfb1_encrypt(const unsigned char *in, unsigned char *out,
const unsigned long length, const AES_KEY *key, const unsigned long length, const AES_KEY *key,
unsigned char *ivec, int *num, const int enc); unsigned char *ivec, int *num, const int enc);
void AES_cfb8_encrypt(const unsigned char *in, unsigned char *out, void AES_cfb8_encrypt(const unsigned char *in, unsigned char *out,
const unsigned long length, const AES_KEY *key, const unsigned long length, const AES_KEY *key,
unsigned char *ivec, int *num, const int enc); unsigned char *ivec, int *num, const int enc);
void AES_cfbr_encrypt_block(const unsigned char *in,unsigned char *out, void AES_cfbr_encrypt_block(const unsigned char *in,unsigned char *out,
const int nbits,const AES_KEY *key, const int nbits,const AES_KEY *key,
unsigned char *ivec,const int enc); unsigned char *ivec,const int enc);
void AES_ofb128_encrypt(const unsigned char *in, unsigned char *out, void AES_ofb128_encrypt(const unsigned char *in, unsigned char *out,
const unsigned long length, const AES_KEY *key, const unsigned long length, const AES_KEY *key,
unsigned char *ivec, int *num); unsigned char *ivec, int *num);
void AES_ctr128_encrypt(const unsigned char *in, unsigned char *out, void AES_ctr128_encrypt(const unsigned char *in, unsigned char *out,
const unsigned long length, const AES_KEY *key, const unsigned long length, const AES_KEY *key,
unsigned char ivec[AES_BLOCK_SIZE], unsigned char ivec[AES_BLOCK_SIZE],
unsigned char ecount_buf[AES_BLOCK_SIZE], unsigned char ecount_buf[AES_BLOCK_SIZE],
unsigned int *num); unsigned int *num);
/* For IGE, see also http://www.links.org/files/openssl-ige.pdf */ /* For IGE, see also http://www.links.org/files/openssl-ige.pdf */
/* NB: the IV is _two_ blocks long */ /* NB: the IV is _two_ blocks long */
void AES_ige_encrypt(const unsigned char *in, unsigned char *out, void AES_ige_encrypt(const unsigned char *in, unsigned char *out,
const unsigned long length, const AES_KEY *key, const unsigned long length, const AES_KEY *key,
unsigned char *ivec, const int enc); unsigned char *ivec, const int enc);
/* NB: the IV is _four_ blocks long */ /* NB: the IV is _four_ blocks long */
void AES_bi_ige_encrypt(const unsigned char *in, unsigned char *out, void AES_bi_ige_encrypt(const unsigned char *in, unsigned char *out,
const unsigned long length, const AES_KEY *key, const unsigned long length, const AES_KEY *key,
const AES_KEY *key2, const unsigned char *ivec, const AES_KEY *key2, const unsigned char *ivec,
const int enc); const int enc);
int AES_wrap_key(AES_KEY *key, const unsigned char *iv,
unsigned char *out,
const unsigned char *in, unsigned int inlen);
int AES_unwrap_key(AES_KEY *key, const unsigned char *iv,
unsigned char *out,
const unsigned char *in, unsigned int inlen);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif /* !HEADER_AES_H */ #endif /* !HEADER_AES_H */
dep/include/openssl/asn1.h
+701 -609
View File
File diff suppressed because it is too large Load Diff
dep/include/openssl/asn1t.h
+321 -315
View File
@@ -1,5 +1,5 @@
/* asn1t.h */ /* asn1t.h */
/* Written by Dr Stephen N Henson (s[email protected]) for the OpenSSL /* Written by Dr Stephen N Henson (s[email protected]) for the OpenSSL
* project 2000. * project 2000.
*/ */
/* ==================================================================== /* ====================================================================
@@ -83,10 +83,10 @@ extern "C" {
/* Macros for start and end of ASN1_ITEM definition */ /* Macros for start and end of ASN1_ITEM definition */
#define ASN1_ITEM_start(itname) \ #define ASN1_ITEM_start(itname) \
OPENSSL_GLOBAL const ASN1_ITEM itname##_it = { OPENSSL_GLOBAL const ASN1_ITEM itname##_it = {
#define ASN1_ITEM_end(itname) \ #define ASN1_ITEM_end(itname) \
}; };
#else #else
@@ -97,14 +97,14 @@ extern "C" {
/* Macros for start and end of ASN1_ITEM definition */ /* Macros for start and end of ASN1_ITEM definition */
#define ASN1_ITEM_start(itname) \ #define ASN1_ITEM_start(itname) \
const ASN1_ITEM * itname##_it(void) \ const ASN1_ITEM * itname##_it(void) \
{ \ { \
static const ASN1_ITEM local_it = { static const ASN1_ITEM local_it = {
#define ASN1_ITEM_end(itname) \ #define ASN1_ITEM_end(itname) \
}; \ }; \
return &local_it; \ return &local_it; \
} }
#endif #endif
@@ -112,90 +112,93 @@ extern "C" {
/* Macros to aid ASN1 template writing */ /* Macros to aid ASN1 template writing */
#define ASN1_ITEM_TEMPLATE(tname) \ #define ASN1_ITEM_TEMPLATE(tname) \
static const ASN1_TEMPLATE tname##_item_tt static const ASN1_TEMPLATE tname##_item_tt
#define ASN1_ITEM_TEMPLATE_END(tname) \ #define ASN1_ITEM_TEMPLATE_END(tname) \
;\ ;\
ASN1_ITEM_start(tname) \ ASN1_ITEM_start(tname) \
ASN1_ITYPE_PRIMITIVE,\ ASN1_ITYPE_PRIMITIVE,\
-1,\ -1,\
&tname##_item_tt,\ &tname##_item_tt,\
0,\ 0,\
NULL,\ NULL,\
0,\ 0,\
#tname \ #tname \
ASN1_ITEM_end(tname) ASN1_ITEM_end(tname)
/* This is a ASN1 type which just embeds a template */ /* This is a ASN1 type which just embeds a template */
/* This pair helps declare a SEQUENCE. We can do: /* This pair helps declare a SEQUENCE. We can do:
* *
* ASN1_SEQUENCE(stname) = { * ASN1_SEQUENCE(stname) = {
* ... SEQUENCE components ... * ... SEQUENCE components ...
* } ASN1_SEQUENCE_END(stname) * } ASN1_SEQUENCE_END(stname)
* *
* This will produce an ASN1_ITEM called stname_it * This will produce an ASN1_ITEM called stname_it
* for a structure called stname. * for a structure called stname.
* *
* If you want the same structure but a different * If you want the same structure but a different
* name then use: * name then use:
* *
* ASN1_SEQUENCE(itname) = { * ASN1_SEQUENCE(itname) = {
* ... SEQUENCE components ... * ... SEQUENCE components ...
* } ASN1_SEQUENCE_END_name(stname, itname) * } ASN1_SEQUENCE_END_name(stname, itname)
* *
* This will create an item called itname_it using * This will create an item called itname_it using
* a structure called stname. * a structure called stname.
*/ */
#define ASN1_SEQUENCE(tname) \ #define ASN1_SEQUENCE(tname) \
static const ASN1_TEMPLATE tname##_seq_tt[] static const ASN1_TEMPLATE tname##_seq_tt[]
#define ASN1_SEQUENCE_END(stname) ASN1_SEQUENCE_END_name(stname, stname) #define ASN1_SEQUENCE_END(stname) ASN1_SEQUENCE_END_name(stname, stname)
#define ASN1_SEQUENCE_END_name(stname, tname) \ #define ASN1_SEQUENCE_END_name(stname, tname) \
;\ ;\
ASN1_ITEM_start(tname) \ ASN1_ITEM_start(tname) \
ASN1_ITYPE_SEQUENCE,\ ASN1_ITYPE_SEQUENCE,\
V_ASN1_SEQUENCE,\ V_ASN1_SEQUENCE,\
tname##_seq_tt,\ tname##_seq_tt,\
sizeof(tname##_seq_tt) / sizeof(ASN1_TEMPLATE),\ sizeof(tname##_seq_tt) / sizeof(ASN1_TEMPLATE),\
NULL,\ NULL,\
sizeof(stname),\ sizeof(stname),\
#stname \ #stname \
ASN1_ITEM_end(tname) ASN1_ITEM_end(tname)
#define ASN1_NDEF_SEQUENCE(tname) \ #define ASN1_NDEF_SEQUENCE(tname) \
ASN1_SEQUENCE(tname) ASN1_SEQUENCE(tname)
#define ASN1_NDEF_SEQUENCE_cb(tname, cb) \
ASN1_SEQUENCE_cb(tname, cb)
#define ASN1_SEQUENCE_cb(tname, cb) \ #define ASN1_SEQUENCE_cb(tname, cb) \
static const ASN1_AUX tname##_aux = {NULL, 0, 0, 0, cb, 0}; \ static const ASN1_AUX tname##_aux = {NULL, 0, 0, 0, cb, 0}; \
ASN1_SEQUENCE(tname) ASN1_SEQUENCE(tname)
#define ASN1_BROKEN_SEQUENCE(tname) \ #define ASN1_BROKEN_SEQUENCE(tname) \
static const ASN1_AUX tname##_aux = {NULL, ASN1_AFLG_BROKEN, 0, 0, 0, 0}; \ static const ASN1_AUX tname##_aux = {NULL, ASN1_AFLG_BROKEN, 0, 0, 0, 0}; \
ASN1_SEQUENCE(tname) ASN1_SEQUENCE(tname)
#define ASN1_SEQUENCE_ref(tname, cb, lck) \ #define ASN1_SEQUENCE_ref(tname, cb, lck) \
static const ASN1_AUX tname##_aux = {NULL, ASN1_AFLG_REFCOUNT, offsetof(tname, references), lck, cb, 0}; \ static const ASN1_AUX tname##_aux = {NULL, ASN1_AFLG_REFCOUNT, offsetof(tname, references), lck, cb, 0}; \
ASN1_SEQUENCE(tname) ASN1_SEQUENCE(tname)
#define ASN1_SEQUENCE_enc(tname, enc, cb) \ #define ASN1_SEQUENCE_enc(tname, enc, cb) \
static const ASN1_AUX tname##_aux = {NULL, ASN1_AFLG_ENCODING, 0, 0, cb, offsetof(tname, enc)}; \ static const ASN1_AUX tname##_aux = {NULL, ASN1_AFLG_ENCODING, 0, 0, cb, offsetof(tname, enc)}; \
ASN1_SEQUENCE(tname) ASN1_SEQUENCE(tname)
#define ASN1_NDEF_SEQUENCE_END(tname) \ #define ASN1_NDEF_SEQUENCE_END(tname) \
;\ ;\
ASN1_ITEM_start(tname) \ ASN1_ITEM_start(tname) \
ASN1_ITYPE_NDEF_SEQUENCE,\ ASN1_ITYPE_NDEF_SEQUENCE,\
V_ASN1_SEQUENCE,\ V_ASN1_SEQUENCE,\
tname##_seq_tt,\ tname##_seq_tt,\
sizeof(tname##_seq_tt) / sizeof(ASN1_TEMPLATE),\ sizeof(tname##_seq_tt) / sizeof(ASN1_TEMPLATE),\
NULL,\ NULL,\
sizeof(tname),\ sizeof(tname),\
#tname \ #tname \
ASN1_ITEM_end(tname) ASN1_ITEM_end(tname)
#define ASN1_BROKEN_SEQUENCE_END(stname) ASN1_SEQUENCE_END_ref(stname, stname) #define ASN1_BROKEN_SEQUENCE_END(stname) ASN1_SEQUENCE_END_ref(stname, stname)
@@ -204,101 +207,101 @@ extern "C" {
#define ASN1_SEQUENCE_END_cb(stname, tname) ASN1_SEQUENCE_END_ref(stname, tname) #define ASN1_SEQUENCE_END_cb(stname, tname) ASN1_SEQUENCE_END_ref(stname, tname)
#define ASN1_SEQUENCE_END_ref(stname, tname) \ #define ASN1_SEQUENCE_END_ref(stname, tname) \
;\ ;\
ASN1_ITEM_start(tname) \ ASN1_ITEM_start(tname) \
ASN1_ITYPE_SEQUENCE,\ ASN1_ITYPE_SEQUENCE,\
V_ASN1_SEQUENCE,\ V_ASN1_SEQUENCE,\
tname##_seq_tt,\ tname##_seq_tt,\
sizeof(tname##_seq_tt) / sizeof(ASN1_TEMPLATE),\ sizeof(tname##_seq_tt) / sizeof(ASN1_TEMPLATE),\
&tname##_aux,\ &tname##_aux,\
sizeof(stname),\ sizeof(stname),\
#stname \ #stname \
ASN1_ITEM_end(tname) ASN1_ITEM_end(tname)
/* This pair helps declare a CHOICE type. We can do: /* This pair helps declare a CHOICE type. We can do:
* *
* ASN1_CHOICE(chname) = { * ASN1_CHOICE(chname) = {
* ... CHOICE options ... * ... CHOICE options ...
* ASN1_CHOICE_END(chname) * ASN1_CHOICE_END(chname)
* *
* This will produce an ASN1_ITEM called chname_it * This will produce an ASN1_ITEM called chname_it
* for a structure called chname. The structure * for a structure called chname. The structure
* definition must look like this: * definition must look like this:
* typedef struct { * typedef struct {
* int type; * int type;
* union { * union {
* ASN1_SOMETHING *opt1; * ASN1_SOMETHING *opt1;
* ASN1_SOMEOTHER *opt2; * ASN1_SOMEOTHER *opt2;
* } value; * } value;
* } chname; * } chname;
* *
* the name of the selector must be 'type'. * the name of the selector must be 'type'.
* to use an alternative selector name use the * to use an alternative selector name use the
* ASN1_CHOICE_END_selector() version. * ASN1_CHOICE_END_selector() version.
*/ */
#define ASN1_CHOICE(tname) \ #define ASN1_CHOICE(tname) \
static const ASN1_TEMPLATE tname##_ch_tt[] static const ASN1_TEMPLATE tname##_ch_tt[]
#define ASN1_CHOICE_cb(tname, cb) \ #define ASN1_CHOICE_cb(tname, cb) \
static const ASN1_AUX tname##_aux = {NULL, 0, 0, 0, cb, 0}; \ static const ASN1_AUX tname##_aux = {NULL, 0, 0, 0, cb, 0}; \
ASN1_CHOICE(tname) ASN1_CHOICE(tname)
#define ASN1_CHOICE_END(stname) ASN1_CHOICE_END_name(stname, stname) #define ASN1_CHOICE_END(stname) ASN1_CHOICE_END_name(stname, stname)
#define ASN1_CHOICE_END_name(stname, tname) ASN1_CHOICE_END_selector(stname, tname, type) #define ASN1_CHOICE_END_name(stname, tname) ASN1_CHOICE_END_selector(stname, tname, type)
#define ASN1_CHOICE_END_selector(stname, tname, selname) \ #define ASN1_CHOICE_END_selector(stname, tname, selname) \
;\ ;\
ASN1_ITEM_start(tname) \ ASN1_ITEM_start(tname) \
ASN1_ITYPE_CHOICE,\ ASN1_ITYPE_CHOICE,\
offsetof(stname,selname) ,\ offsetof(stname,selname) ,\
tname##_ch_tt,\ tname##_ch_tt,\
sizeof(tname##_ch_tt) / sizeof(ASN1_TEMPLATE),\ sizeof(tname##_ch_tt) / sizeof(ASN1_TEMPLATE),\
NULL,\ NULL,\
sizeof(stname),\ sizeof(stname),\
#stname \ #stname \
ASN1_ITEM_end(tname) ASN1_ITEM_end(tname)
#define ASN1_CHOICE_END_cb(stname, tname, selname) \ #define ASN1_CHOICE_END_cb(stname, tname, selname) \
;\ ;\
ASN1_ITEM_start(tname) \ ASN1_ITEM_start(tname) \
ASN1_ITYPE_CHOICE,\ ASN1_ITYPE_CHOICE,\
offsetof(stname,selname) ,\ offsetof(stname,selname) ,\
tname##_ch_tt,\ tname##_ch_tt,\
sizeof(tname##_ch_tt) / sizeof(ASN1_TEMPLATE),\ sizeof(tname##_ch_tt) / sizeof(ASN1_TEMPLATE),\
&tname##_aux,\ &tname##_aux,\
sizeof(stname),\ sizeof(stname),\
#stname \ #stname \
ASN1_ITEM_end(tname) ASN1_ITEM_end(tname)
/* This helps with the template wrapper form of ASN1_ITEM */ /* This helps with the template wrapper form of ASN1_ITEM */
#define ASN1_EX_TEMPLATE_TYPE(flags, tag, name, type) { \ #define ASN1_EX_TEMPLATE_TYPE(flags, tag, name, type) { \
(flags), (tag), 0,\ (flags), (tag), 0,\
#name, ASN1_ITEM_ref(type) } #name, ASN1_ITEM_ref(type) }
/* These help with SEQUENCE or CHOICE components */ /* These help with SEQUENCE or CHOICE components */
/* used to declare other types */ /* used to declare other types */
#define ASN1_EX_TYPE(flags, tag, stname, field, type) { \ #define ASN1_EX_TYPE(flags, tag, stname, field, type) { \
(flags), (tag), offsetof(stname, field),\ (flags), (tag), offsetof(stname, field),\
#field, ASN1_ITEM_ref(type) } #field, ASN1_ITEM_ref(type) }
/* used when the structure is combined with the parent */ /* used when the structure is combined with the parent */
#define ASN1_EX_COMBINE(flags, tag, type) { \ #define ASN1_EX_COMBINE(flags, tag, type) { \
(flags)|ASN1_TFLG_COMBINE, (tag), 0, NULL, ASN1_ITEM_ref(type) } (flags)|ASN1_TFLG_COMBINE, (tag), 0, NULL, ASN1_ITEM_ref(type) }
/* implicit and explicit helper macros */ /* implicit and explicit helper macros */
#define ASN1_IMP_EX(stname, field, type, tag, ex) \ #define ASN1_IMP_EX(stname, field, type, tag, ex) \
ASN1_EX_TYPE(ASN1_TFLG_IMPLICIT | ex, tag, stname, field, type) ASN1_EX_TYPE(ASN1_TFLG_IMPLICIT | ex, tag, stname, field, type)
#define ASN1_EXP_EX(stname, field, type, tag, ex) \ #define ASN1_EXP_EX(stname, field, type, tag, ex) \
ASN1_EX_TYPE(ASN1_TFLG_EXPLICIT | ex, tag, stname, field, type) ASN1_EX_TYPE(ASN1_TFLG_EXPLICIT | ex, tag, stname, field, type)
/* Any defined by macros: the field used is in the table itself */ /* Any defined by macros: the field used is in the table itself */
@@ -328,95 +331,99 @@ extern "C" {
/* SEQUENCE OF type */ /* SEQUENCE OF type */
#define ASN1_SEQUENCE_OF(stname, field, type) \ #define ASN1_SEQUENCE_OF(stname, field, type) \
ASN1_EX_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, stname, field, type) ASN1_EX_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, stname, field, type)
/* OPTIONAL SEQUENCE OF */ /* OPTIONAL SEQUENCE OF */
#define ASN1_SEQUENCE_OF_OPT(stname, field, type) \ #define ASN1_SEQUENCE_OF_OPT(stname, field, type) \
ASN1_EX_TYPE(ASN1_TFLG_SEQUENCE_OF|ASN1_TFLG_OPTIONAL, 0, stname, field, type) ASN1_EX_TYPE(ASN1_TFLG_SEQUENCE_OF|ASN1_TFLG_OPTIONAL, 0, stname, field, type)
/* Same as above but for SET OF */ /* Same as above but for SET OF */
#define ASN1_SET_OF(stname, field, type) \ #define ASN1_SET_OF(stname, field, type) \
ASN1_EX_TYPE(ASN1_TFLG_SET_OF, 0, stname, field, type) ASN1_EX_TYPE(ASN1_TFLG_SET_OF, 0, stname, field, type)
#define ASN1_SET_OF_OPT(stname, field, type) \ #define ASN1_SET_OF_OPT(stname, field, type) \
ASN1_EX_TYPE(ASN1_TFLG_SET_OF|ASN1_TFLG_OPTIONAL, 0, stname, field, type) ASN1_EX_TYPE(ASN1_TFLG_SET_OF|ASN1_TFLG_OPTIONAL, 0, stname, field, type)
/* Finally compound types of SEQUENCE, SET, IMPLICIT, EXPLICIT and OPTIONAL */ /* Finally compound types of SEQUENCE, SET, IMPLICIT, EXPLICIT and OPTIONAL */
#define ASN1_IMP_SET_OF(stname, field, type, tag) \ #define ASN1_IMP_SET_OF(stname, field, type, tag) \
ASN1_IMP_EX(stname, field, type, tag, ASN1_TFLG_SET_OF) ASN1_IMP_EX(stname, field, type, tag, ASN1_TFLG_SET_OF)
#define ASN1_EXP_SET_OF(stname, field, type, tag) \ #define ASN1_EXP_SET_OF(stname, field, type, tag) \
ASN1_EXP_EX(stname, field, type, tag, ASN1_TFLG_SET_OF) ASN1_EXP_EX(stname, field, type, tag, ASN1_TFLG_SET_OF)
#define ASN1_IMP_SET_OF_OPT(stname, field, type, tag) \ #define ASN1_IMP_SET_OF_OPT(stname, field, type, tag) \
ASN1_IMP_EX(stname, field, type, tag, ASN1_TFLG_SET_OF|ASN1_TFLG_OPTIONAL) ASN1_IMP_EX(stname, field, type, tag, ASN1_TFLG_SET_OF|ASN1_TFLG_OPTIONAL)
#define ASN1_EXP_SET_OF_OPT(stname, field, type, tag) \ #define ASN1_EXP_SET_OF_OPT(stname, field, type, tag) \
ASN1_EXP_EX(stname, field, type, tag, ASN1_TFLG_SET_OF|ASN1_TFLG_OPTIONAL) ASN1_EXP_EX(stname, field, type, tag, ASN1_TFLG_SET_OF|ASN1_TFLG_OPTIONAL)
#define ASN1_IMP_SEQUENCE_OF(stname, field, type, tag) \ #define ASN1_IMP_SEQUENCE_OF(stname, field, type, tag) \
ASN1_IMP_EX(stname, field, type, tag, ASN1_TFLG_SEQUENCE_OF) ASN1_IMP_EX(stname, field, type, tag, ASN1_TFLG_SEQUENCE_OF)
#define ASN1_IMP_SEQUENCE_OF_OPT(stname, field, type, tag) \ #define ASN1_IMP_SEQUENCE_OF_OPT(stname, field, type, tag) \
ASN1_IMP_EX(stname, field, type, tag, ASN1_TFLG_SEQUENCE_OF|ASN1_TFLG_OPTIONAL) ASN1_IMP_EX(stname, field, type, tag, ASN1_TFLG_SEQUENCE_OF|ASN1_TFLG_OPTIONAL)
#define ASN1_EXP_SEQUENCE_OF(stname, field, type, tag) \ #define ASN1_EXP_SEQUENCE_OF(stname, field, type, tag) \
ASN1_EXP_EX(stname, field, type, tag, ASN1_TFLG_SEQUENCE_OF) ASN1_EXP_EX(stname, field, type, tag, ASN1_TFLG_SEQUENCE_OF)
#define ASN1_EXP_SEQUENCE_OF_OPT(stname, field, type, tag) \ #define ASN1_EXP_SEQUENCE_OF_OPT(stname, field, type, tag) \
ASN1_EXP_EX(stname, field, type, tag, ASN1_TFLG_SEQUENCE_OF|ASN1_TFLG_OPTIONAL) ASN1_EXP_EX(stname, field, type, tag, ASN1_TFLG_SEQUENCE_OF|ASN1_TFLG_OPTIONAL)
/* EXPLICIT using indefinite length constructed form */
#define ASN1_NDEF_EXP(stname, field, type, tag) \
ASN1_EXP_EX(stname, field, type, tag, ASN1_TFLG_NDEF)
/* EXPLICIT OPTIONAL using indefinite length constructed form */ /* EXPLICIT OPTIONAL using indefinite length constructed form */
#define ASN1_NDEF_EXP_OPT(stname, field, type, tag) \ #define ASN1_NDEF_EXP_OPT(stname, field, type, tag) \
ASN1_EXP_EX(stname, field, type, tag, ASN1_TFLG_OPTIONAL|ASN1_TFLG_NDEF) ASN1_EXP_EX(stname, field, type, tag, ASN1_TFLG_OPTIONAL|ASN1_TFLG_NDEF)
/* Macros for the ASN1_ADB structure */ /* Macros for the ASN1_ADB structure */
#define ASN1_ADB(name) \ #define ASN1_ADB(name) \
static const ASN1_ADB_TABLE name##_adbtbl[] static const ASN1_ADB_TABLE name##_adbtbl[]
#ifndef OPENSSL_EXPORT_VAR_AS_FUNCTION #ifndef OPENSSL_EXPORT_VAR_AS_FUNCTION
#define ASN1_ADB_END(name, flags, field, app_table, def, none) \ #define ASN1_ADB_END(name, flags, field, app_table, def, none) \
;\ ;\
static const ASN1_ADB name##_adb = {\ static const ASN1_ADB name##_adb = {\
flags,\ flags,\
offsetof(name, field),\ offsetof(name, field),\
app_table,\ app_table,\
name##_adbtbl,\ name##_adbtbl,\
sizeof(name##_adbtbl) / sizeof(ASN1_ADB_TABLE),\ sizeof(name##_adbtbl) / sizeof(ASN1_ADB_TABLE),\
def,\ def,\
none\ none\
} }
#else #else
#define ASN1_ADB_END(name, flags, field, app_table, def, none) \ #define ASN1_ADB_END(name, flags, field, app_table, def, none) \
;\ ;\
static const ASN1_ITEM *name##_adb(void) \ static const ASN1_ITEM *name##_adb(void) \
{ \ { \
static const ASN1_ADB internal_adb = \ static const ASN1_ADB internal_adb = \
{\ {\
flags,\ flags,\
offsetof(name, field),\ offsetof(name, field),\
app_table,\ app_table,\
name##_adbtbl,\ name##_adbtbl,\
sizeof(name##_adbtbl) / sizeof(ASN1_ADB_TABLE),\ sizeof(name##_adbtbl) / sizeof(ASN1_ADB_TABLE),\
def,\ def,\
none\ none\
}; \ }; \
return (const ASN1_ITEM *) &internal_adb; \ return (const ASN1_ITEM *) &internal_adb; \
} \ } \
void dummy_function(void) void dummy_function(void)
#endif #endif
#define ADB_ENTRY(val, template) {val, template} #define ADB_ENTRY(val, template) {val, template}
#define ASN1_ADB_TEMPLATE(name) \ #define ASN1_ADB_TEMPLATE(name) \
static const ASN1_TEMPLATE name##_tt static const ASN1_TEMPLATE name##_tt
/* This is the ASN1 template structure that defines /* This is the ASN1 template structure that defines
* a wrapper round the actual type. It determines the * a wrapper round the actual type. It determines the
@@ -425,13 +432,13 @@ extern "C" {
*/ */
struct ASN1_TEMPLATE_st { struct ASN1_TEMPLATE_st {
unsigned long flags; /* Various flags */ unsigned long flags; /* Various flags */
long tag; /* tag, not used if no tagging */ long tag; /* tag, not used if no tagging */
unsigned long offset; /* Offset of this field in structure */ unsigned long offset; /* Offset of this field in structure */
#ifndef NO_ASN1_FIELD_NAMES #ifndef NO_ASN1_FIELD_NAMES
const char *field_name; /* Field name */ const char *field_name; /* Field name */
#endif #endif
ASN1_ITEM_EXP *item; /* Relevant ASN1_ITEM or ASN1_ADB */ ASN1_ITEM_EXP *item; /* Relevant ASN1_ITEM or ASN1_ADB */
}; };
/* Macro to extract ASN1_ITEM and ASN1_ADB pointer from ASN1_TEMPLATE */ /* Macro to extract ASN1_ITEM and ASN1_ADB pointer from ASN1_TEMPLATE */
@@ -443,40 +450,40 @@ typedef struct ASN1_ADB_TABLE_st ASN1_ADB_TABLE;
typedef struct ASN1_ADB_st ASN1_ADB; typedef struct ASN1_ADB_st ASN1_ADB;
struct ASN1_ADB_st { struct ASN1_ADB_st {
unsigned long flags; /* Various flags */ unsigned long flags; /* Various flags */
unsigned long offset; /* Offset of selector field */ unsigned long offset; /* Offset of selector field */
STACK_OF(ASN1_ADB_TABLE) **app_items; /* Application defined items */ STACK_OF(ASN1_ADB_TABLE) **app_items; /* Application defined items */
const ASN1_ADB_TABLE *tbl; /* Table of possible types */ const ASN1_ADB_TABLE *tbl; /* Table of possible types */
long tblcount; /* Number of entries in tbl */ long tblcount; /* Number of entries in tbl */
const ASN1_TEMPLATE *default_tt; /* Type to use if no match */ const ASN1_TEMPLATE *default_tt; /* Type to use if no match */
const ASN1_TEMPLATE *null_tt; /* Type to use if selector is NULL */ const ASN1_TEMPLATE *null_tt; /* Type to use if selector is NULL */
}; };
struct ASN1_ADB_TABLE_st { struct ASN1_ADB_TABLE_st {
long value; /* NID for an object or value for an int */ long value; /* NID for an object or value for an int */
const ASN1_TEMPLATE tt; /* item for this value */ const ASN1_TEMPLATE tt; /* item for this value */
}; };
/* template flags */ /* template flags */
/* Field is optional */ /* Field is optional */
#define ASN1_TFLG_OPTIONAL (0x1) #define ASN1_TFLG_OPTIONAL (0x1)
/* Field is a SET OF */ /* Field is a SET OF */
#define ASN1_TFLG_SET_OF (0x1 << 1) #define ASN1_TFLG_SET_OF (0x1 << 1)
/* Field is a SEQUENCE OF */ /* Field is a SEQUENCE OF */
#define ASN1_TFLG_SEQUENCE_OF (0x2 << 1) #define ASN1_TFLG_SEQUENCE_OF (0x2 << 1)
/* Special case: this refers to a SET OF that /* Special case: this refers to a SET OF that
* will be sorted into DER order when encoded *and* * will be sorted into DER order when encoded *and*
* the corresponding STACK will be modified to match * the corresponding STACK will be modified to match
* the new order. * the new order.
*/ */
#define ASN1_TFLG_SET_ORDER (0x3 << 1) #define ASN1_TFLG_SET_ORDER (0x3 << 1)
/* Mask for SET OF or SEQUENCE OF */ /* Mask for SET OF or SEQUENCE OF */
#define ASN1_TFLG_SK_MASK (0x3 << 1) #define ASN1_TFLG_SK_MASK (0x3 << 1)
/* These flags mean the tag should be taken from the /* These flags mean the tag should be taken from the
* tag field. If EXPLICIT then the underlying type * tag field. If EXPLICIT then the underlying type
@@ -484,19 +491,19 @@ struct ASN1_ADB_TABLE_st {
*/ */
/* IMPLICIT tagging */ /* IMPLICIT tagging */
#define ASN1_TFLG_IMPTAG (0x1 << 3) #define ASN1_TFLG_IMPTAG (0x1 << 3)
/* EXPLICIT tagging, inner tag from underlying type */ /* EXPLICIT tagging, inner tag from underlying type */
#define ASN1_TFLG_EXPTAG (0x2 << 3) #define ASN1_TFLG_EXPTAG (0x2 << 3)
#define ASN1_TFLG_TAG_MASK (0x3 << 3) #define ASN1_TFLG_TAG_MASK (0x3 << 3)
/* context specific IMPLICIT */ /* context specific IMPLICIT */
#define ASN1_TFLG_IMPLICIT ASN1_TFLG_IMPTAG|ASN1_TFLG_CONTEXT #define ASN1_TFLG_IMPLICIT ASN1_TFLG_IMPTAG|ASN1_TFLG_CONTEXT
/* context specific EXPLICIT */ /* context specific EXPLICIT */
#define ASN1_TFLG_EXPLICIT ASN1_TFLG_EXPTAG|ASN1_TFLG_CONTEXT #define ASN1_TFLG_EXPLICIT ASN1_TFLG_EXPTAG|ASN1_TFLG_CONTEXT
/* If tagging is in force these determine the /* If tagging is in force these determine the
* type of tag to use. Otherwise the tag is * type of tag to use. Otherwise the tag is
@@ -505,15 +512,15 @@ struct ASN1_ADB_TABLE_st {
*/ */
/* Universal tag */ /* Universal tag */
#define ASN1_TFLG_UNIVERSAL (0x0<<6) #define ASN1_TFLG_UNIVERSAL (0x0<<6)
/* Application tag */ /* Application tag */
#define ASN1_TFLG_APPLICATION (0x1<<6) #define ASN1_TFLG_APPLICATION (0x1<<6)
/* Context specific tag */ /* Context specific tag */
#define ASN1_TFLG_CONTEXT (0x2<<6) #define ASN1_TFLG_CONTEXT (0x2<<6)
/* Private tag */ /* Private tag */
#define ASN1_TFLG_PRIVATE (0x3<<6) #define ASN1_TFLG_PRIVATE (0x3<<6)
#define ASN1_TFLG_TAG_CLASS (0x3<<6) #define ASN1_TFLG_TAG_CLASS (0x3<<6)
/* These are for ANY DEFINED BY type. In this case /* These are for ANY DEFINED BY type. In this case
* the 'item' field points to an ASN1_ADB structure * the 'item' field points to an ASN1_ADB structure
@@ -521,11 +528,11 @@ struct ASN1_ADB_TABLE_st {
* relevant type * relevant type
*/ */
#define ASN1_TFLG_ADB_MASK (0x3<<8) #define ASN1_TFLG_ADB_MASK (0x3<<8)
#define ASN1_TFLG_ADB_OID (0x1<<8) #define ASN1_TFLG_ADB_OID (0x1<<8)
#define ASN1_TFLG_ADB_INT (0x1<<9) #define ASN1_TFLG_ADB_INT (0x1<<9)
/* This flag means a parent structure is passed /* This flag means a parent structure is passed
* instead of the field: this is useful is a * instead of the field: this is useful is a
@@ -535,26 +542,26 @@ struct ASN1_ADB_TABLE_st {
* ASN1_CHOICE_END_name() macro for example. * ASN1_CHOICE_END_name() macro for example.
*/ */
#define ASN1_TFLG_COMBINE (0x1<<10) #define ASN1_TFLG_COMBINE (0x1<<10)
/* This flag when present in a SEQUENCE OF, SET OF /* This flag when present in a SEQUENCE OF, SET OF
* or EXPLICIT causes indefinite length constructed * or EXPLICIT causes indefinite length constructed
* encoding to be used if required. * encoding to be used if required.
*/ */
#define ASN1_TFLG_NDEF (0x1<<11) #define ASN1_TFLG_NDEF (0x1<<11)
/* This is the actual ASN1 item itself */ /* This is the actual ASN1 item itself */
struct ASN1_ITEM_st { struct ASN1_ITEM_st {
char itype; /* The item type, primitive, SEQUENCE, CHOICE or extern */ char itype; /* The item type, primitive, SEQUENCE, CHOICE or extern */
long utype; /* underlying type */ long utype; /* underlying type */
const ASN1_TEMPLATE *templates; /* If SEQUENCE or CHOICE this contains the contents */ const ASN1_TEMPLATE *templates; /* If SEQUENCE or CHOICE this contains the contents */
long tcount; /* Number of templates if SEQUENCE or CHOICE */ long tcount; /* Number of templates if SEQUENCE or CHOICE */
const void *funcs; /* functions that handle this type */ const void *funcs; /* functions that handle this type */
long size; /* Structure size (usually)*/ long size; /* Structure size (usually)*/
#ifndef NO_ASN1_FIELD_NAMES #ifndef NO_ASN1_FIELD_NAMES
const char *sname; /* Structure name */ const char *sname; /* Structure name */
#endif #endif
}; };
@@ -602,19 +609,19 @@ const char *sname; /* Structure name */
* *
*/ */
#define ASN1_ITYPE_PRIMITIVE 0x0 #define ASN1_ITYPE_PRIMITIVE 0x0
#define ASN1_ITYPE_SEQUENCE 0x1 #define ASN1_ITYPE_SEQUENCE 0x1
#define ASN1_ITYPE_CHOICE 0x2 #define ASN1_ITYPE_CHOICE 0x2
#define ASN1_ITYPE_COMPAT 0x3 #define ASN1_ITYPE_COMPAT 0x3
#define ASN1_ITYPE_EXTERN 0x4 #define ASN1_ITYPE_EXTERN 0x4
#define ASN1_ITYPE_MSTRING 0x5 #define ASN1_ITYPE_MSTRING 0x5
#define ASN1_ITYPE_NDEF_SEQUENCE 0x6 #define ASN1_ITYPE_NDEF_SEQUENCE 0x6
/* Cache for ASN1 tag and length, so we /* Cache for ASN1 tag and length, so we
* don't keep re-reading it for things * don't keep re-reading it for things
@@ -622,12 +629,12 @@ const char *sname; /* Structure name */
*/ */
struct ASN1_TLC_st{ struct ASN1_TLC_st{
char valid; /* Values below are valid */ char valid; /* Values below are valid */
int ret; /* return value */ int ret; /* return value */
long plen; /* length */ long plen; /* length */
int ptag; /* class value */ int ptag; /* class value */
int pclass; /* class value */ int pclass; /* class value */
int hdrlen; /* header length */ int hdrlen; /* header length */
}; };
/* Typedefs for ASN1 function pointers */ /* Typedefs for ASN1 function pointers */
@@ -638,7 +645,7 @@ typedef ASN1_VALUE * ASN1_d2i_func(ASN1_VALUE **a, const unsigned char ** in, lo
typedef int ASN1_i2d_func(ASN1_VALUE * a, unsigned char **in); typedef int ASN1_i2d_func(ASN1_VALUE * a, unsigned char **in);
typedef int ASN1_ex_d2i(ASN1_VALUE **pval, const unsigned char **in, long len, const ASN1_ITEM *it, typedef int ASN1_ex_d2i(ASN1_VALUE **pval, const unsigned char **in, long len, const ASN1_ITEM *it,
int tag, int aclass, char opt, ASN1_TLC *ctx); int tag, int aclass, char opt, ASN1_TLC *ctx);
typedef int ASN1_ex_i2d(ASN1_VALUE **pval, unsigned char **out, const ASN1_ITEM *it, int tag, int aclass); typedef int ASN1_ex_i2d(ASN1_VALUE **pval, unsigned char **out, const ASN1_ITEM *it, int tag, int aclass);
typedef int ASN1_ex_new_func(ASN1_VALUE **pval, const ASN1_ITEM *it); typedef int ASN1_ex_new_func(ASN1_VALUE **pval, const ASN1_ITEM *it);
@@ -648,29 +655,29 @@ typedef int ASN1_primitive_i2c(ASN1_VALUE **pval, unsigned char *cont, int *puty
typedef int ASN1_primitive_c2i(ASN1_VALUE **pval, const unsigned char *cont, int len, int utype, char *free_cont, const ASN1_ITEM *it); typedef int ASN1_primitive_c2i(ASN1_VALUE **pval, const unsigned char *cont, int len, int utype, char *free_cont, const ASN1_ITEM *it);
typedef struct ASN1_COMPAT_FUNCS_st { typedef struct ASN1_COMPAT_FUNCS_st {
ASN1_new_func *asn1_new; ASN1_new_func *asn1_new;
ASN1_free_func *asn1_free; ASN1_free_func *asn1_free;
ASN1_d2i_func *asn1_d2i; ASN1_d2i_func *asn1_d2i;
ASN1_i2d_func *asn1_i2d; ASN1_i2d_func *asn1_i2d;
} ASN1_COMPAT_FUNCS; } ASN1_COMPAT_FUNCS;
typedef struct ASN1_EXTERN_FUNCS_st { typedef struct ASN1_EXTERN_FUNCS_st {
void *app_data; void *app_data;
ASN1_ex_new_func *asn1_ex_new; ASN1_ex_new_func *asn1_ex_new;
ASN1_ex_free_func *asn1_ex_free; ASN1_ex_free_func *asn1_ex_free;
ASN1_ex_free_func *asn1_ex_clear; ASN1_ex_free_func *asn1_ex_clear;
ASN1_ex_d2i *asn1_ex_d2i; ASN1_ex_d2i *asn1_ex_d2i;
ASN1_ex_i2d *asn1_ex_i2d; ASN1_ex_i2d *asn1_ex_i2d;
} ASN1_EXTERN_FUNCS; } ASN1_EXTERN_FUNCS;
typedef struct ASN1_PRIMITIVE_FUNCS_st { typedef struct ASN1_PRIMITIVE_FUNCS_st {
void *app_data; void *app_data;
unsigned long flags; unsigned long flags;
ASN1_ex_new_func *prim_new; ASN1_ex_new_func *prim_new;
ASN1_ex_free_func *prim_free; ASN1_ex_free_func *prim_free;
ASN1_ex_free_func *prim_clear; ASN1_ex_free_func *prim_clear;
ASN1_primitive_c2i *prim_c2i; ASN1_primitive_c2i *prim_c2i;
ASN1_primitive_i2c *prim_i2c; ASN1_primitive_i2c *prim_i2c;
} ASN1_PRIMITIVE_FUNCS; } ASN1_PRIMITIVE_FUNCS;
/* This is the ASN1_AUX structure: it handles various /* This is the ASN1_AUX structure: it handles various
@@ -693,78 +700,78 @@ typedef struct ASN1_PRIMITIVE_FUNCS_st {
typedef int ASN1_aux_cb(int operation, ASN1_VALUE **in, const ASN1_ITEM *it); typedef int ASN1_aux_cb(int operation, ASN1_VALUE **in, const ASN1_ITEM *it);
typedef struct ASN1_AUX_st { typedef struct ASN1_AUX_st {
void *app_data; void *app_data;
int flags; int flags;
int ref_offset; /* Offset of reference value */ int ref_offset; /* Offset of reference value */
int ref_lock; /* Lock type to use */ int ref_lock; /* Lock type to use */
ASN1_aux_cb *asn1_cb; ASN1_aux_cb *asn1_cb;
int enc_offset; /* Offset of ASN1_ENCODING structure */ int enc_offset; /* Offset of ASN1_ENCODING structure */
} ASN1_AUX; } ASN1_AUX;
/* Flags in ASN1_AUX */ /* Flags in ASN1_AUX */
/* Use a reference count */ /* Use a reference count */
#define ASN1_AFLG_REFCOUNT 1 #define ASN1_AFLG_REFCOUNT 1
/* Save the encoding of structure (useful for signatures) */ /* Save the encoding of structure (useful for signatures) */
#define ASN1_AFLG_ENCODING 2 #define ASN1_AFLG_ENCODING 2
/* The Sequence length is invalid */ /* The Sequence length is invalid */
#define ASN1_AFLG_BROKEN 4 #define ASN1_AFLG_BROKEN 4
/* operation values for asn1_cb */ /* operation values for asn1_cb */
#define ASN1_OP_NEW_PRE 0 #define ASN1_OP_NEW_PRE 0
#define ASN1_OP_NEW_POST 1 #define ASN1_OP_NEW_POST 1
#define ASN1_OP_FREE_PRE 2 #define ASN1_OP_FREE_PRE 2
#define ASN1_OP_FREE_POST 3 #define ASN1_OP_FREE_POST 3
#define ASN1_OP_D2I_PRE 4 #define ASN1_OP_D2I_PRE 4
#define ASN1_OP_D2I_POST 5 #define ASN1_OP_D2I_POST 5
#define ASN1_OP_I2D_PRE 6 #define ASN1_OP_I2D_PRE 6
#define ASN1_OP_I2D_POST 7 #define ASN1_OP_I2D_POST 7
/* Macro to implement a primitive type */ /* Macro to implement a primitive type */
#define IMPLEMENT_ASN1_TYPE(stname) IMPLEMENT_ASN1_TYPE_ex(stname, stname, 0) #define IMPLEMENT_ASN1_TYPE(stname) IMPLEMENT_ASN1_TYPE_ex(stname, stname, 0)
#define IMPLEMENT_ASN1_TYPE_ex(itname, vname, ex) \ #define IMPLEMENT_ASN1_TYPE_ex(itname, vname, ex) \
ASN1_ITEM_start(itname) \ ASN1_ITEM_start(itname) \
ASN1_ITYPE_PRIMITIVE, V_##vname, NULL, 0, NULL, ex, #itname \ ASN1_ITYPE_PRIMITIVE, V_##vname, NULL, 0, NULL, ex, #itname \
ASN1_ITEM_end(itname) ASN1_ITEM_end(itname)
/* Macro to implement a multi string type */ /* Macro to implement a multi string type */
#define IMPLEMENT_ASN1_MSTRING(itname, mask) \ #define IMPLEMENT_ASN1_MSTRING(itname, mask) \
ASN1_ITEM_start(itname) \ ASN1_ITEM_start(itname) \
ASN1_ITYPE_MSTRING, mask, NULL, 0, NULL, sizeof(ASN1_STRING), #itname \ ASN1_ITYPE_MSTRING, mask, NULL, 0, NULL, sizeof(ASN1_STRING), #itname \
ASN1_ITEM_end(itname) ASN1_ITEM_end(itname)
/* Macro to implement an ASN1_ITEM in terms of old style funcs */ /* Macro to implement an ASN1_ITEM in terms of old style funcs */
#define IMPLEMENT_COMPAT_ASN1(sname) IMPLEMENT_COMPAT_ASN1_type(sname, V_ASN1_SEQUENCE) #define IMPLEMENT_COMPAT_ASN1(sname) IMPLEMENT_COMPAT_ASN1_type(sname, V_ASN1_SEQUENCE)
#define IMPLEMENT_COMPAT_ASN1_type(sname, tag) \ #define IMPLEMENT_COMPAT_ASN1_type(sname, tag) \
static const ASN1_COMPAT_FUNCS sname##_ff = { \ static const ASN1_COMPAT_FUNCS sname##_ff = { \
(ASN1_new_func *)sname##_new, \ (ASN1_new_func *)sname##_new, \
(ASN1_free_func *)sname##_free, \ (ASN1_free_func *)sname##_free, \
(ASN1_d2i_func *)d2i_##sname, \ (ASN1_d2i_func *)d2i_##sname, \
(ASN1_i2d_func *)i2d_##sname, \ (ASN1_i2d_func *)i2d_##sname, \
}; \ }; \
ASN1_ITEM_start(sname) \ ASN1_ITEM_start(sname) \
ASN1_ITYPE_COMPAT, \ ASN1_ITYPE_COMPAT, \
tag, \ tag, \
NULL, \ NULL, \
0, \ 0, \
&sname##_ff, \ &sname##_ff, \
0, \ 0, \
#sname \ #sname \
ASN1_ITEM_end(sname) ASN1_ITEM_end(sname)
#define IMPLEMENT_EXTERN_ASN1(sname, tag, fptrs) \ #define IMPLEMENT_EXTERN_ASN1(sname, tag, fptrs) \
ASN1_ITEM_start(sname) \ ASN1_ITEM_start(sname) \
ASN1_ITYPE_EXTERN, \ ASN1_ITYPE_EXTERN, \
tag, \ tag, \
NULL, \ NULL, \
0, \ 0, \
&fptrs, \ &fptrs, \
0, \ 0, \
#sname \ #sname \
ASN1_ITEM_end(sname) ASN1_ITEM_end(sname)
/* Macro to implement standard functions in terms of ASN1_ITEM structures */ /* Macro to implement standard functions in terms of ASN1_ITEM structures */
@@ -773,66 +780,66 @@ typedef struct ASN1_AUX_st {
#define IMPLEMENT_ASN1_FUNCTIONS_name(stname, itname) IMPLEMENT_ASN1_FUNCTIONS_fname(stname, itname, itname) #define IMPLEMENT_ASN1_FUNCTIONS_name(stname, itname) IMPLEMENT_ASN1_FUNCTIONS_fname(stname, itname, itname)
#define IMPLEMENT_ASN1_FUNCTIONS_ENCODE_name(stname, itname) \ #define IMPLEMENT_ASN1_FUNCTIONS_ENCODE_name(stname, itname) \
IMPLEMENT_ASN1_FUNCTIONS_ENCODE_fname(stname, itname, itname) IMPLEMENT_ASN1_FUNCTIONS_ENCODE_fname(stname, itname, itname)
#define IMPLEMENT_ASN1_ALLOC_FUNCTIONS(stname) \ #define IMPLEMENT_ASN1_ALLOC_FUNCTIONS(stname) \
IMPLEMENT_ASN1_ALLOC_FUNCTIONS_fname(stname, stname, stname) IMPLEMENT_ASN1_ALLOC_FUNCTIONS_fname(stname, stname, stname)
#define IMPLEMENT_ASN1_ALLOC_FUNCTIONS_fname(stname, itname, fname) \ #define IMPLEMENT_ASN1_ALLOC_FUNCTIONS_fname(stname, itname, fname) \
stname *fname##_new(void) \ stname *fname##_new(void) \
{ \ { \
return (stname *)ASN1_item_new(ASN1_ITEM_rptr(itname)); \ return (stname *)ASN1_item_new(ASN1_ITEM_rptr(itname)); \
} \ } \
void fname##_free(stname *a) \ void fname##_free(stname *a) \
{ \ { \
ASN1_item_free((ASN1_VALUE *)a, ASN1_ITEM_rptr(itname)); \ ASN1_item_free((ASN1_VALUE *)a, ASN1_ITEM_rptr(itname)); \
} }
#define IMPLEMENT_ASN1_FUNCTIONS_fname(stname, itname, fname) \ #define IMPLEMENT_ASN1_FUNCTIONS_fname(stname, itname, fname) \
IMPLEMENT_ASN1_ENCODE_FUNCTIONS_fname(stname, itname, fname) \ IMPLEMENT_ASN1_ENCODE_FUNCTIONS_fname(stname, itname, fname) \
IMPLEMENT_ASN1_ALLOC_FUNCTIONS_fname(stname, itname, fname) IMPLEMENT_ASN1_ALLOC_FUNCTIONS_fname(stname, itname, fname)
#define IMPLEMENT_ASN1_ENCODE_FUNCTIONS_fname(stname, itname, fname) \ #define IMPLEMENT_ASN1_ENCODE_FUNCTIONS_fname(stname, itname, fname) \
stname *d2i_##fname(stname **a, const unsigned char **in, long len) \ stname *d2i_##fname(stname **a, const unsigned char **in, long len) \
{ \ { \
return (stname *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, ASN1_ITEM_rptr(itname));\ return (stname *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, ASN1_ITEM_rptr(itname));\
} \ } \
int i2d_##fname(stname *a, unsigned char **out) \ int i2d_##fname(stname *a, unsigned char **out) \
{ \ { \
return ASN1_item_i2d((ASN1_VALUE *)a, out, ASN1_ITEM_rptr(itname));\ return ASN1_item_i2d((ASN1_VALUE *)a, out, ASN1_ITEM_rptr(itname));\
} }
#define IMPLEMENT_ASN1_NDEF_FUNCTION(stname) \ #define IMPLEMENT_ASN1_NDEF_FUNCTION(stname) \
int i2d_##stname##_NDEF(stname *a, unsigned char **out) \ int i2d_##stname##_NDEF(stname *a, unsigned char **out) \
{ \ { \
return ASN1_item_ndef_i2d((ASN1_VALUE *)a, out, ASN1_ITEM_rptr(stname));\ return ASN1_item_ndef_i2d((ASN1_VALUE *)a, out, ASN1_ITEM_rptr(stname));\
} }
/* This includes evil casts to remove const: they will go away when full /* This includes evil casts to remove const: they will go away when full
* ASN1 constification is done. * ASN1 constification is done.
*/ */
#define IMPLEMENT_ASN1_ENCODE_FUNCTIONS_const_fname(stname, itname, fname) \ #define IMPLEMENT_ASN1_ENCODE_FUNCTIONS_const_fname(stname, itname, fname) \
stname *d2i_##fname(stname **a, const unsigned char **in, long len) \ stname *d2i_##fname(stname **a, const unsigned char **in, long len) \
{ \ { \
return (stname *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, ASN1_ITEM_rptr(itname));\ return (stname *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, ASN1_ITEM_rptr(itname));\
} \ } \
int i2d_##fname(const stname *a, unsigned char **out) \ int i2d_##fname(const stname *a, unsigned char **out) \
{ \ { \
return ASN1_item_i2d((ASN1_VALUE *)a, out, ASN1_ITEM_rptr(itname));\ return ASN1_item_i2d((ASN1_VALUE *)a, out, ASN1_ITEM_rptr(itname));\
} }
#define IMPLEMENT_ASN1_DUP_FUNCTION(stname) \ #define IMPLEMENT_ASN1_DUP_FUNCTION(stname) \
stname * stname##_dup(stname *x) \ stname * stname##_dup(stname *x) \
{ \ { \
return ASN1_item_dup(ASN1_ITEM_rptr(stname), x); \ return ASN1_item_dup(ASN1_ITEM_rptr(stname), x); \
} }
#define IMPLEMENT_ASN1_FUNCTIONS_const(name) \ #define IMPLEMENT_ASN1_FUNCTIONS_const(name) \
IMPLEMENT_ASN1_FUNCTIONS_const_fname(name, name, name) IMPLEMENT_ASN1_FUNCTIONS_const_fname(name, name, name)
#define IMPLEMENT_ASN1_FUNCTIONS_const_fname(stname, itname, fname) \ #define IMPLEMENT_ASN1_FUNCTIONS_const_fname(stname, itname, fname) \
IMPLEMENT_ASN1_ENCODE_FUNCTIONS_const_fname(stname, itname, fname) \ IMPLEMENT_ASN1_ENCODE_FUNCTIONS_const_fname(stname, itname, fname) \
IMPLEMENT_ASN1_ALLOC_FUNCTIONS_fname(stname, itname, fname) IMPLEMENT_ASN1_ALLOC_FUNCTIONS_fname(stname, itname, fname)
/* external definitions for primitive types */ /* external definitions for primitive types */
@@ -857,7 +864,7 @@ int ASN1_primitive_new(ASN1_VALUE **pval, const ASN1_ITEM *it);
void ASN1_template_free(ASN1_VALUE **pval, const ASN1_TEMPLATE *tt); void ASN1_template_free(ASN1_VALUE **pval, const ASN1_TEMPLATE *tt);
int ASN1_template_d2i(ASN1_VALUE **pval, const unsigned char **in, long len, const ASN1_TEMPLATE *tt); int ASN1_template_d2i(ASN1_VALUE **pval, const unsigned char **in, long len, const ASN1_TEMPLATE *tt);
int ASN1_item_ex_d2i(ASN1_VALUE **pval, const unsigned char **in, long len, const ASN1_ITEM *it, int ASN1_item_ex_d2i(ASN1_VALUE **pval, const unsigned char **in, long len, const ASN1_ITEM *it,
int tag, int aclass, char opt, ASN1_TLC *ctx); int tag, int aclass, char opt, ASN1_TLC *ctx);
int ASN1_item_ex_i2d(ASN1_VALUE **pval, unsigned char **out, const ASN1_ITEM *it, int tag, int aclass); int ASN1_item_ex_i2d(ASN1_VALUE **pval, unsigned char **out, const ASN1_ITEM *it, int tag, int aclass);
int ASN1_template_i2d(ASN1_VALUE **pval, unsigned char **out, const ASN1_TEMPLATE *tt); int ASN1_template_i2d(ASN1_VALUE **pval, unsigned char **out, const ASN1_TEMPLATE *tt);
@@ -884,4 +891,3 @@ int asn1_enc_save(ASN1_VALUE **pval, const unsigned char *in, int inlen, const A
} }
#endif #endif
#endif #endif
dep/include/openssl/bio.h
+348 -348
View File
@@ -73,64 +73,65 @@ extern "C" {
#endif #endif
/* These are the 'types' of BIOs */ /* These are the 'types' of BIOs */
#define BIO_TYPE_NONE 0 #define BIO_TYPE_NONE 0
#define BIO_TYPE_MEM (1|0x0400) #define BIO_TYPE_MEM (1|0x0400)
#define BIO_TYPE_FILE (2|0x0400) #define BIO_TYPE_FILE (2|0x0400)
#define BIO_TYPE_FD (4|0x0400|0x0100) #define BIO_TYPE_FD (4|0x0400|0x0100)
#define BIO_TYPE_SOCKET (5|0x0400|0x0100) #define BIO_TYPE_SOCKET (5|0x0400|0x0100)
#define BIO_TYPE_NULL (6|0x0400) #define BIO_TYPE_NULL (6|0x0400)
#define BIO_TYPE_SSL (7|0x0200) #define BIO_TYPE_SSL (7|0x0200)
#define BIO_TYPE_MD (8|0x0200) /* passive filter */ #define BIO_TYPE_MD (8|0x0200) /* passive filter */
#define BIO_TYPE_BUFFER (9|0x0200) /* filter */ #define BIO_TYPE_BUFFER (9|0x0200) /* filter */
#define BIO_TYPE_CIPHER (10|0x0200) /* filter */ #define BIO_TYPE_CIPHER (10|0x0200) /* filter */
#define BIO_TYPE_BASE64 (11|0x0200) /* filter */ #define BIO_TYPE_BASE64 (11|0x0200) /* filter */
#define BIO_TYPE_CONNECT (12|0x0400|0x0100) /* socket - connect */ #define BIO_TYPE_CONNECT (12|0x0400|0x0100) /* socket - connect */
#define BIO_TYPE_ACCEPT (13|0x0400|0x0100) /* socket for accept */ #define BIO_TYPE_ACCEPT (13|0x0400|0x0100) /* socket for accept */
#define BIO_TYPE_PROXY_CLIENT (14|0x0200) /* client proxy BIO */ #define BIO_TYPE_PROXY_CLIENT (14|0x0200) /* client proxy BIO */
#define BIO_TYPE_PROXY_SERVER (15|0x0200) /* server proxy BIO */ #define BIO_TYPE_PROXY_SERVER (15|0x0200) /* server proxy BIO */
#define BIO_TYPE_NBIO_TEST (16|0x0200) /* server proxy BIO */ #define BIO_TYPE_NBIO_TEST (16|0x0200) /* server proxy BIO */
#define BIO_TYPE_NULL_FILTER (17|0x0200) #define BIO_TYPE_NULL_FILTER (17|0x0200)
#define BIO_TYPE_BER (18|0x0200) /* BER -> bin filter */ #define BIO_TYPE_BER (18|0x0200) /* BER -> bin filter */
#define BIO_TYPE_BIO (19|0x0400) /* (half a) BIO pair */ #define BIO_TYPE_BIO (19|0x0400) /* (half a) BIO pair */
#define BIO_TYPE_LINEBUFFER (20|0x0200) /* filter */ #define BIO_TYPE_LINEBUFFER (20|0x0200) /* filter */
#define BIO_TYPE_DGRAM (21|0x0400|0x0100) #define BIO_TYPE_DGRAM (21|0x0400|0x0100)
#define BIO_TYPE_COMP (23|0x0200) /* filter */
#define BIO_TYPE_DESCRIPTOR 0x0100 /* socket, fd, connect or accept */ #define BIO_TYPE_DESCRIPTOR 0x0100 /* socket, fd, connect or accept */
#define BIO_TYPE_FILTER 0x0200 #define BIO_TYPE_FILTER 0x0200
#define BIO_TYPE_SOURCE_SINK 0x0400 #define BIO_TYPE_SOURCE_SINK 0x0400
/* BIO_FILENAME_READ|BIO_CLOSE to open or close on free. /* BIO_FILENAME_READ|BIO_CLOSE to open or close on free.
* BIO_set_fp(in,stdin,BIO_NOCLOSE); */ * BIO_set_fp(in,stdin,BIO_NOCLOSE); */
#define BIO_NOCLOSE 0x00 #define BIO_NOCLOSE 0x00
#define BIO_CLOSE 0x01 #define BIO_CLOSE 0x01
/* These are used in the following macros and are passed to /* These are used in the following macros and are passed to
* BIO_ctrl() */ * BIO_ctrl() */
#define BIO_CTRL_RESET 1 /* opt - rewind/zero etc */ #define BIO_CTRL_RESET 1 /* opt - rewind/zero etc */
#define BIO_CTRL_EOF 2 /* opt - are we at the eof */ #define BIO_CTRL_EOF 2 /* opt - are we at the eof */
#define BIO_CTRL_INFO 3 /* opt - extra tit-bits */ #define BIO_CTRL_INFO 3 /* opt - extra tit-bits */
#define BIO_CTRL_SET 4 /* man - set the 'IO' type */ #define BIO_CTRL_SET 4 /* man - set the 'IO' type */
#define BIO_CTRL_GET 5 /* man - get the 'IO' type */ #define BIO_CTRL_GET 5 /* man - get the 'IO' type */
#define BIO_CTRL_PUSH 6 /* opt - internal, used to signify change */ #define BIO_CTRL_PUSH 6 /* opt - internal, used to signify change */
#define BIO_CTRL_POP 7 /* opt - internal, used to signify change */ #define BIO_CTRL_POP 7 /* opt - internal, used to signify change */
#define BIO_CTRL_GET_CLOSE 8 /* man - set the 'close' on free */ #define BIO_CTRL_GET_CLOSE 8 /* man - set the 'close' on free */
#define BIO_CTRL_SET_CLOSE 9 /* man - set the 'close' on free */ #define BIO_CTRL_SET_CLOSE 9 /* man - set the 'close' on free */
#define BIO_CTRL_PENDING 10 /* opt - is their more data buffered */ #define BIO_CTRL_PENDING 10 /* opt - is their more data buffered */
#define BIO_CTRL_FLUSH 11 /* opt - 'flush' buffered output */ #define BIO_CTRL_FLUSH 11 /* opt - 'flush' buffered output */
#define BIO_CTRL_DUP 12 /* man - extra stuff for 'duped' BIO */ #define BIO_CTRL_DUP 12 /* man - extra stuff for 'duped' BIO */
#define BIO_CTRL_WPENDING 13 /* opt - number of bytes still to write */ #define BIO_CTRL_WPENDING 13 /* opt - number of bytes still to write */
/* callback is int cb(BIO *bio,state,ret); */ /* callback is int cb(BIO *bio,state,ret); */
#define BIO_CTRL_SET_CALLBACK 14 /* opt - set callback function */ #define BIO_CTRL_SET_CALLBACK 14 /* opt - set callback function */
#define BIO_CTRL_GET_CALLBACK 15 /* opt - set callback function */ #define BIO_CTRL_GET_CALLBACK 15 /* opt - set callback function */
#define BIO_CTRL_SET_FILENAME 30 /* BIO_s_file special */ #define BIO_CTRL_SET_FILENAME 30 /* BIO_s_file special */
/* dgram BIO stuff */ /* dgram BIO stuff */
#define BIO_CTRL_DGRAM_CONNECT 31 /* BIO dgram special */ #define BIO_CTRL_DGRAM_CONNECT 31 /* BIO dgram special */
#define BIO_CTRL_DGRAM_SET_CONNECTED 32 /* allow for an externally #define BIO_CTRL_DGRAM_SET_CONNECTED 32 /* allow for an externally
* connected socket to be * connected socket to be
* passed in */ * passed in */
#define BIO_CTRL_DGRAM_SET_RECV_TIMEOUT 33 /* setsockopt, essentially */ #define BIO_CTRL_DGRAM_SET_RECV_TIMEOUT 33 /* setsockopt, essentially */
#define BIO_CTRL_DGRAM_GET_RECV_TIMEOUT 34 /* getsockopt, essentially */ #define BIO_CTRL_DGRAM_GET_RECV_TIMEOUT 34 /* getsockopt, essentially */
#define BIO_CTRL_DGRAM_SET_SEND_TIMEOUT 35 /* setsockopt, essentially */ #define BIO_CTRL_DGRAM_SET_SEND_TIMEOUT 35 /* setsockopt, essentially */
@@ -146,55 +147,55 @@ extern "C" {
#define BIO_CTRL_DGRAM_QUERY_MTU 40 /* as kernel for current MTU */ #define BIO_CTRL_DGRAM_QUERY_MTU 40 /* as kernel for current MTU */
#define BIO_CTRL_DGRAM_GET_MTU 41 /* get cached value for MTU */ #define BIO_CTRL_DGRAM_GET_MTU 41 /* get cached value for MTU */
#define BIO_CTRL_DGRAM_SET_MTU 42 /* set cached value for #define BIO_CTRL_DGRAM_SET_MTU 42 /* set cached value for
* MTU. want to use this * MTU. want to use this
* if asking the kernel * if asking the kernel
* fails */ * fails */
#define BIO_CTRL_DGRAM_MTU_EXCEEDED 43 /* check whether the MTU #define BIO_CTRL_DGRAM_MTU_EXCEEDED 43 /* check whether the MTU
* was exceed in the * was exceed in the
* previous write * previous write
* operation */ * operation */
#define BIO_CTRL_DGRAM_SET_PEER 44 /* Destination for the data */ #define BIO_CTRL_DGRAM_SET_PEER 44 /* Destination for the data */
/* modifiers */ /* modifiers */
#define BIO_FP_READ 0x02 #define BIO_FP_READ 0x02
#define BIO_FP_WRITE 0x04 #define BIO_FP_WRITE 0x04
#define BIO_FP_APPEND 0x08 #define BIO_FP_APPEND 0x08
#define BIO_FP_TEXT 0x10 #define BIO_FP_TEXT 0x10
#define BIO_FLAGS_READ 0x01 #define BIO_FLAGS_READ 0x01
#define BIO_FLAGS_WRITE 0x02 #define BIO_FLAGS_WRITE 0x02
#define BIO_FLAGS_IO_SPECIAL 0x04 #define BIO_FLAGS_IO_SPECIAL 0x04
#define BIO_FLAGS_RWS (BIO_FLAGS_READ|BIO_FLAGS_WRITE|BIO_FLAGS_IO_SPECIAL) #define BIO_FLAGS_RWS (BIO_FLAGS_READ|BIO_FLAGS_WRITE|BIO_FLAGS_IO_SPECIAL)
#define BIO_FLAGS_SHOULD_RETRY 0x08 #define BIO_FLAGS_SHOULD_RETRY 0x08
#ifndef BIO_FLAGS_UPLINK #ifndef BIO_FLAGS_UPLINK
/* "UPLINK" flag denotes file descriptors provided by application. /* "UPLINK" flag denotes file descriptors provided by application.
It defaults to 0, as most platforms don't require UPLINK interface. */ It defaults to 0, as most platforms don't require UPLINK interface. */
#define BIO_FLAGS_UPLINK 0 #define BIO_FLAGS_UPLINK 0
#endif #endif
/* Used in BIO_gethostbyname() */ /* Used in BIO_gethostbyname() */
#define BIO_GHBN_CTRL_HITS 1 #define BIO_GHBN_CTRL_HITS 1
#define BIO_GHBN_CTRL_MISSES 2 #define BIO_GHBN_CTRL_MISSES 2
#define BIO_GHBN_CTRL_CACHE_SIZE 3 #define BIO_GHBN_CTRL_CACHE_SIZE 3
#define BIO_GHBN_CTRL_GET_ENTRY 4 #define BIO_GHBN_CTRL_GET_ENTRY 4
#define BIO_GHBN_CTRL_FLUSH 5 #define BIO_GHBN_CTRL_FLUSH 5
/* Mostly used in the SSL BIO */ /* Mostly used in the SSL BIO */
/* Not used anymore /* Not used anymore
* #define BIO_FLAGS_PROTOCOL_DELAYED_READ 0x10 * #define BIO_FLAGS_PROTOCOL_DELAYED_READ 0x10
* #define BIO_FLAGS_PROTOCOL_DELAYED_WRITE 0x20 * #define BIO_FLAGS_PROTOCOL_DELAYED_WRITE 0x20
* #define BIO_FLAGS_PROTOCOL_STARTUP 0x40 * #define BIO_FLAGS_PROTOCOL_STARTUP 0x40
*/ */
#define BIO_FLAGS_BASE64_NO_NL 0x100 #define BIO_FLAGS_BASE64_NO_NL 0x100
/* This is used with memory BIOs: it means we shouldn't free up or change the /* This is used with memory BIOs: it means we shouldn't free up or change the
* data in any way. * data in any way.
*/ */
#define BIO_FLAGS_MEM_RDONLY 0x200 #define BIO_FLAGS_MEM_RDONLY 0x200
typedef struct bio_st BIO; typedef struct bio_st BIO;
@@ -204,24 +205,24 @@ void BIO_clear_flags(BIO *b, int flags);
#define BIO_get_flags(b) BIO_test_flags(b, ~(0x0)) #define BIO_get_flags(b) BIO_test_flags(b, ~(0x0))
#define BIO_set_retry_special(b) \ #define BIO_set_retry_special(b) \
BIO_set_flags(b, (BIO_FLAGS_IO_SPECIAL|BIO_FLAGS_SHOULD_RETRY)) BIO_set_flags(b, (BIO_FLAGS_IO_SPECIAL|BIO_FLAGS_SHOULD_RETRY))
#define BIO_set_retry_read(b) \ #define BIO_set_retry_read(b) \
BIO_set_flags(b, (BIO_FLAGS_READ|BIO_FLAGS_SHOULD_RETRY)) BIO_set_flags(b, (BIO_FLAGS_READ|BIO_FLAGS_SHOULD_RETRY))
#define BIO_set_retry_write(b) \ #define BIO_set_retry_write(b) \
BIO_set_flags(b, (BIO_FLAGS_WRITE|BIO_FLAGS_SHOULD_RETRY)) BIO_set_flags(b, (BIO_FLAGS_WRITE|BIO_FLAGS_SHOULD_RETRY))
/* These are normally used internally in BIOs */ /* These are normally used internally in BIOs */
#define BIO_clear_retry_flags(b) \ #define BIO_clear_retry_flags(b) \
BIO_clear_flags(b, (BIO_FLAGS_RWS|BIO_FLAGS_SHOULD_RETRY)) BIO_clear_flags(b, (BIO_FLAGS_RWS|BIO_FLAGS_SHOULD_RETRY))
#define BIO_get_retry_flags(b) \ #define BIO_get_retry_flags(b) \
BIO_test_flags(b, (BIO_FLAGS_RWS|BIO_FLAGS_SHOULD_RETRY)) BIO_test_flags(b, (BIO_FLAGS_RWS|BIO_FLAGS_SHOULD_RETRY))
/* These should be used by the application to tell why we should retry */ /* These should be used by the application to tell why we should retry */
#define BIO_should_read(a) BIO_test_flags(a, BIO_FLAGS_READ) #define BIO_should_read(a) BIO_test_flags(a, BIO_FLAGS_READ)
#define BIO_should_write(a) BIO_test_flags(a, BIO_FLAGS_WRITE) #define BIO_should_write(a) BIO_test_flags(a, BIO_FLAGS_WRITE)
#define BIO_should_io_special(a) BIO_test_flags(a, BIO_FLAGS_IO_SPECIAL) #define BIO_should_io_special(a) BIO_test_flags(a, BIO_FLAGS_IO_SPECIAL)
#define BIO_retry_type(a) BIO_test_flags(a, BIO_FLAGS_RWS) #define BIO_retry_type(a) BIO_test_flags(a, BIO_FLAGS_RWS)
#define BIO_should_retry(a) BIO_test_flags(a, BIO_FLAGS_SHOULD_RETRY) #define BIO_should_retry(a) BIO_test_flags(a, BIO_FLAGS_SHOULD_RETRY)
/* The next three are used in conjunction with the /* The next three are used in conjunction with the
* BIO_should_io_special() condition. After this returns true, * BIO_should_io_special() condition. After this returns true,
@@ -229,30 +230,30 @@ void BIO_clear_flags(BIO *b, int flags);
* stack and return the 'reason' for the special and the offending BIO. * stack and return the 'reason' for the special and the offending BIO.
* Given a BIO, BIO_get_retry_reason(bio) will return the code. */ * Given a BIO, BIO_get_retry_reason(bio) will return the code. */
/* Returned from the SSL bio when the certificate retrieval code had an error */ /* Returned from the SSL bio when the certificate retrieval code had an error */
#define BIO_RR_SSL_X509_LOOKUP 0x01 #define BIO_RR_SSL_X509_LOOKUP 0x01
/* Returned from the connect BIO when a connect would have blocked */ /* Returned from the connect BIO when a connect would have blocked */
#define BIO_RR_CONNECT 0x02 #define BIO_RR_CONNECT 0x02
/* Returned from the accept BIO when an accept would have blocked */ /* Returned from the accept BIO when an accept would have blocked */
#define BIO_RR_ACCEPT 0x03 #define BIO_RR_ACCEPT 0x03
/* These are passed by the BIO callback */ /* These are passed by the BIO callback */
#define BIO_CB_FREE 0x01 #define BIO_CB_FREE 0x01
#define BIO_CB_READ 0x02 #define BIO_CB_READ 0x02
#define BIO_CB_WRITE 0x03 #define BIO_CB_WRITE 0x03
#define BIO_CB_PUTS 0x04 #define BIO_CB_PUTS 0x04
#define BIO_CB_GETS 0x05 #define BIO_CB_GETS 0x05
#define BIO_CB_CTRL 0x06 #define BIO_CB_CTRL 0x06
/* The callback is called before and after the underling operation, /* The callback is called before and after the underling operation,
* The BIO_CB_RETURN flag indicates if it is after the call */ * The BIO_CB_RETURN flag indicates if it is after the call */
#define BIO_CB_RETURN 0x80 #define BIO_CB_RETURN 0x80
#define BIO_CB_return(a) ((a)|BIO_CB_RETURN)) #define BIO_CB_return(a) ((a)|BIO_CB_RETURN))
#define BIO_cb_pre(a) (!((a)&BIO_CB_RETURN)) #define BIO_cb_pre(a) (!((a)&BIO_CB_RETURN))
#define BIO_cb_post(a) ((a)&BIO_CB_RETURN) #define BIO_cb_post(a) ((a)&BIO_CB_RETURN)
long (*BIO_get_callback(const BIO *b)) (struct bio_st *,int,const char *,int, long,long); long (*BIO_get_callback(const BIO *b)) (struct bio_st *,int,const char *,int, long,long);
void BIO_set_callback(BIO *b, void BIO_set_callback(BIO *b,
long (*callback)(struct bio_st *,int,const char *,int, long,long)); long (*callback)(struct bio_st *,int,const char *,int, long,long));
char *BIO_get_callback_arg(const BIO *b); char *BIO_get_callback_arg(const BIO *b);
void BIO_set_callback_arg(BIO *b, char *arg); void BIO_set_callback_arg(BIO *b, char *arg);
@@ -263,172 +264,172 @@ typedef void bio_info_cb(struct bio_st *, int, const char *, int, long, long);
#ifndef OPENSSL_SYS_WIN16 #ifndef OPENSSL_SYS_WIN16
typedef struct bio_method_st typedef struct bio_method_st
{ {
int type; int type;
const char *name; const char *name;
int (*bwrite)(BIO *, const char *, int); int (*bwrite)(BIO *, const char *, int);
int (*bread)(BIO *, char *, int); int (*bread)(BIO *, char *, int);
int (*bputs)(BIO *, const char *); int (*bputs)(BIO *, const char *);
int (*bgets)(BIO *, char *, int); int (*bgets)(BIO *, char *, int);
long (*ctrl)(BIO *, int, long, void *); long (*ctrl)(BIO *, int, long, void *);
int (*create)(BIO *); int (*create)(BIO *);
int (*destroy)(BIO *); int (*destroy)(BIO *);
long (*callback_ctrl)(BIO *, int, bio_info_cb *); long (*callback_ctrl)(BIO *, int, bio_info_cb *);
} BIO_METHOD; } BIO_METHOD;
#else #else
typedef struct bio_method_st typedef struct bio_method_st
{ {
int type; int type;
const char *name; const char *name;
int (_far *bwrite)(); int (_far *bwrite)();
int (_far *bread)(); int (_far *bread)();
int (_far *bputs)(); int (_far *bputs)();
int (_far *bgets)(); int (_far *bgets)();
long (_far *ctrl)(); long (_far *ctrl)();
int (_far *create)(); int (_far *create)();
int (_far *destroy)(); int (_far *destroy)();
long (_far *callback_ctrl)(); long (_far *callback_ctrl)();
} BIO_METHOD; } BIO_METHOD;
#endif #endif
struct bio_st struct bio_st
{ {
BIO_METHOD *method; BIO_METHOD *method;
/* bio, mode, argp, argi, argl, ret */ /* bio, mode, argp, argi, argl, ret */
long (*callback)(struct bio_st *,int,const char *,int, long,long); long (*callback)(struct bio_st *,int,const char *,int, long,long);
char *cb_arg; /* first argument for the callback */ char *cb_arg; /* first argument for the callback */
int init; int init;
int shutdown; int shutdown;
int flags; /* extra storage */ int flags; /* extra storage */
int retry_reason; int retry_reason;
int num; int num;
void *ptr; void *ptr;
struct bio_st *next_bio; /* used by filter BIOs */ struct bio_st *next_bio; /* used by filter BIOs */
struct bio_st *prev_bio; /* used by filter BIOs */ struct bio_st *prev_bio; /* used by filter BIOs */
int references; int references;
unsigned long num_read; unsigned long num_read;
unsigned long num_write; unsigned long num_write;
CRYPTO_EX_DATA ex_data; CRYPTO_EX_DATA ex_data;
}; };
DECLARE_STACK_OF(BIO) DECLARE_STACK_OF(BIO)
typedef struct bio_f_buffer_ctx_struct typedef struct bio_f_buffer_ctx_struct
{ {
/* BIO *bio; */ /* this is now in the BIO struct */ /* BIO *bio; */ /* this is now in the BIO struct */
int ibuf_size; /* how big is the input buffer */ int ibuf_size; /* how big is the input buffer */
int obuf_size; /* how big is the output buffer */ int obuf_size; /* how big is the output buffer */
char *ibuf; /* the char array */ char *ibuf; /* the char array */
int ibuf_len; /* how many bytes are in it */ int ibuf_len; /* how many bytes are in it */
int ibuf_off; /* write/read offset */ int ibuf_off; /* write/read offset */
char *obuf; /* the char array */ char *obuf; /* the char array */
int obuf_len; /* how many bytes are in it */ int obuf_len; /* how many bytes are in it */
int obuf_off; /* write/read offset */ int obuf_off; /* write/read offset */
} BIO_F_BUFFER_CTX; } BIO_F_BUFFER_CTX;
/* connect BIO stuff */ /* connect BIO stuff */
#define BIO_CONN_S_BEFORE 1 #define BIO_CONN_S_BEFORE 1
#define BIO_CONN_S_GET_IP 2 #define BIO_CONN_S_GET_IP 2
#define BIO_CONN_S_GET_PORT 3 #define BIO_CONN_S_GET_PORT 3
#define BIO_CONN_S_CREATE_SOCKET 4 #define BIO_CONN_S_CREATE_SOCKET 4
#define BIO_CONN_S_CONNECT 5 #define BIO_CONN_S_CONNECT 5
#define BIO_CONN_S_OK 6 #define BIO_CONN_S_OK 6
#define BIO_CONN_S_BLOCKED_CONNECT 7 #define BIO_CONN_S_BLOCKED_CONNECT 7
#define BIO_CONN_S_NBIO 8 #define BIO_CONN_S_NBIO 8
/*#define BIO_CONN_get_param_hostname BIO_ctrl */ /*#define BIO_CONN_get_param_hostname BIO_ctrl */
#define BIO_C_SET_CONNECT 100 #define BIO_C_SET_CONNECT 100
#define BIO_C_DO_STATE_MACHINE 101 #define BIO_C_DO_STATE_MACHINE 101
#define BIO_C_SET_NBIO 102 #define BIO_C_SET_NBIO 102
#define BIO_C_SET_PROXY_PARAM 103 #define BIO_C_SET_PROXY_PARAM 103
#define BIO_C_SET_FD 104 #define BIO_C_SET_FD 104
#define BIO_C_GET_FD 105 #define BIO_C_GET_FD 105
#define BIO_C_SET_FILE_PTR 106 #define BIO_C_SET_FILE_PTR 106
#define BIO_C_GET_FILE_PTR 107 #define BIO_C_GET_FILE_PTR 107
#define BIO_C_SET_FILENAME 108 #define BIO_C_SET_FILENAME 108
#define BIO_C_SET_SSL 109 #define BIO_C_SET_SSL 109
#define BIO_C_GET_SSL 110 #define BIO_C_GET_SSL 110
#define BIO_C_SET_MD 111 #define BIO_C_SET_MD 111
#define BIO_C_GET_MD 112 #define BIO_C_GET_MD 112
#define BIO_C_GET_CIPHER_STATUS 113 #define BIO_C_GET_CIPHER_STATUS 113
#define BIO_C_SET_BUF_MEM 114 #define BIO_C_SET_BUF_MEM 114
#define BIO_C_GET_BUF_MEM_PTR 115 #define BIO_C_GET_BUF_MEM_PTR 115
#define BIO_C_GET_BUFF_NUM_LINES 116 #define BIO_C_GET_BUFF_NUM_LINES 116
#define BIO_C_SET_BUFF_SIZE 117 #define BIO_C_SET_BUFF_SIZE 117
#define BIO_C_SET_ACCEPT 118 #define BIO_C_SET_ACCEPT 118
#define BIO_C_SSL_MODE 119 #define BIO_C_SSL_MODE 119
#define BIO_C_GET_MD_CTX 120 #define BIO_C_GET_MD_CTX 120
#define BIO_C_GET_PROXY_PARAM 121 #define BIO_C_GET_PROXY_PARAM 121
#define BIO_C_SET_BUFF_READ_DATA 122 /* data to read first */ #define BIO_C_SET_BUFF_READ_DATA 122 /* data to read first */
#define BIO_C_GET_CONNECT 123 #define BIO_C_GET_CONNECT 123
#define BIO_C_GET_ACCEPT 124 #define BIO_C_GET_ACCEPT 124
#define BIO_C_SET_SSL_RENEGOTIATE_BYTES 125 #define BIO_C_SET_SSL_RENEGOTIATE_BYTES 125
#define BIO_C_GET_SSL_NUM_RENEGOTIATES 126 #define BIO_C_GET_SSL_NUM_RENEGOTIATES 126
#define BIO_C_SET_SSL_RENEGOTIATE_TIMEOUT 127 #define BIO_C_SET_SSL_RENEGOTIATE_TIMEOUT 127
#define BIO_C_FILE_SEEK 128 #define BIO_C_FILE_SEEK 128
#define BIO_C_GET_CIPHER_CTX 129 #define BIO_C_GET_CIPHER_CTX 129
#define BIO_C_SET_BUF_MEM_EOF_RETURN 130/*return end of input value*/ #define BIO_C_SET_BUF_MEM_EOF_RETURN 130/*return end of input value*/
#define BIO_C_SET_BIND_MODE 131 #define BIO_C_SET_BIND_MODE 131
#define BIO_C_GET_BIND_MODE 132 #define BIO_C_GET_BIND_MODE 132
#define BIO_C_FILE_TELL 133 #define BIO_C_FILE_TELL 133
#define BIO_C_GET_SOCKS 134 #define BIO_C_GET_SOCKS 134
#define BIO_C_SET_SOCKS 135 #define BIO_C_SET_SOCKS 135
#define BIO_C_SET_WRITE_BUF_SIZE 136/* for BIO_s_bio */ #define BIO_C_SET_WRITE_BUF_SIZE 136/* for BIO_s_bio */
#define BIO_C_GET_WRITE_BUF_SIZE 137 #define BIO_C_GET_WRITE_BUF_SIZE 137
#define BIO_C_MAKE_BIO_PAIR 138 #define BIO_C_MAKE_BIO_PAIR 138
#define BIO_C_DESTROY_BIO_PAIR 139 #define BIO_C_DESTROY_BIO_PAIR 139
#define BIO_C_GET_WRITE_GUARANTEE 140 #define BIO_C_GET_WRITE_GUARANTEE 140
#define BIO_C_GET_READ_REQUEST 141 #define BIO_C_GET_READ_REQUEST 141
#define BIO_C_SHUTDOWN_WR 142 #define BIO_C_SHUTDOWN_WR 142
#define BIO_C_NREAD0 143 #define BIO_C_NREAD0 143
#define BIO_C_NREAD 144 #define BIO_C_NREAD 144
#define BIO_C_NWRITE0 145 #define BIO_C_NWRITE0 145
#define BIO_C_NWRITE 146 #define BIO_C_NWRITE 146
#define BIO_C_RESET_READ_REQUEST 147 #define BIO_C_RESET_READ_REQUEST 147
#define BIO_C_SET_MD_CTX 148 #define BIO_C_SET_MD_CTX 148
#define BIO_set_app_data(s,arg) BIO_set_ex_data(s,0,arg) #define BIO_set_app_data(s,arg) BIO_set_ex_data(s,0,arg)
#define BIO_get_app_data(s) BIO_get_ex_data(s,0) #define BIO_get_app_data(s) BIO_get_ex_data(s,0)
/* BIO_s_connect() and BIO_s_socks4a_connect() */ /* BIO_s_connect() and BIO_s_socks4a_connect() */
#define BIO_set_conn_hostname(b,name) BIO_ctrl(b,BIO_C_SET_CONNECT,0,(char *)name) #define BIO_set_conn_hostname(b,name) BIO_ctrl(b,BIO_C_SET_CONNECT,0,(char *)name)
#define BIO_set_conn_port(b,port) BIO_ctrl(b,BIO_C_SET_CONNECT,1,(char *)port) #define BIO_set_conn_port(b,port) BIO_ctrl(b,BIO_C_SET_CONNECT,1,(char *)port)
#define BIO_set_conn_ip(b,ip) BIO_ctrl(b,BIO_C_SET_CONNECT,2,(char *)ip) #define BIO_set_conn_ip(b,ip) BIO_ctrl(b,BIO_C_SET_CONNECT,2,(char *)ip)
#define BIO_set_conn_int_port(b,port) BIO_ctrl(b,BIO_C_SET_CONNECT,3,(char *)port) #define BIO_set_conn_int_port(b,port) BIO_ctrl(b,BIO_C_SET_CONNECT,3,(char *)port)
#define BIO_get_conn_hostname(b) BIO_ptr_ctrl(b,BIO_C_GET_CONNECT,0) #define BIO_get_conn_hostname(b) BIO_ptr_ctrl(b,BIO_C_GET_CONNECT,0)
#define BIO_get_conn_port(b) BIO_ptr_ctrl(b,BIO_C_GET_CONNECT,1) #define BIO_get_conn_port(b) BIO_ptr_ctrl(b,BIO_C_GET_CONNECT,1)
#define BIO_get_conn_ip(b) BIO_ptr_ctrl(b,BIO_C_GET_CONNECT,2) #define BIO_get_conn_ip(b) BIO_ptr_ctrl(b,BIO_C_GET_CONNECT,2)
#define BIO_get_conn_int_port(b) BIO_int_ctrl(b,BIO_C_GET_CONNECT,3) #define BIO_get_conn_int_port(b) BIO_int_ctrl(b,BIO_C_GET_CONNECT,3)
#define BIO_set_nbio(b,n) BIO_ctrl(b,BIO_C_SET_NBIO,(n),NULL) #define BIO_set_nbio(b,n) BIO_ctrl(b,BIO_C_SET_NBIO,(n),NULL)
/* BIO_s_accept_socket() */ /* BIO_s_accept_socket() */
#define BIO_set_accept_port(b,name) BIO_ctrl(b,BIO_C_SET_ACCEPT,0,(char *)name) #define BIO_set_accept_port(b,name) BIO_ctrl(b,BIO_C_SET_ACCEPT,0,(char *)name)
#define BIO_get_accept_port(b) BIO_ptr_ctrl(b,BIO_C_GET_ACCEPT,0) #define BIO_get_accept_port(b) BIO_ptr_ctrl(b,BIO_C_GET_ACCEPT,0)
/* #define BIO_set_nbio(b,n) BIO_ctrl(b,BIO_C_SET_NBIO,(n),NULL) */ /* #define BIO_set_nbio(b,n) BIO_ctrl(b,BIO_C_SET_NBIO,(n),NULL) */
#define BIO_set_nbio_accept(b,n) BIO_ctrl(b,BIO_C_SET_ACCEPT,1,(n)?"a":NULL) #define BIO_set_nbio_accept(b,n) BIO_ctrl(b,BIO_C_SET_ACCEPT,1,(n)?"a":NULL)
#define BIO_set_accept_bios(b,bio) BIO_ctrl(b,BIO_C_SET_ACCEPT,2,(char *)bio) #define BIO_set_accept_bios(b,bio) BIO_ctrl(b,BIO_C_SET_ACCEPT,2,(char *)bio)
#define BIO_BIND_NORMAL 0 #define BIO_BIND_NORMAL 0
#define BIO_BIND_REUSEADDR_IF_UNUSED 1 #define BIO_BIND_REUSEADDR_IF_UNUSED 1
#define BIO_BIND_REUSEADDR 2 #define BIO_BIND_REUSEADDR 2
#define BIO_set_bind_mode(b,mode) BIO_ctrl(b,BIO_C_SET_BIND_MODE,mode,NULL) #define BIO_set_bind_mode(b,mode) BIO_ctrl(b,BIO_C_SET_BIND_MODE,mode,NULL)
#define BIO_get_bind_mode(b,mode) BIO_ctrl(b,BIO_C_GET_BIND_MODE,0,NULL) #define BIO_get_bind_mode(b,mode) BIO_ctrl(b,BIO_C_GET_BIND_MODE,0,NULL)
#define BIO_do_connect(b) BIO_do_handshake(b) #define BIO_do_connect(b) BIO_do_handshake(b)
#define BIO_do_accept(b) BIO_do_handshake(b) #define BIO_do_accept(b) BIO_do_handshake(b)
#define BIO_do_handshake(b) BIO_ctrl(b,BIO_C_DO_STATE_MACHINE,0,NULL) #define BIO_do_handshake(b) BIO_ctrl(b,BIO_C_DO_STATE_MACHINE,0,NULL)
/* BIO_s_proxy_client() */ /* BIO_s_proxy_client() */
#define BIO_set_url(b,url) BIO_ctrl(b,BIO_C_SET_PROXY_PARAM,0,(char *)(url)) #define BIO_set_url(b,url) BIO_ctrl(b,BIO_C_SET_PROXY_PARAM,0,(char *)(url))
#define BIO_set_proxies(b,p) BIO_ctrl(b,BIO_C_SET_PROXY_PARAM,1,(char *)(p)) #define BIO_set_proxies(b,p) BIO_ctrl(b,BIO_C_SET_PROXY_PARAM,1,(char *)(p))
/* BIO_set_nbio(b,n) */ /* BIO_set_nbio(b,n) */
#define BIO_set_filter_bio(b,s) BIO_ctrl(b,BIO_C_SET_PROXY_PARAM,2,(char *)(s)) #define BIO_set_filter_bio(b,s) BIO_ctrl(b,BIO_C_SET_PROXY_PARAM,2,(char *)(s))
/* BIO *BIO_get_filter_bio(BIO *bio); */ /* BIO *BIO_get_filter_bio(BIO *bio); */
@@ -438,17 +439,17 @@ typedef struct bio_f_buffer_ctx_struct
#define BIO_get_proxy_header(b,skp) BIO_ctrl(b,BIO_C_GET_PROXY_PARAM,0,(char *)skp) #define BIO_get_proxy_header(b,skp) BIO_ctrl(b,BIO_C_GET_PROXY_PARAM,0,(char *)skp)
#define BIO_get_proxies(b,pxy_p) BIO_ctrl(b,BIO_C_GET_PROXY_PARAM,1,(char *)(pxy_p)) #define BIO_get_proxies(b,pxy_p) BIO_ctrl(b,BIO_C_GET_PROXY_PARAM,1,(char *)(pxy_p))
#define BIO_get_url(b,url) BIO_ctrl(b,BIO_C_GET_PROXY_PARAM,2,(char *)(url)) #define BIO_get_url(b,url) BIO_ctrl(b,BIO_C_GET_PROXY_PARAM,2,(char *)(url))
#define BIO_get_no_connect_return(b) BIO_ctrl(b,BIO_C_GET_PROXY_PARAM,5,NULL) #define BIO_get_no_connect_return(b) BIO_ctrl(b,BIO_C_GET_PROXY_PARAM,5,NULL)
#define BIO_set_fd(b,fd,c) BIO_int_ctrl(b,BIO_C_SET_FD,c,fd) #define BIO_set_fd(b,fd,c) BIO_int_ctrl(b,BIO_C_SET_FD,c,fd)
#define BIO_get_fd(b,c) BIO_ctrl(b,BIO_C_GET_FD,0,(char *)c) #define BIO_get_fd(b,c) BIO_ctrl(b,BIO_C_GET_FD,0,(char *)c)
#define BIO_set_fp(b,fp,c) BIO_ctrl(b,BIO_C_SET_FILE_PTR,c,(char *)fp) #define BIO_set_fp(b,fp,c) BIO_ctrl(b,BIO_C_SET_FILE_PTR,c,(char *)fp)
#define BIO_get_fp(b,fpp) BIO_ctrl(b,BIO_C_GET_FILE_PTR,0,(char *)fpp) #define BIO_get_fp(b,fpp) BIO_ctrl(b,BIO_C_GET_FILE_PTR,0,(char *)fpp)
#define BIO_seek(b,ofs) (int)BIO_ctrl(b,BIO_C_FILE_SEEK,ofs,NULL) #define BIO_seek(b,ofs) (int)BIO_ctrl(b,BIO_C_FILE_SEEK,ofs,NULL)
#define BIO_tell(b) (int)BIO_ctrl(b,BIO_C_FILE_TELL,0,NULL) #define BIO_tell(b) (int)BIO_ctrl(b,BIO_C_FILE_TELL,0,NULL)
/* name is cast to lose const, but might be better to route through a function /* name is cast to lose const, but might be better to route through a function
so we can do it safely */ so we can do it safely */
@@ -459,60 +460,60 @@ typedef struct bio_f_buffer_ctx_struct
int BIO_read_filename(BIO *b,const char *name); int BIO_read_filename(BIO *b,const char *name);
#else #else
#define BIO_read_filename(b,name) BIO_ctrl(b,BIO_C_SET_FILENAME, \ #define BIO_read_filename(b,name) BIO_ctrl(b,BIO_C_SET_FILENAME, \
BIO_CLOSE|BIO_FP_READ,(char *)name) BIO_CLOSE|BIO_FP_READ,(char *)name)
#endif #endif
#define BIO_write_filename(b,name) BIO_ctrl(b,BIO_C_SET_FILENAME, \ #define BIO_write_filename(b,name) BIO_ctrl(b,BIO_C_SET_FILENAME, \
BIO_CLOSE|BIO_FP_WRITE,name) BIO_CLOSE|BIO_FP_WRITE,name)
#define BIO_append_filename(b,name) BIO_ctrl(b,BIO_C_SET_FILENAME, \ #define BIO_append_filename(b,name) BIO_ctrl(b,BIO_C_SET_FILENAME, \
BIO_CLOSE|BIO_FP_APPEND,name) BIO_CLOSE|BIO_FP_APPEND,name)
#define BIO_rw_filename(b,name) BIO_ctrl(b,BIO_C_SET_FILENAME, \ #define BIO_rw_filename(b,name) BIO_ctrl(b,BIO_C_SET_FILENAME, \
BIO_CLOSE|BIO_FP_READ|BIO_FP_WRITE,name) BIO_CLOSE|BIO_FP_READ|BIO_FP_WRITE,name)
/* WARNING WARNING, this ups the reference count on the read bio of the /* WARNING WARNING, this ups the reference count on the read bio of the
* SSL structure. This is because the ssl read BIO is now pointed to by * SSL structure. This is because the ssl read BIO is now pointed to by
* the next_bio field in the bio. So when you free the BIO, make sure * the next_bio field in the bio. So when you free the BIO, make sure
* you are doing a BIO_free_all() to catch the underlying BIO. */ * you are doing a BIO_free_all() to catch the underlying BIO. */
#define BIO_set_ssl(b,ssl,c) BIO_ctrl(b,BIO_C_SET_SSL,c,(char *)ssl) #define BIO_set_ssl(b,ssl,c) BIO_ctrl(b,BIO_C_SET_SSL,c,(char *)ssl)
#define BIO_get_ssl(b,sslp) BIO_ctrl(b,BIO_C_GET_SSL,0,(char *)sslp) #define BIO_get_ssl(b,sslp) BIO_ctrl(b,BIO_C_GET_SSL,0,(char *)sslp)
#define BIO_set_ssl_mode(b,client) BIO_ctrl(b,BIO_C_SSL_MODE,client,NULL) #define BIO_set_ssl_mode(b,client) BIO_ctrl(b,BIO_C_SSL_MODE,client,NULL)
#define BIO_set_ssl_renegotiate_bytes(b,num) \ #define BIO_set_ssl_renegotiate_bytes(b,num) \
BIO_ctrl(b,BIO_C_SET_SSL_RENEGOTIATE_BYTES,num,NULL); BIO_ctrl(b,BIO_C_SET_SSL_RENEGOTIATE_BYTES,num,NULL);
#define BIO_get_num_renegotiates(b) \ #define BIO_get_num_renegotiates(b) \
BIO_ctrl(b,BIO_C_GET_SSL_NUM_RENEGOTIATES,0,NULL); BIO_ctrl(b,BIO_C_GET_SSL_NUM_RENEGOTIATES,0,NULL);
#define BIO_set_ssl_renegotiate_timeout(b,seconds) \ #define BIO_set_ssl_renegotiate_timeout(b,seconds) \
BIO_ctrl(b,BIO_C_SET_SSL_RENEGOTIATE_TIMEOUT,seconds,NULL); BIO_ctrl(b,BIO_C_SET_SSL_RENEGOTIATE_TIMEOUT,seconds,NULL);
/* defined in evp.h */ /* defined in evp.h */
/* #define BIO_set_md(b,md) BIO_ctrl(b,BIO_C_SET_MD,1,(char *)md) */ /* #define BIO_set_md(b,md) BIO_ctrl(b,BIO_C_SET_MD,1,(char *)md) */
#define BIO_get_mem_data(b,pp) BIO_ctrl(b,BIO_CTRL_INFO,0,(char *)pp) #define BIO_get_mem_data(b,pp) BIO_ctrl(b,BIO_CTRL_INFO,0,(char *)pp)
#define BIO_set_mem_buf(b,bm,c) BIO_ctrl(b,BIO_C_SET_BUF_MEM,c,(char *)bm) #define BIO_set_mem_buf(b,bm,c) BIO_ctrl(b,BIO_C_SET_BUF_MEM,c,(char *)bm)
#define BIO_get_mem_ptr(b,pp) BIO_ctrl(b,BIO_C_GET_BUF_MEM_PTR,0,(char *)pp) #define BIO_get_mem_ptr(b,pp) BIO_ctrl(b,BIO_C_GET_BUF_MEM_PTR,0,(char *)pp)
#define BIO_set_mem_eof_return(b,v) \ #define BIO_set_mem_eof_return(b,v) \
BIO_ctrl(b,BIO_C_SET_BUF_MEM_EOF_RETURN,v,NULL) BIO_ctrl(b,BIO_C_SET_BUF_MEM_EOF_RETURN,v,NULL)
/* For the BIO_f_buffer() type */ /* For the BIO_f_buffer() type */
#define BIO_get_buffer_num_lines(b) BIO_ctrl(b,BIO_C_GET_BUFF_NUM_LINES,0,NULL) #define BIO_get_buffer_num_lines(b) BIO_ctrl(b,BIO_C_GET_BUFF_NUM_LINES,0,NULL)
#define BIO_set_buffer_size(b,size) BIO_ctrl(b,BIO_C_SET_BUFF_SIZE,size,NULL) #define BIO_set_buffer_size(b,size) BIO_ctrl(b,BIO_C_SET_BUFF_SIZE,size,NULL)
#define BIO_set_read_buffer_size(b,size) BIO_int_ctrl(b,BIO_C_SET_BUFF_SIZE,size,0) #define BIO_set_read_buffer_size(b,size) BIO_int_ctrl(b,BIO_C_SET_BUFF_SIZE,size,0)
#define BIO_set_write_buffer_size(b,size) BIO_int_ctrl(b,BIO_C_SET_BUFF_SIZE,size,1) #define BIO_set_write_buffer_size(b,size) BIO_int_ctrl(b,BIO_C_SET_BUFF_SIZE,size,1)
#define BIO_set_buffer_read_data(b,buf,num) BIO_ctrl(b,BIO_C_SET_BUFF_READ_DATA,num,buf) #define BIO_set_buffer_read_data(b,buf,num) BIO_ctrl(b,BIO_C_SET_BUFF_READ_DATA,num,buf)
/* Don't use the next one unless you know what you are doing :-) */ /* Don't use the next one unless you know what you are doing :-) */
#define BIO_dup_state(b,ret) BIO_ctrl(b,BIO_CTRL_DUP,0,(char *)(ret)) #define BIO_dup_state(b,ret) BIO_ctrl(b,BIO_CTRL_DUP,0,(char *)(ret))
#define BIO_reset(b) (int)BIO_ctrl(b,BIO_CTRL_RESET,0,NULL) #define BIO_reset(b) (int)BIO_ctrl(b,BIO_CTRL_RESET,0,NULL)
#define BIO_eof(b) (int)BIO_ctrl(b,BIO_CTRL_EOF,0,NULL) #define BIO_eof(b) (int)BIO_ctrl(b,BIO_CTRL_EOF,0,NULL)
#define BIO_set_close(b,c) (int)BIO_ctrl(b,BIO_CTRL_SET_CLOSE,(c),NULL) #define BIO_set_close(b,c) (int)BIO_ctrl(b,BIO_CTRL_SET_CLOSE,(c),NULL)
#define BIO_get_close(b) (int)BIO_ctrl(b,BIO_CTRL_GET_CLOSE,0,NULL) #define BIO_get_close(b) (int)BIO_ctrl(b,BIO_CTRL_GET_CLOSE,0,NULL)
#define BIO_pending(b) (int)BIO_ctrl(b,BIO_CTRL_PENDING,0,NULL) #define BIO_pending(b) (int)BIO_ctrl(b,BIO_CTRL_PENDING,0,NULL)
#define BIO_wpending(b) (int)BIO_ctrl(b,BIO_CTRL_WPENDING,0,NULL) #define BIO_wpending(b) (int)BIO_ctrl(b,BIO_CTRL_WPENDING,0,NULL)
/* ...pending macros have inappropriate return type */ /* ...pending macros have inappropriate return type */
size_t BIO_ctrl_pending(BIO *b); size_t BIO_ctrl_pending(BIO *b);
size_t BIO_ctrl_wpending(BIO *b); size_t BIO_ctrl_wpending(BIO *b);
#define BIO_flush(b) (int)BIO_ctrl(b,BIO_CTRL_FLUSH,0,NULL) #define BIO_flush(b) (int)BIO_ctrl(b,BIO_CTRL_FLUSH,0,NULL)
#define BIO_get_info_callback(b,cbp) (int)BIO_ctrl(b,BIO_CTRL_GET_CALLBACK,0, \ #define BIO_get_info_callback(b,cbp) (int)BIO_ctrl(b,BIO_CTRL_GET_CALLBACK,0, \
cbp) cbp)
#define BIO_set_info_callback(b,cb) (int)BIO_callback_ctrl(b,BIO_CTRL_SET_CALLBACK,cb) #define BIO_set_info_callback(b,cb) (int)BIO_callback_ctrl(b,BIO_CTRL_SET_CALLBACK,cb)
/* For the BIO_f_buffer() type */ /* For the BIO_f_buffer() type */
@@ -549,7 +550,7 @@ int BIO_ctrl_reset_read_request(BIO *b);
int BIO_set_ex_data(BIO *bio,int idx,void *data); int BIO_set_ex_data(BIO *bio,int idx,void *data);
void *BIO_get_ex_data(BIO *bio,int idx); void *BIO_get_ex_data(BIO *bio,int idx);
int BIO_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func, int BIO_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func,
CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func); CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func);
unsigned long BIO_number_read(BIO *bio); unsigned long BIO_number_read(BIO *bio);
unsigned long BIO_number_written(BIO *bio); unsigned long BIO_number_written(BIO *bio);
@@ -558,39 +559,39 @@ unsigned long BIO_number_written(BIO *bio);
BIO_METHOD *BIO_s_file_internal(void); BIO_METHOD *BIO_s_file_internal(void);
BIO *BIO_new_file_internal(char *filename, char *mode); BIO *BIO_new_file_internal(char *filename, char *mode);
BIO *BIO_new_fp_internal(FILE *stream, int close_flag); BIO *BIO_new_fp_internal(FILE *stream, int close_flag);
# define BIO_s_file BIO_s_file_internal # define BIO_s_file BIO_s_file_internal
# define BIO_new_file BIO_new_file_internal # define BIO_new_file BIO_new_file_internal
# define BIO_new_fp BIO_new_fp_internal # define BIO_new_fp BIO_new_fp_internal
# else /* FP_API */ # else /* FP_API */
BIO_METHOD *BIO_s_file(void ); BIO_METHOD *BIO_s_file(void );
BIO *BIO_new_file(const char *filename, const char *mode); BIO *BIO_new_file(const char *filename, const char *mode);
BIO *BIO_new_fp(FILE *stream, int close_flag); BIO *BIO_new_fp(FILE *stream, int close_flag);
# define BIO_s_file_internal BIO_s_file # define BIO_s_file_internal BIO_s_file
# define BIO_new_file_internal BIO_new_file # define BIO_new_file_internal BIO_new_file
# define BIO_new_fp_internal BIO_s_file # define BIO_new_fp_internal BIO_s_file
# endif /* FP_API */ # endif /* FP_API */
# endif # endif
BIO * BIO_new(BIO_METHOD *type); BIO * BIO_new(BIO_METHOD *type);
int BIO_set(BIO *a,BIO_METHOD *type); int BIO_set(BIO *a,BIO_METHOD *type);
int BIO_free(BIO *a); int BIO_free(BIO *a);
void BIO_vfree(BIO *a); void BIO_vfree(BIO *a);
int BIO_read(BIO *b, void *data, int len); int BIO_read(BIO *b, void *data, int len);
int BIO_gets(BIO *bp,char *buf, int size); int BIO_gets(BIO *bp,char *buf, int size);
int BIO_write(BIO *b, const void *data, int len); int BIO_write(BIO *b, const void *data, int len);
int BIO_puts(BIO *bp,const char *buf); int BIO_puts(BIO *bp,const char *buf);
int BIO_indent(BIO *b,int indent,int max); int BIO_indent(BIO *b,int indent,int max);
long BIO_ctrl(BIO *bp,int cmd,long larg,void *parg); long BIO_ctrl(BIO *bp,int cmd,long larg,void *parg);
long BIO_callback_ctrl(BIO *b, int cmd, void (*fp)(struct bio_st *, int, const char *, int, long, long)); long BIO_callback_ctrl(BIO *b, int cmd, void (*fp)(struct bio_st *, int, const char *, int, long, long));
char * BIO_ptr_ctrl(BIO *bp,int cmd,long larg); char * BIO_ptr_ctrl(BIO *bp,int cmd,long larg);
long BIO_int_ctrl(BIO *bp,int cmd,long larg,int iarg); long BIO_int_ctrl(BIO *bp,int cmd,long larg,int iarg);
BIO * BIO_push(BIO *b,BIO *append); BIO * BIO_push(BIO *b,BIO *append);
BIO * BIO_pop(BIO *b); BIO * BIO_pop(BIO *b);
void BIO_free_all(BIO *a); void BIO_free_all(BIO *a);
BIO * BIO_find_type(BIO *b,int bio_type); BIO * BIO_find_type(BIO *b,int bio_type);
BIO * BIO_next(BIO *b); BIO * BIO_next(BIO *b);
BIO * BIO_get_retry_BIO(BIO *bio, int *reason); BIO * BIO_get_retry_BIO(BIO *bio, int *reason);
int BIO_get_retry_reason(BIO *bio); int BIO_get_retry_reason(BIO *bio);
BIO * BIO_dup_chain(BIO *in); BIO * BIO_dup_chain(BIO *in);
int BIO_nread0(BIO *bio, char **buf); int BIO_nread0(BIO *bio, char **buf);
int BIO_nread(BIO *bio, char **buf, int num); int BIO_nread(BIO *bio, char **buf, int num);
@@ -599,10 +600,10 @@ int BIO_nwrite(BIO *bio, char **buf, int num);
#ifndef OPENSSL_SYS_WIN16 #ifndef OPENSSL_SYS_WIN16
long BIO_debug_callback(BIO *bio,int cmd,const char *argp,int argi, long BIO_debug_callback(BIO *bio,int cmd,const char *argp,int argi,
long argl,long ret); long argl,long ret);
#else #else
long _far _loadds BIO_debug_callback(BIO *bio,int cmd,const char *argp,int argi, long _far _loadds BIO_debug_callback(BIO *bio,int cmd,const char *argp,int argi,
long argl,long ret); long argl,long ret);
#endif #endif
BIO_METHOD *BIO_s_mem(void); BIO_METHOD *BIO_s_mem(void);
@@ -635,9 +636,9 @@ int BIO_dgram_non_fatal_error(int error);
int BIO_fd_should_retry(int i); int BIO_fd_should_retry(int i);
int BIO_fd_non_fatal_error(int error); int BIO_fd_non_fatal_error(int error);
int BIO_dump_cb(int (*cb)(const void *data, size_t len, void *u), int BIO_dump_cb(int (*cb)(const void *data, size_t len, void *u),
void *u, const char *s, int len); void *u, const char *s, int len);
int BIO_dump_indent_cb(int (*cb)(const void *data, size_t len, void *u), int BIO_dump_indent_cb(int (*cb)(const void *data, size_t len, void *u),
void *u, const char *s, int len, int indent); void *u, const char *s, int len, int indent);
int BIO_dump(BIO *b,const char *bytes,int len); int BIO_dump(BIO *b,const char *bytes,int len);
int BIO_dump_indent(BIO *b,const char *bytes,int len,int indent); int BIO_dump_indent(BIO *b,const char *bytes,int len,int indent);
#ifndef OPENSSL_NO_FP_API #ifndef OPENSSL_NO_FP_API
@@ -671,7 +672,7 @@ BIO *BIO_new_connect(char *host_port);
BIO *BIO_new_accept(char *host_port); BIO *BIO_new_accept(char *host_port);
int BIO_new_bio_pair(BIO **bio1, size_t writebuf1, int BIO_new_bio_pair(BIO **bio1, size_t writebuf1,
BIO **bio2, size_t writebuf2); BIO **bio2, size_t writebuf2);
/* If successful, returns 1 and in *bio1, *bio2 two BIO pair endpoints. /* If successful, returns 1 and in *bio1, *bio2 two BIO pair endpoints.
* Otherwise returns 0 and sets *bio1 and *bio2 to NULL. * Otherwise returns 0 and sets *bio1 and *bio2 to NULL.
* Size 0 uses default value. * Size 0 uses default value.
@@ -687,13 +688,13 @@ void BIO_copy_next_retry(BIO *b);
# define __bio_h__attr__(x) # define __bio_h__attr__(x)
#endif #endif
int BIO_printf(BIO *bio, const char *format, ...) int BIO_printf(BIO *bio, const char *format, ...)
__bio_h__attr__((__format__(__printf__,2,3))); __bio_h__attr__((__format__(__printf__,2,3)));
int BIO_vprintf(BIO *bio, const char *format, va_list args) int BIO_vprintf(BIO *bio, const char *format, va_list args)
__bio_h__attr__((__format__(__printf__,2,0))); __bio_h__attr__((__format__(__printf__,2,0)));
int BIO_snprintf(char *buf, size_t n, const char *format, ...) int BIO_snprintf(char *buf, size_t n, const char *format, ...)
__bio_h__attr__((__format__(__printf__,3,4))); __bio_h__attr__((__format__(__printf__,3,4)));
int BIO_vsnprintf(char *buf, size_t n, const char *format, va_list args) int BIO_vsnprintf(char *buf, size_t n, const char *format, va_list args)
__bio_h__attr__((__format__(__printf__,3,0))); __bio_h__attr__((__format__(__printf__,3,0)));
#undef __bio_h__attr__ #undef __bio_h__attr__
/* BEGIN ERROR CODES */ /* BEGIN ERROR CODES */
@@ -705,72 +706,71 @@ void ERR_load_BIO_strings(void);
/* Error codes for the BIO functions. */ /* Error codes for the BIO functions. */
/* Function codes. */ /* Function codes. */
#define BIO_F_ACPT_STATE 100 #define BIO_F_ACPT_STATE 100
#define BIO_F_BIO_ACCEPT 101 #define BIO_F_BIO_ACCEPT 101
#define BIO_F_BIO_BER_GET_HEADER 102 #define BIO_F_BIO_BER_GET_HEADER 102
#define BIO_F_BIO_CALLBACK_CTRL 131 #define BIO_F_BIO_CALLBACK_CTRL 131
#define BIO_F_BIO_CTRL 103 #define BIO_F_BIO_CTRL 103
#define BIO_F_BIO_GETHOSTBYNAME 120 #define BIO_F_BIO_GETHOSTBYNAME 120
#define BIO_F_BIO_GETS 104 #define BIO_F_BIO_GETS 104
#define BIO_F_BIO_GET_ACCEPT_SOCKET 105 #define BIO_F_BIO_GET_ACCEPT_SOCKET 105
#define BIO_F_BIO_GET_HOST_IP 106 #define BIO_F_BIO_GET_HOST_IP 106
#define BIO_F_BIO_GET_PORT 107 #define BIO_F_BIO_GET_PORT 107
#define BIO_F_BIO_MAKE_PAIR 121 #define BIO_F_BIO_MAKE_PAIR 121
#define BIO_F_BIO_NEW 108 #define BIO_F_BIO_NEW 108
#define BIO_F_BIO_NEW_FILE 109 #define BIO_F_BIO_NEW_FILE 109
#define BIO_F_BIO_NEW_MEM_BUF 126 #define BIO_F_BIO_NEW_MEM_BUF 126
#define BIO_F_BIO_NREAD 123 #define BIO_F_BIO_NREAD 123
#define BIO_F_BIO_NREAD0 124 #define BIO_F_BIO_NREAD0 124
#define BIO_F_BIO_NWRITE 125 #define BIO_F_BIO_NWRITE 125
#define BIO_F_BIO_NWRITE0 122 #define BIO_F_BIO_NWRITE0 122
#define BIO_F_BIO_PUTS 110 #define BIO_F_BIO_PUTS 110
#define BIO_F_BIO_READ 111 #define BIO_F_BIO_READ 111
#define BIO_F_BIO_SOCK_INIT 112 #define BIO_F_BIO_SOCK_INIT 112
#define BIO_F_BIO_WRITE 113 #define BIO_F_BIO_WRITE 113
#define BIO_F_BUFFER_CTRL 114 #define BIO_F_BUFFER_CTRL 114
#define BIO_F_CONN_CTRL 127 #define BIO_F_CONN_CTRL 127
#define BIO_F_CONN_STATE 115 #define BIO_F_CONN_STATE 115
#define BIO_F_FILE_CTRL 116 #define BIO_F_FILE_CTRL 116
#define BIO_F_FILE_READ 130 #define BIO_F_FILE_READ 130
#define BIO_F_LINEBUFFER_CTRL 129 #define BIO_F_LINEBUFFER_CTRL 129
#define BIO_F_MEM_READ 128 #define BIO_F_MEM_READ 128
#define BIO_F_MEM_WRITE 117 #define BIO_F_MEM_WRITE 117
#define BIO_F_SSL_NEW 118 #define BIO_F_SSL_NEW 118
#define BIO_F_WSASTARTUP 119 #define BIO_F_WSASTARTUP 119
/* Reason codes. */ /* Reason codes. */
#define BIO_R_ACCEPT_ERROR 100 #define BIO_R_ACCEPT_ERROR 100
#define BIO_R_BAD_FOPEN_MODE 101 #define BIO_R_BAD_FOPEN_MODE 101
#define BIO_R_BAD_HOSTNAME_LOOKUP 102 #define BIO_R_BAD_HOSTNAME_LOOKUP 102
#define BIO_R_BROKEN_PIPE 124 #define BIO_R_BROKEN_PIPE 124
#define BIO_R_CONNECT_ERROR 103 #define BIO_R_CONNECT_ERROR 103
#define BIO_R_EOF_ON_MEMORY_BIO 127 #define BIO_R_EOF_ON_MEMORY_BIO 127
#define BIO_R_ERROR_SETTING_NBIO 104 #define BIO_R_ERROR_SETTING_NBIO 104
#define BIO_R_ERROR_SETTING_NBIO_ON_ACCEPTED_SOCKET 105 #define BIO_R_ERROR_SETTING_NBIO_ON_ACCEPTED_SOCKET 105
#define BIO_R_ERROR_SETTING_NBIO_ON_ACCEPT_SOCKET 106 #define BIO_R_ERROR_SETTING_NBIO_ON_ACCEPT_SOCKET 106
#define BIO_R_GETHOSTBYNAME_ADDR_IS_NOT_AF_INET 107 #define BIO_R_GETHOSTBYNAME_ADDR_IS_NOT_AF_INET 107
#define BIO_R_INVALID_ARGUMENT 125 #define BIO_R_INVALID_ARGUMENT 125
#define BIO_R_INVALID_IP_ADDRESS 108 #define BIO_R_INVALID_IP_ADDRESS 108
#define BIO_R_IN_USE 123 #define BIO_R_IN_USE 123
#define BIO_R_KEEPALIVE 109 #define BIO_R_KEEPALIVE 109
#define BIO_R_NBIO_CONNECT_ERROR 110 #define BIO_R_NBIO_CONNECT_ERROR 110
#define BIO_R_NO_ACCEPT_PORT_SPECIFIED 111 #define BIO_R_NO_ACCEPT_PORT_SPECIFIED 111
#define BIO_R_NO_HOSTNAME_SPECIFIED 112 #define BIO_R_NO_HOSTNAME_SPECIFIED 112
#define BIO_R_NO_PORT_DEFINED 113 #define BIO_R_NO_PORT_DEFINED 113
#define BIO_R_NO_PORT_SPECIFIED 114 #define BIO_R_NO_PORT_SPECIFIED 114
#define BIO_R_NO_SUCH_FILE 128 #define BIO_R_NO_SUCH_FILE 128
#define BIO_R_NULL_PARAMETER 115 #define BIO_R_NULL_PARAMETER 115
#define BIO_R_TAG_MISMATCH 116 #define BIO_R_TAG_MISMATCH 116
#define BIO_R_UNABLE_TO_BIND_SOCKET 117 #define BIO_R_UNABLE_TO_BIND_SOCKET 117
#define BIO_R_UNABLE_TO_CREATE_SOCKET 118 #define BIO_R_UNABLE_TO_CREATE_SOCKET 118
#define BIO_R_UNABLE_TO_LISTEN_SOCKET 119 #define BIO_R_UNABLE_TO_LISTEN_SOCKET 119
#define BIO_R_UNINITIALIZED 120 #define BIO_R_UNINITIALIZED 120
#define BIO_R_UNSUPPORTED_METHOD 121 #define BIO_R_UNSUPPORTED_METHOD 121
#define BIO_R_WRITE_TO_READ_ONLY_BIO 126 #define BIO_R_WRITE_TO_READ_ONLY_BIO 126
#define BIO_R_WSASTARTUP 122 #define BIO_R_WSASTARTUP 122
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif #endif
dep/include/openssl/blowfish.h
+16 -15
View File
@@ -69,8 +69,8 @@ extern "C" {
#error BF is disabled. #error BF is disabled.
#endif #endif
#define BF_ENCRYPT 1 #define BF_ENCRYPT 1
#define BF_DECRYPT 0 #define BF_DECRYPT 0
/* /*
* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -89,35 +89,37 @@ extern "C" {
* does it have on performance on none-T3E machines. I could declare * does it have on performance on none-T3E machines. I could declare
* int, but at least on C90 sizeof(int) can be chosen at compile time. * int, but at least on C90 sizeof(int) can be chosen at compile time.
* So I've chosen long... * So I've chosen long...
* <[email protected]> * <[email protected]>
*/ */
#else #else
#define BF_LONG unsigned int #define BF_LONG unsigned int
#endif #endif
#define BF_ROUNDS 16 #define BF_ROUNDS 16
#define BF_BLOCK 8 #define BF_BLOCK 8
typedef struct bf_key_st typedef struct bf_key_st
{ {
BF_LONG P[BF_ROUNDS+2]; BF_LONG P[BF_ROUNDS+2];
BF_LONG S[4*256]; BF_LONG S[4*256];
} BF_KEY; } BF_KEY;
#ifdef OPENSSL_FIPS
void private_BF_set_key(BF_KEY *key, int len, const unsigned char *data);
#endif
void BF_set_key(BF_KEY *key, int len, const unsigned char *data); void BF_set_key(BF_KEY *key, int len, const unsigned char *data);
void BF_encrypt(BF_LONG *data,const BF_KEY *key); void BF_encrypt(BF_LONG *data,const BF_KEY *key);
void BF_decrypt(BF_LONG *data,const BF_KEY *key); void BF_decrypt(BF_LONG *data,const BF_KEY *key);
void BF_ecb_encrypt(const unsigned char *in, unsigned char *out, void BF_ecb_encrypt(const unsigned char *in, unsigned char *out,
const BF_KEY *key, int enc); const BF_KEY *key, int enc);
void BF_cbc_encrypt(const unsigned char *in, unsigned char *out, long length, void BF_cbc_encrypt(const unsigned char *in, unsigned char *out, long length,
const BF_KEY *schedule, unsigned char *ivec, int enc); const BF_KEY *schedule, unsigned char *ivec, int enc);
void BF_cfb64_encrypt(const unsigned char *in, unsigned char *out, long length, void BF_cfb64_encrypt(const unsigned char *in, unsigned char *out, long length,
const BF_KEY *schedule, unsigned char *ivec, int *num, int enc); const BF_KEY *schedule, unsigned char *ivec, int *num, int enc);
void BF_ofb64_encrypt(const unsigned char *in, unsigned char *out, long length, void BF_ofb64_encrypt(const unsigned char *in, unsigned char *out, long length,
const BF_KEY *schedule, unsigned char *ivec, int *num); const BF_KEY *schedule, unsigned char *ivec, int *num);
const char *BF_options(void); const char *BF_options(void);
#ifdef __cplusplus #ifdef __cplusplus
@@ -125,4 +127,3 @@ const char *BF_options(void);
#endif #endif
#endif #endif
dep/include/openssl/bn.h
+407 -380
View File
@@ -120,23 +120,23 @@ extern "C" {
* unsigned long long is only 64 bits :-(, don't define * unsigned long long is only 64 bits :-(, don't define
* BN_LLONG for the DEC Alpha */ * BN_LLONG for the DEC Alpha */
#ifdef SIXTY_FOUR_BIT_LONG #ifdef SIXTY_FOUR_BIT_LONG
#define BN_ULLONG unsigned long long #define BN_ULLONG unsigned long long
#define BN_ULONG unsigned long #define BN_ULONG unsigned long
#define BN_LONG long #define BN_LONG long
#define BN_BITS 128 #define BN_BITS 128
#define BN_BYTES 8 #define BN_BYTES 8
#define BN_BITS2 64 #define BN_BITS2 64
#define BN_BITS4 32 #define BN_BITS4 32
#define BN_MASK (0xffffffffffffffffffffffffffffffffLL) #define BN_MASK (0xffffffffffffffffffffffffffffffffLL)
#define BN_MASK2 (0xffffffffffffffffL) #define BN_MASK2 (0xffffffffffffffffL)
#define BN_MASK2l (0xffffffffL) #define BN_MASK2l (0xffffffffL)
#define BN_MASK2h (0xffffffff00000000L) #define BN_MASK2h (0xffffffff00000000L)
#define BN_MASK2h1 (0xffffffff80000000L) #define BN_MASK2h1 (0xffffffff80000000L)
#define BN_TBIT (0x8000000000000000L) #define BN_TBIT (0x8000000000000000L)
#define BN_DEC_CONV (10000000000000000000UL) #define BN_DEC_CONV (10000000000000000000UL)
#define BN_DEC_FMT1 "%lu" #define BN_DEC_FMT1 "%lu"
#define BN_DEC_FMT2 "%019lu" #define BN_DEC_FMT2 "%019lu"
#define BN_DEC_NUM 19 #define BN_DEC_NUM 19
#endif #endif
/* This is where the long long data type is 64 bits, but long is 32. /* This is where the long long data type is 64 bits, but long is 32.
@@ -147,111 +147,121 @@ extern "C" {
#ifdef SIXTY_FOUR_BIT #ifdef SIXTY_FOUR_BIT
#undef BN_LLONG #undef BN_LLONG
#undef BN_ULLONG #undef BN_ULLONG
#define BN_ULONG unsigned long long #define BN_ULONG unsigned long long
#define BN_LONG long long #define BN_LONG long long
#define BN_BITS 128 #define BN_BITS 128
#define BN_BYTES 8 #define BN_BYTES 8
#define BN_BITS2 64 #define BN_BITS2 64
#define BN_BITS4 32 #define BN_BITS4 32
#define BN_MASK2 (0xffffffffffffffffLL) #define BN_MASK2 (0xffffffffffffffffLL)
#define BN_MASK2l (0xffffffffL) #define BN_MASK2l (0xffffffffL)
#define BN_MASK2h (0xffffffff00000000LL) #define BN_MASK2h (0xffffffff00000000LL)
#define BN_MASK2h1 (0xffffffff80000000LL) #define BN_MASK2h1 (0xffffffff80000000LL)
#define BN_TBIT (0x8000000000000000LL) #define BN_TBIT (0x8000000000000000LL)
#define BN_DEC_CONV (10000000000000000000ULL) #define BN_DEC_CONV (10000000000000000000ULL)
#define BN_DEC_FMT1 "%llu" #define BN_DEC_FMT1 "%llu"
#define BN_DEC_FMT2 "%019llu" #define BN_DEC_FMT2 "%019llu"
#define BN_DEC_NUM 19 #define BN_DEC_NUM 19
#endif #endif
#ifdef THIRTY_TWO_BIT #ifdef THIRTY_TWO_BIT
#ifdef BN_LLONG #ifdef BN_LLONG
# if defined(OPENSSL_SYS_WIN32) && !defined(__GNUC__) # if defined(OPENSSL_SYS_WIN32) && !defined(__GNUC__)
# define BN_ULLONG unsigned __int64 # define BN_ULLONG unsigned __int64
# else # else
# define BN_ULLONG unsigned long long # define BN_ULLONG unsigned long long
# endif # endif
#endif #endif
#define BN_ULONG unsigned long #define BN_ULONG unsigned long
#define BN_LONG long #define BN_LONG long
#define BN_BITS 64 #define BN_BITS 64
#define BN_BYTES 4 #define BN_BYTES 4
#define BN_BITS2 32 #define BN_BITS2 32
#define BN_BITS4 16 #define BN_BITS4 16
#ifdef OPENSSL_SYS_WIN32 #ifdef OPENSSL_SYS_WIN32
/* VC++ doesn't like the LL suffix */ /* VC++ doesn't like the LL suffix */
#define BN_MASK (0xffffffffffffffffL) #define BN_MASK (0xffffffffffffffffL)
#else #else
#define BN_MASK (0xffffffffffffffffLL) #define BN_MASK (0xffffffffffffffffLL)
#endif #endif
#define BN_MASK2 (0xffffffffL) #define BN_MASK2 (0xffffffffL)
#define BN_MASK2l (0xffff) #define BN_MASK2l (0xffff)
#define BN_MASK2h1 (0xffff8000L) #define BN_MASK2h1 (0xffff8000L)
#define BN_MASK2h (0xffff0000L) #define BN_MASK2h (0xffff0000L)
#define BN_TBIT (0x80000000L) #define BN_TBIT (0x80000000L)
#define BN_DEC_CONV (1000000000L) #define BN_DEC_CONV (1000000000L)
#define BN_DEC_FMT1 "%lu" #define BN_DEC_FMT1 "%lu"
#define BN_DEC_FMT2 "%09lu" #define BN_DEC_FMT2 "%09lu"
#define BN_DEC_NUM 9 #define BN_DEC_NUM 9
#endif #endif
#ifdef SIXTEEN_BIT #ifdef SIXTEEN_BIT
#ifndef BN_DIV2W #ifndef BN_DIV2W
#define BN_DIV2W #define BN_DIV2W
#endif #endif
#define BN_ULLONG unsigned long #define BN_ULLONG unsigned long
#define BN_ULONG unsigned short #define BN_ULONG unsigned short
#define BN_LONG short #define BN_LONG short
#define BN_BITS 32 #define BN_BITS 32
#define BN_BYTES 2 #define BN_BYTES 2
#define BN_BITS2 16 #define BN_BITS2 16
#define BN_BITS4 8 #define BN_BITS4 8
#define BN_MASK (0xffffffff) #define BN_MASK (0xffffffff)
#define BN_MASK2 (0xffff) #define BN_MASK2 (0xffff)
#define BN_MASK2l (0xff) #define BN_MASK2l (0xff)
#define BN_MASK2h1 (0xff80) #define BN_MASK2h1 (0xff80)
#define BN_MASK2h (0xff00) #define BN_MASK2h (0xff00)
#define BN_TBIT (0x8000) #define BN_TBIT (0x8000)
#define BN_DEC_CONV (100000) #define BN_DEC_CONV (100000)
#define BN_DEC_FMT1 "%u" #define BN_DEC_FMT1 "%u"
#define BN_DEC_FMT2 "%05u" #define BN_DEC_FMT2 "%05u"
#define BN_DEC_NUM 5 #define BN_DEC_NUM 5
#endif #endif
#ifdef EIGHT_BIT #ifdef EIGHT_BIT
#ifndef BN_DIV2W #ifndef BN_DIV2W
#define BN_DIV2W #define BN_DIV2W
#endif #endif
#define BN_ULLONG unsigned short #define BN_ULLONG unsigned short
#define BN_ULONG unsigned char #define BN_ULONG unsigned char
#define BN_LONG char #define BN_LONG char
#define BN_BITS 16 #define BN_BITS 16
#define BN_BYTES 1 #define BN_BYTES 1
#define BN_BITS2 8 #define BN_BITS2 8
#define BN_BITS4 4 #define BN_BITS4 4
#define BN_MASK (0xffff) #define BN_MASK (0xffff)
#define BN_MASK2 (0xff) #define BN_MASK2 (0xff)
#define BN_MASK2l (0xf) #define BN_MASK2l (0xf)
#define BN_MASK2h1 (0xf8) #define BN_MASK2h1 (0xf8)
#define BN_MASK2h (0xf0) #define BN_MASK2h (0xf0)
#define BN_TBIT (0x80) #define BN_TBIT (0x80)
#define BN_DEC_CONV (100) #define BN_DEC_CONV (100)
#define BN_DEC_FMT1 "%u" #define BN_DEC_FMT1 "%u"
#define BN_DEC_FMT2 "%02u" #define BN_DEC_FMT2 "%02u"
#define BN_DEC_NUM 2 #define BN_DEC_NUM 2
#endif #endif
#define BN_DEFAULT_BITS 1280 #define BN_DEFAULT_BITS 1280
#define BN_FLG_MALLOCED 0x01
#define BN_FLG_STATIC_DATA 0x02
#define BN_FLG_CONSTTIME 0x04 /* avoid leaking exponent information through timing,
* BN_mod_exp_mont() will call BN_mod_exp_mont_consttime,
* BN_div() will call BN_div_no_branch,
* BN_mod_inverse() will call BN_mod_inverse_no_branch.
*/
#define BN_FLG_MALLOCED 0x01
#define BN_FLG_STATIC_DATA 0x02
#define BN_FLG_EXP_CONSTTIME 0x04 /* avoid leaking exponent information through timings
* (BN_mod_exp_mont() will call BN_mod_exp_mont_consttime) */
#ifndef OPENSSL_NO_DEPRECATED #ifndef OPENSSL_NO_DEPRECATED
#define BN_FLG_FREE 0x8000 /* used for debuging */ #define BN_FLG_EXP_CONSTTIME BN_FLG_CONSTTIME /* deprecated name for the flag */
/* avoid leaking exponent information through timings
* (BN_mod_exp_mont() will call BN_mod_exp_mont_consttime) */
#endif #endif
#define BN_set_flags(b,n) ((b)->flags|=(n))
#define BN_get_flags(b,n) ((b)->flags&(n)) #ifndef OPENSSL_NO_DEPRECATED
#define BN_FLG_FREE 0x8000 /* used for debuging */
#endif
#define BN_set_flags(b,n) ((b)->flags|=(n))
#define BN_get_flags(b,n) ((b)->flags&(n))
/* get a clone of a BIGNUM with changed flags, for *temporary* use only /* get a clone of a BIGNUM with changed flags, for *temporary* use only
* (the two BIGNUMs cannot not be used in parallel!) */ * (the two BIGNUMs cannot not be used in parallel!) */
@@ -276,69 +286,74 @@ typedef struct bn_gencb_st BN_GENCB;
#endif #endif
struct bignum_st struct bignum_st
{ {
BN_ULONG *d; /* Pointer to an array of 'BN_BITS2' bit chunks. */ BN_ULONG *d; /* Pointer to an array of 'BN_BITS2' bit chunks. */
int top; /* Index of last used d +1. */ int top; /* Index of last used d +1. */
/* The next are internal book keeping for bn_expand. */ /* The next are internal book keeping for bn_expand. */
int dmax; /* Size of the d array. */ int dmax; /* Size of the d array. */
int neg; /* one if the number is negative */ int neg; /* one if the number is negative */
int flags; int flags;
}; };
/* Used for montgomery multiplication */ /* Used for montgomery multiplication */
struct bn_mont_ctx_st struct bn_mont_ctx_st
{ {
int ri; /* number of bits in R */ int ri; /* number of bits in R */
BIGNUM RR; /* used to convert to montgomery form */ BIGNUM RR; /* used to convert to montgomery form */
BIGNUM N; /* The modulus */ BIGNUM N; /* The modulus */
BIGNUM Ni; /* R*(1/R mod N) - N*Ni = 1 BIGNUM Ni; /* R*(1/R mod N) - N*Ni = 1
* (Ni is only stored for bignum algorithm) */ * (Ni is only stored for bignum algorithm) */
BN_ULONG n0; /* least significant word of Ni */ #if 0
int flags; /* OpenSSL 0.9.9 preview: */
}; BN_ULONG n0[2];/* least significant word(s) of Ni */
#else
BN_ULONG n0; /* least significant word of Ni */
#endif
int flags;
};
/* Used for reciprocal division/mod functions /* Used for reciprocal division/mod functions
* It cannot be shared between threads * It cannot be shared between threads
*/ */
struct bn_recp_ctx_st struct bn_recp_ctx_st
{ {
BIGNUM N; /* the divisor */ BIGNUM N; /* the divisor */
BIGNUM Nr; /* the reciprocal */ BIGNUM Nr; /* the reciprocal */
int num_bits; int num_bits;
int shift; int shift;
int flags; int flags;
}; };
/* Used for slow "generation" functions. */ /* Used for slow "generation" functions. */
struct bn_gencb_st struct bn_gencb_st
{ {
unsigned int ver; /* To handle binary (in)compatibility */ unsigned int ver; /* To handle binary (in)compatibility */
void *arg; /* callback-specific data */ void *arg; /* callback-specific data */
union union
{ {
/* if(ver==1) - handles old style callbacks */ /* if(ver==1) - handles old style callbacks */
void (*cb_1)(int, int, void *); void (*cb_1)(int, int, void *);
/* if(ver==2) - new callback style */ /* if(ver==2) - new callback style */
int (*cb_2)(int, int, BN_GENCB *); int (*cb_2)(int, int, BN_GENCB *);
} cb; } cb;
}; };
/* Wrapper function to make using BN_GENCB easier, */ /* Wrapper function to make using BN_GENCB easier, */
int BN_GENCB_call(BN_GENCB *cb, int a, int b); int BN_GENCB_call(BN_GENCB *cb, int a, int b);
/* Macro to populate a BN_GENCB structure with an "old"-style callback */ /* Macro to populate a BN_GENCB structure with an "old"-style callback */
#define BN_GENCB_set_old(gencb, callback, cb_arg) { \ #define BN_GENCB_set_old(gencb, callback, cb_arg) { \
BN_GENCB *tmp_gencb = (gencb); \ BN_GENCB *tmp_gencb = (gencb); \
tmp_gencb->ver = 1; \ tmp_gencb->ver = 1; \
tmp_gencb->arg = (cb_arg); \ tmp_gencb->arg = (cb_arg); \
tmp_gencb->cb.cb_1 = (callback); } tmp_gencb->cb.cb_1 = (callback); }
/* Macro to populate a BN_GENCB structure with a "new"-style callback */ /* Macro to populate a BN_GENCB structure with a "new"-style callback */
#define BN_GENCB_set(gencb, callback, cb_arg) { \ #define BN_GENCB_set(gencb, callback, cb_arg) { \
BN_GENCB *tmp_gencb = (gencb); \ BN_GENCB *tmp_gencb = (gencb); \
tmp_gencb->ver = 2; \ tmp_gencb->ver = 2; \
tmp_gencb->arg = (cb_arg); \ tmp_gencb->arg = (cb_arg); \
tmp_gencb->cb.cb_2 = (callback); } tmp_gencb->cb.cb_2 = (callback); }
#define BN_prime_checks 0 /* default: select number of iterations #define BN_prime_checks 0 /* default: select number of iterations
based on the size of the number */ based on the size of the number */
/* number of Miller-Rabin iterations for an error rate of less than 2^-80 /* number of Miller-Rabin iterations for an error rate of less than 2^-80
* for random 'b'-bit input, b >= 100 (taken from table 4.4 in the Handbook * for random 'b'-bit input, b >= 100 (taken from table 4.4 in the Handbook
@@ -358,183 +373,194 @@ int BN_GENCB_call(BN_GENCB *cb, int a, int b);
(b) >= 150 ? 18 : \ (b) >= 150 ? 18 : \
/* b >= 100 */ 27) /* b >= 100 */ 27)
#define BN_num_bytes(a) ((BN_num_bits(a)+7)/8) #define BN_num_bytes(a) ((BN_num_bits(a)+7)/8)
/* Note that BN_abs_is_word didn't work reliably for w == 0 until 0.9.8 */ /* Note that BN_abs_is_word didn't work reliably for w == 0 until 0.9.8 */
#define BN_abs_is_word(a,w) ((((a)->top == 1) && ((a)->d[0] == (BN_ULONG)(w))) || \ #define BN_abs_is_word(a,w) ((((a)->top == 1) && ((a)->d[0] == (BN_ULONG)(w))) || \
(((w) == 0) && ((a)->top == 0))) (((w) == 0) && ((a)->top == 0)))
#define BN_is_zero(a) ((a)->top == 0) #define BN_is_zero(a) ((a)->top == 0)
#define BN_is_one(a) (BN_abs_is_word((a),1) && !(a)->neg) #define BN_is_one(a) (BN_abs_is_word((a),1) && !(a)->neg)
#define BN_is_word(a,w) (BN_abs_is_word((a),(w)) && (!(w) || !(a)->neg)) #define BN_is_word(a,w) (BN_abs_is_word((a),(w)) && (!(w) || !(a)->neg))
#define BN_is_odd(a) (((a)->top > 0) && ((a)->d[0] & 1)) #define BN_is_odd(a) (((a)->top > 0) && ((a)->d[0] & 1))
#define BN_one(a) (BN_set_word((a),1)) #define BN_one(a) (BN_set_word((a),1))
#define BN_zero_ex(a) \ #define BN_zero_ex(a) \
do { \ do { \
BIGNUM *_tmp_bn = (a); \ BIGNUM *_tmp_bn = (a); \
_tmp_bn->top = 0; \ _tmp_bn->top = 0; \
_tmp_bn->neg = 0; \ _tmp_bn->neg = 0; \
} while(0) } while(0)
#ifdef OPENSSL_NO_DEPRECATED #ifdef OPENSSL_NO_DEPRECATED
#define BN_zero(a) BN_zero_ex(a) #define BN_zero(a) BN_zero_ex(a)
#else #else
#define BN_zero(a) (BN_set_word((a),0)) #define BN_zero(a) (BN_set_word((a),0))
#endif #endif
const BIGNUM *BN_value_one(void); const BIGNUM *BN_value_one(void);
char * BN_options(void); char * BN_options(void);
BN_CTX *BN_CTX_new(void); BN_CTX *BN_CTX_new(void);
#ifndef OPENSSL_NO_DEPRECATED #ifndef OPENSSL_NO_DEPRECATED
void BN_CTX_init(BN_CTX *c); void BN_CTX_init(BN_CTX *c);
#endif #endif
void BN_CTX_free(BN_CTX *c); void BN_CTX_free(BN_CTX *c);
void BN_CTX_start(BN_CTX *ctx); void BN_CTX_start(BN_CTX *ctx);
BIGNUM *BN_CTX_get(BN_CTX *ctx); BIGNUM *BN_CTX_get(BN_CTX *ctx);
void BN_CTX_end(BN_CTX *ctx); void BN_CTX_end(BN_CTX *ctx);
int BN_rand(BIGNUM *rnd, int bits, int top,int bottom); int BN_rand(BIGNUM *rnd, int bits, int top,int bottom);
int BN_pseudo_rand(BIGNUM *rnd, int bits, int top,int bottom); int BN_pseudo_rand(BIGNUM *rnd, int bits, int top,int bottom);
int BN_rand_range(BIGNUM *rnd, BIGNUM *range); int BN_rand_range(BIGNUM *rnd, const BIGNUM *range);
int BN_pseudo_rand_range(BIGNUM *rnd, BIGNUM *range); int BN_pseudo_rand_range(BIGNUM *rnd, const BIGNUM *range);
int BN_num_bits(const BIGNUM *a); int BN_num_bits(const BIGNUM *a);
int BN_num_bits_word(BN_ULONG); int BN_num_bits_word(BN_ULONG);
BIGNUM *BN_new(void); BIGNUM *BN_new(void);
void BN_init(BIGNUM *); void BN_init(BIGNUM *);
void BN_clear_free(BIGNUM *a); void BN_clear_free(BIGNUM *a);
BIGNUM *BN_copy(BIGNUM *a, const BIGNUM *b); BIGNUM *BN_copy(BIGNUM *a, const BIGNUM *b);
void BN_swap(BIGNUM *a, BIGNUM *b); void BN_swap(BIGNUM *a, BIGNUM *b);
BIGNUM *BN_bin2bn(const unsigned char *s,int len,BIGNUM *ret); BIGNUM *BN_bin2bn(const unsigned char *s,int len,BIGNUM *ret);
int BN_bn2bin(const BIGNUM *a, unsigned char *to); int BN_bn2bin(const BIGNUM *a, unsigned char *to);
BIGNUM *BN_mpi2bn(const unsigned char *s,int len,BIGNUM *ret); BIGNUM *BN_mpi2bn(const unsigned char *s,int len,BIGNUM *ret);
int BN_bn2mpi(const BIGNUM *a, unsigned char *to); int BN_bn2mpi(const BIGNUM *a, unsigned char *to);
int BN_sub(BIGNUM *r, const BIGNUM *a, const BIGNUM *b); int BN_sub(BIGNUM *r, const BIGNUM *a, const BIGNUM *b);
int BN_usub(BIGNUM *r, const BIGNUM *a, const BIGNUM *b); int BN_usub(BIGNUM *r, const BIGNUM *a, const BIGNUM *b);
int BN_uadd(BIGNUM *r, const BIGNUM *a, const BIGNUM *b); int BN_uadd(BIGNUM *r, const BIGNUM *a, const BIGNUM *b);
int BN_add(BIGNUM *r, const BIGNUM *a, const BIGNUM *b); int BN_add(BIGNUM *r, const BIGNUM *a, const BIGNUM *b);
int BN_mul(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx); int BN_mul(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx);
int BN_sqr(BIGNUM *r, const BIGNUM *a,BN_CTX *ctx); int BN_sqr(BIGNUM *r, const BIGNUM *a,BN_CTX *ctx);
/** BN_set_negative sets sign of a BIGNUM /** BN_set_negative sets sign of a BIGNUM
* \param b pointer to the BIGNUM object * \param b pointer to the BIGNUM object
* \param n 0 if the BIGNUM b should be positive and a value != 0 otherwise * \param n 0 if the BIGNUM b should be positive and a value != 0 otherwise
*/ */
void BN_set_negative(BIGNUM *b, int n); void BN_set_negative(BIGNUM *b, int n);
/** BN_is_negative returns 1 if the BIGNUM is negative /** BN_is_negative returns 1 if the BIGNUM is negative
* \param a pointer to the BIGNUM object * \param a pointer to the BIGNUM object
* \return 1 if a < 0 and 0 otherwise * \return 1 if a < 0 and 0 otherwise
*/ */
#define BN_is_negative(a) ((a)->neg != 0) #define BN_is_negative(a) ((a)->neg != 0)
int BN_div(BIGNUM *dv, BIGNUM *rem, const BIGNUM *m, const BIGNUM *d, int BN_div(BIGNUM *dv, BIGNUM *rem, const BIGNUM *m, const BIGNUM *d,
BN_CTX *ctx); BN_CTX *ctx);
#define BN_mod(rem,m,d,ctx) BN_div(NULL,(rem),(m),(d),(ctx)) #define BN_mod(rem,m,d,ctx) BN_div(NULL,(rem),(m),(d),(ctx))
int BN_nnmod(BIGNUM *r, const BIGNUM *m, const BIGNUM *d, BN_CTX *ctx); int BN_nnmod(BIGNUM *r, const BIGNUM *m, const BIGNUM *d, BN_CTX *ctx);
int BN_mod_add(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, const BIGNUM *m, BN_CTX *ctx); int BN_mod_add(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, const BIGNUM *m, BN_CTX *ctx);
int BN_mod_add_quick(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, const BIGNUM *m); int BN_mod_add_quick(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, const BIGNUM *m);
int BN_mod_sub(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, const BIGNUM *m, BN_CTX *ctx); int BN_mod_sub(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, const BIGNUM *m, BN_CTX *ctx);
int BN_mod_sub_quick(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, const BIGNUM *m); int BN_mod_sub_quick(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, const BIGNUM *m);
int BN_mod_mul(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, int BN_mod_mul(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,
const BIGNUM *m, BN_CTX *ctx); const BIGNUM *m, BN_CTX *ctx);
int BN_mod_sqr(BIGNUM *r, const BIGNUM *a, const BIGNUM *m, BN_CTX *ctx); int BN_mod_sqr(BIGNUM *r, const BIGNUM *a, const BIGNUM *m, BN_CTX *ctx);
int BN_mod_lshift1(BIGNUM *r, const BIGNUM *a, const BIGNUM *m, BN_CTX *ctx); int BN_mod_lshift1(BIGNUM *r, const BIGNUM *a, const BIGNUM *m, BN_CTX *ctx);
int BN_mod_lshift1_quick(BIGNUM *r, const BIGNUM *a, const BIGNUM *m); int BN_mod_lshift1_quick(BIGNUM *r, const BIGNUM *a, const BIGNUM *m);
int BN_mod_lshift(BIGNUM *r, const BIGNUM *a, int n, const BIGNUM *m, BN_CTX *ctx); int BN_mod_lshift(BIGNUM *r, const BIGNUM *a, int n, const BIGNUM *m, BN_CTX *ctx);
int BN_mod_lshift_quick(BIGNUM *r, const BIGNUM *a, int n, const BIGNUM *m); int BN_mod_lshift_quick(BIGNUM *r, const BIGNUM *a, int n, const BIGNUM *m);
BN_ULONG BN_mod_word(const BIGNUM *a, BN_ULONG w); BN_ULONG BN_mod_word(const BIGNUM *a, BN_ULONG w);
BN_ULONG BN_div_word(BIGNUM *a, BN_ULONG w); BN_ULONG BN_div_word(BIGNUM *a, BN_ULONG w);
int BN_mul_word(BIGNUM *a, BN_ULONG w); int BN_mul_word(BIGNUM *a, BN_ULONG w);
int BN_add_word(BIGNUM *a, BN_ULONG w); int BN_add_word(BIGNUM *a, BN_ULONG w);
int BN_sub_word(BIGNUM *a, BN_ULONG w); int BN_sub_word(BIGNUM *a, BN_ULONG w);
int BN_set_word(BIGNUM *a, BN_ULONG w); int BN_set_word(BIGNUM *a, BN_ULONG w);
BN_ULONG BN_get_word(const BIGNUM *a); BN_ULONG BN_get_word(const BIGNUM *a);
int BN_cmp(const BIGNUM *a, const BIGNUM *b); int BN_cmp(const BIGNUM *a, const BIGNUM *b);
void BN_free(BIGNUM *a); void BN_free(BIGNUM *a);
int BN_is_bit_set(const BIGNUM *a, int n); int BN_is_bit_set(const BIGNUM *a, int n);
int BN_lshift(BIGNUM *r, const BIGNUM *a, int n); int BN_lshift(BIGNUM *r, const BIGNUM *a, int n);
int BN_lshift1(BIGNUM *r, const BIGNUM *a); int BN_lshift1(BIGNUM *r, const BIGNUM *a);
int BN_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,BN_CTX *ctx); int BN_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,BN_CTX *ctx);
int BN_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, int BN_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
const BIGNUM *m,BN_CTX *ctx); const BIGNUM *m,BN_CTX *ctx);
int BN_mod_exp_mont(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, int BN_mod_exp_mont(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx); const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx);
int BN_mod_exp_mont_consttime(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p, int BN_mod_exp_mont_consttime(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p,
const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *in_mont); const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *in_mont);
int BN_mod_exp_mont_word(BIGNUM *r, BN_ULONG a, const BIGNUM *p, int BN_mod_exp_mont_word(BIGNUM *r, BN_ULONG a, const BIGNUM *p,
const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx); const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx);
int BN_mod_exp2_mont(BIGNUM *r, const BIGNUM *a1, const BIGNUM *p1, int BN_mod_exp2_mont(BIGNUM *r, const BIGNUM *a1, const BIGNUM *p1,
const BIGNUM *a2, const BIGNUM *p2,const BIGNUM *m, const BIGNUM *a2, const BIGNUM *p2,const BIGNUM *m,
BN_CTX *ctx,BN_MONT_CTX *m_ctx); BN_CTX *ctx,BN_MONT_CTX *m_ctx);
int BN_mod_exp_simple(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, int BN_mod_exp_simple(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
const BIGNUM *m,BN_CTX *ctx); const BIGNUM *m,BN_CTX *ctx);
int BN_mask_bits(BIGNUM *a,int n); int BN_mask_bits(BIGNUM *a,int n);
#ifndef OPENSSL_NO_FP_API #ifndef OPENSSL_NO_FP_API
int BN_print_fp(FILE *fp, const BIGNUM *a); int BN_print_fp(FILE *fp, const BIGNUM *a);
#endif #endif
#ifdef HEADER_BIO_H #ifdef HEADER_BIO_H
int BN_print(BIO *fp, const BIGNUM *a); int BN_print(BIO *fp, const BIGNUM *a);
#else #else
int BN_print(void *fp, const BIGNUM *a); int BN_print(void *fp, const BIGNUM *a);
#endif #endif
int BN_reciprocal(BIGNUM *r, const BIGNUM *m, int len, BN_CTX *ctx); int BN_reciprocal(BIGNUM *r, const BIGNUM *m, int len, BN_CTX *ctx);
int BN_rshift(BIGNUM *r, const BIGNUM *a, int n); int BN_rshift(BIGNUM *r, const BIGNUM *a, int n);
int BN_rshift1(BIGNUM *r, const BIGNUM *a); int BN_rshift1(BIGNUM *r, const BIGNUM *a);
void BN_clear(BIGNUM *a); void BN_clear(BIGNUM *a);
BIGNUM *BN_dup(const BIGNUM *a); BIGNUM *BN_dup(const BIGNUM *a);
int BN_ucmp(const BIGNUM *a, const BIGNUM *b); int BN_ucmp(const BIGNUM *a, const BIGNUM *b);
int BN_set_bit(BIGNUM *a, int n); int BN_set_bit(BIGNUM *a, int n);
int BN_clear_bit(BIGNUM *a, int n); int BN_clear_bit(BIGNUM *a, int n);
char * BN_bn2hex(const BIGNUM *a); char * BN_bn2hex(const BIGNUM *a);
char * BN_bn2dec(const BIGNUM *a); char * BN_bn2dec(const BIGNUM *a);
int BN_hex2bn(BIGNUM **a, const char *str); int BN_hex2bn(BIGNUM **a, const char *str);
int BN_dec2bn(BIGNUM **a, const char *str); int BN_dec2bn(BIGNUM **a, const char *str);
int BN_gcd(BIGNUM *r,const BIGNUM *a,const BIGNUM *b,BN_CTX *ctx); int BN_gcd(BIGNUM *r,const BIGNUM *a,const BIGNUM *b,BN_CTX *ctx);
int BN_kronecker(const BIGNUM *a,const BIGNUM *b,BN_CTX *ctx); /* returns -2 for error */ int BN_kronecker(const BIGNUM *a,const BIGNUM *b,BN_CTX *ctx); /* returns -2 for error */
BIGNUM *BN_mod_inverse(BIGNUM *ret, BIGNUM *BN_mod_inverse(BIGNUM *ret,
const BIGNUM *a, const BIGNUM *n,BN_CTX *ctx); const BIGNUM *a, const BIGNUM *n,BN_CTX *ctx);
BIGNUM *BN_mod_sqrt(BIGNUM *ret, BIGNUM *BN_mod_sqrt(BIGNUM *ret,
const BIGNUM *a, const BIGNUM *n,BN_CTX *ctx); const BIGNUM *a, const BIGNUM *n,BN_CTX *ctx);
/* Deprecated versions */ /* Deprecated versions */
#ifndef OPENSSL_NO_DEPRECATED #ifndef OPENSSL_NO_DEPRECATED
BIGNUM *BN_generate_prime(BIGNUM *ret,int bits,int safe, BIGNUM *BN_generate_prime(BIGNUM *ret,int bits,int safe,
const BIGNUM *add, const BIGNUM *rem, const BIGNUM *add, const BIGNUM *rem,
void (*callback)(int,int,void *),void *cb_arg); void (*callback)(int,int,void *),void *cb_arg);
int BN_is_prime(const BIGNUM *p,int nchecks, int BN_is_prime(const BIGNUM *p,int nchecks,
void (*callback)(int,int,void *), void (*callback)(int,int,void *),
BN_CTX *ctx,void *cb_arg); BN_CTX *ctx,void *cb_arg);
int BN_is_prime_fasttest(const BIGNUM *p,int nchecks, int BN_is_prime_fasttest(const BIGNUM *p,int nchecks,
void (*callback)(int,int,void *),BN_CTX *ctx,void *cb_arg, void (*callback)(int,int,void *),BN_CTX *ctx,void *cb_arg,
int do_trial_division); int do_trial_division);
#endif /* !defined(OPENSSL_NO_DEPRECATED) */ #endif /* !defined(OPENSSL_NO_DEPRECATED) */
/* Newer versions */ /* Newer versions */
int BN_generate_prime_ex(BIGNUM *ret,int bits,int safe, const BIGNUM *add, int BN_generate_prime_ex(BIGNUM *ret,int bits,int safe, const BIGNUM *add,
const BIGNUM *rem, BN_GENCB *cb); const BIGNUM *rem, BN_GENCB *cb);
int BN_is_prime_ex(const BIGNUM *p,int nchecks, BN_CTX *ctx, BN_GENCB *cb); int BN_is_prime_ex(const BIGNUM *p,int nchecks, BN_CTX *ctx, BN_GENCB *cb);
int BN_is_prime_fasttest_ex(const BIGNUM *p,int nchecks, BN_CTX *ctx, int BN_is_prime_fasttest_ex(const BIGNUM *p,int nchecks, BN_CTX *ctx,
int do_trial_division, BN_GENCB *cb); int do_trial_division, BN_GENCB *cb);
int BN_X931_generate_Xpq(BIGNUM *Xp, BIGNUM *Xq, int nbits, BN_CTX *ctx);
int BN_X931_derive_prime_ex(BIGNUM *p, BIGNUM *p1, BIGNUM *p2,
const BIGNUM *Xp, const BIGNUM *Xp1, const BIGNUM *Xp2,
const BIGNUM *e, BN_CTX *ctx, BN_GENCB *cb);
int BN_X931_generate_prime_ex(BIGNUM *p, BIGNUM *p1, BIGNUM *p2,
BIGNUM *Xp1, BIGNUM *Xp2,
const BIGNUM *Xp,
const BIGNUM *e, BN_CTX *ctx,
BN_GENCB *cb);
BN_MONT_CTX *BN_MONT_CTX_new(void ); BN_MONT_CTX *BN_MONT_CTX_new(void );
void BN_MONT_CTX_init(BN_MONT_CTX *ctx); void BN_MONT_CTX_init(BN_MONT_CTX *ctx);
int BN_mod_mul_montgomery(BIGNUM *r,const BIGNUM *a,const BIGNUM *b, int BN_mod_mul_montgomery(BIGNUM *r,const BIGNUM *a,const BIGNUM *b,
BN_MONT_CTX *mont, BN_CTX *ctx); BN_MONT_CTX *mont, BN_CTX *ctx);
#define BN_to_montgomery(r,a,mont,ctx) BN_mod_mul_montgomery(\ #define BN_to_montgomery(r,a,mont,ctx) BN_mod_mul_montgomery(\
(r),(a),&((mont)->RR),(mont),(ctx)) (r),(a),&((mont)->RR),(mont),(ctx))
int BN_from_montgomery(BIGNUM *r,const BIGNUM *a, int BN_from_montgomery(BIGNUM *r,const BIGNUM *a,
BN_MONT_CTX *mont, BN_CTX *ctx); BN_MONT_CTX *mont, BN_CTX *ctx);
void BN_MONT_CTX_free(BN_MONT_CTX *mont); void BN_MONT_CTX_free(BN_MONT_CTX *mont);
int BN_MONT_CTX_set(BN_MONT_CTX *mont,const BIGNUM *mod,BN_CTX *ctx); int BN_MONT_CTX_set(BN_MONT_CTX *mont,const BIGNUM *mod,BN_CTX *ctx);
BN_MONT_CTX *BN_MONT_CTX_copy(BN_MONT_CTX *to,BN_MONT_CTX *from); BN_MONT_CTX *BN_MONT_CTX_copy(BN_MONT_CTX *to,BN_MONT_CTX *from);
BN_MONT_CTX *BN_MONT_CTX_set_locked(BN_MONT_CTX **pmont, int lock, BN_MONT_CTX *BN_MONT_CTX_set_locked(BN_MONT_CTX **pmont, int lock,
const BIGNUM *mod, BN_CTX *ctx); const BIGNUM *mod, BN_CTX *ctx);
/* BN_BLINDING flags */ /* BN_BLINDING flags */
#define BN_BLINDING_NO_UPDATE 0x00000001 #define BN_BLINDING_NO_UPDATE 0x00000001
#define BN_BLINDING_NO_RECREATE 0x00000002 #define BN_BLINDING_NO_RECREATE 0x00000002
BN_BLINDING *BN_BLINDING_new(const BIGNUM *A, const BIGNUM *Ai, BIGNUM *mod); BN_BLINDING *BN_BLINDING_new(const BIGNUM *A, const BIGNUM *Ai, /* const */ BIGNUM *mod);
void BN_BLINDING_free(BN_BLINDING *b); void BN_BLINDING_free(BN_BLINDING *b);
int BN_BLINDING_update(BN_BLINDING *b,BN_CTX *ctx); int BN_BLINDING_update(BN_BLINDING *b,BN_CTX *ctx);
int BN_BLINDING_convert(BIGNUM *n, BN_BLINDING *b, BN_CTX *ctx); int BN_BLINDING_convert(BIGNUM *n, BN_BLINDING *b, BN_CTX *ctx);
@@ -546,26 +572,26 @@ void BN_BLINDING_set_thread_id(BN_BLINDING *, unsigned long);
unsigned long BN_BLINDING_get_flags(const BN_BLINDING *); unsigned long BN_BLINDING_get_flags(const BN_BLINDING *);
void BN_BLINDING_set_flags(BN_BLINDING *, unsigned long); void BN_BLINDING_set_flags(BN_BLINDING *, unsigned long);
BN_BLINDING *BN_BLINDING_create_param(BN_BLINDING *b, BN_BLINDING *BN_BLINDING_create_param(BN_BLINDING *b,
const BIGNUM *e, BIGNUM *m, BN_CTX *ctx, const BIGNUM *e, /* const */ BIGNUM *m, BN_CTX *ctx,
int (*bn_mod_exp)(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, int (*bn_mod_exp)(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx), const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx),
BN_MONT_CTX *m_ctx); BN_MONT_CTX *m_ctx);
#ifndef OPENSSL_NO_DEPRECATED #ifndef OPENSSL_NO_DEPRECATED
void BN_set_params(int mul,int high,int low,int mont); void BN_set_params(int mul,int high,int low,int mont);
int BN_get_params(int which); /* 0, mul, 1 high, 2 low, 3 mont */ int BN_get_params(int which); /* 0, mul, 1 high, 2 low, 3 mont */
#endif #endif
void BN_RECP_CTX_init(BN_RECP_CTX *recp); void BN_RECP_CTX_init(BN_RECP_CTX *recp);
BN_RECP_CTX *BN_RECP_CTX_new(void); BN_RECP_CTX *BN_RECP_CTX_new(void);
void BN_RECP_CTX_free(BN_RECP_CTX *recp); void BN_RECP_CTX_free(BN_RECP_CTX *recp);
int BN_RECP_CTX_set(BN_RECP_CTX *recp,const BIGNUM *rdiv,BN_CTX *ctx); int BN_RECP_CTX_set(BN_RECP_CTX *recp,const BIGNUM *rdiv,BN_CTX *ctx);
int BN_mod_mul_reciprocal(BIGNUM *r, const BIGNUM *x, const BIGNUM *y, int BN_mod_mul_reciprocal(BIGNUM *r, const BIGNUM *x, const BIGNUM *y,
BN_RECP_CTX *recp,BN_CTX *ctx); BN_RECP_CTX *recp,BN_CTX *ctx);
int BN_mod_exp_recp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, int BN_mod_exp_recp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
const BIGNUM *m, BN_CTX *ctx); const BIGNUM *m, BN_CTX *ctx);
int BN_div_recp(BIGNUM *dv, BIGNUM *rem, const BIGNUM *m, int BN_div_recp(BIGNUM *dv, BIGNUM *rem, const BIGNUM *m,
BN_RECP_CTX *recp, BN_CTX *ctx); BN_RECP_CTX *recp, BN_CTX *ctx);
/* Functions for arithmetic over binary polynomials represented by BIGNUMs. /* Functions for arithmetic over binary polynomials represented by BIGNUMs.
* *
@@ -576,47 +602,47 @@ int BN_div_recp(BIGNUM *dv, BIGNUM *rem, const BIGNUM *m,
* be expanded to the appropriate size if needed. * be expanded to the appropriate size if needed.
*/ */
int BN_GF2m_add(BIGNUM *r, const BIGNUM *a, const BIGNUM *b); /*r = a + b*/ int BN_GF2m_add(BIGNUM *r, const BIGNUM *a, const BIGNUM *b); /*r = a + b*/
#define BN_GF2m_sub(r, a, b) BN_GF2m_add(r, a, b) #define BN_GF2m_sub(r, a, b) BN_GF2m_add(r, a, b)
int BN_GF2m_mod(BIGNUM *r, const BIGNUM *a, const BIGNUM *p); /*r=a mod p*/ int BN_GF2m_mod(BIGNUM *r, const BIGNUM *a, const BIGNUM *p); /*r=a mod p*/
int BN_GF2m_mod_mul(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, int BN_GF2m_mod_mul(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,
const BIGNUM *p, BN_CTX *ctx); /* r = (a * b) mod p */ const BIGNUM *p, BN_CTX *ctx); /* r = (a * b) mod p */
int BN_GF2m_mod_sqr(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, int BN_GF2m_mod_sqr(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
BN_CTX *ctx); /* r = (a * a) mod p */ BN_CTX *ctx); /* r = (a * a) mod p */
int BN_GF2m_mod_inv(BIGNUM *r, const BIGNUM *b, const BIGNUM *p, int BN_GF2m_mod_inv(BIGNUM *r, const BIGNUM *b, const BIGNUM *p,
BN_CTX *ctx); /* r = (1 / b) mod p */ BN_CTX *ctx); /* r = (1 / b) mod p */
int BN_GF2m_mod_div(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, int BN_GF2m_mod_div(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,
const BIGNUM *p, BN_CTX *ctx); /* r = (a / b) mod p */ const BIGNUM *p, BN_CTX *ctx); /* r = (a / b) mod p */
int BN_GF2m_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, int BN_GF2m_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,
const BIGNUM *p, BN_CTX *ctx); /* r = (a ^ b) mod p */ const BIGNUM *p, BN_CTX *ctx); /* r = (a ^ b) mod p */
int BN_GF2m_mod_sqrt(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, int BN_GF2m_mod_sqrt(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
BN_CTX *ctx); /* r = sqrt(a) mod p */ BN_CTX *ctx); /* r = sqrt(a) mod p */
int BN_GF2m_mod_solve_quad(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, int BN_GF2m_mod_solve_quad(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
BN_CTX *ctx); /* r^2 + r = a mod p */ BN_CTX *ctx); /* r^2 + r = a mod p */
#define BN_GF2m_cmp(a, b) BN_ucmp((a), (b)) #define BN_GF2m_cmp(a, b) BN_ucmp((a), (b))
/* Some functions allow for representation of the irreducible polynomials /* Some functions allow for representation of the irreducible polynomials
* as an unsigned int[], say p. The irreducible f(t) is then of the form: * as an unsigned int[], say p. The irreducible f(t) is then of the form:
* t^p[0] + t^p[1] + ... + t^p[k] * t^p[0] + t^p[1] + ... + t^p[k]
* where m = p[0] > p[1] > ... > p[k] = 0. * where m = p[0] > p[1] > ... > p[k] = 0.
*/ */
int BN_GF2m_mod_arr(BIGNUM *r, const BIGNUM *a, const unsigned int p[]); int BN_GF2m_mod_arr(BIGNUM *r, const BIGNUM *a, const unsigned int p[]);
/* r = a mod p */ /* r = a mod p */
int BN_GF2m_mod_mul_arr(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, int BN_GF2m_mod_mul_arr(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,
const unsigned int p[], BN_CTX *ctx); /* r = (a * b) mod p */ const unsigned int p[], BN_CTX *ctx); /* r = (a * b) mod p */
int BN_GF2m_mod_sqr_arr(BIGNUM *r, const BIGNUM *a, const unsigned int p[], int BN_GF2m_mod_sqr_arr(BIGNUM *r, const BIGNUM *a, const unsigned int p[],
BN_CTX *ctx); /* r = (a * a) mod p */ BN_CTX *ctx); /* r = (a * a) mod p */
int BN_GF2m_mod_inv_arr(BIGNUM *r, const BIGNUM *b, const unsigned int p[], int BN_GF2m_mod_inv_arr(BIGNUM *r, const BIGNUM *b, const unsigned int p[],
BN_CTX *ctx); /* r = (1 / b) mod p */ BN_CTX *ctx); /* r = (1 / b) mod p */
int BN_GF2m_mod_div_arr(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, int BN_GF2m_mod_div_arr(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,
const unsigned int p[], BN_CTX *ctx); /* r = (a / b) mod p */ const unsigned int p[], BN_CTX *ctx); /* r = (a / b) mod p */
int BN_GF2m_mod_exp_arr(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, int BN_GF2m_mod_exp_arr(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,
const unsigned int p[], BN_CTX *ctx); /* r = (a ^ b) mod p */ const unsigned int p[], BN_CTX *ctx); /* r = (a ^ b) mod p */
int BN_GF2m_mod_sqrt_arr(BIGNUM *r, const BIGNUM *a, int BN_GF2m_mod_sqrt_arr(BIGNUM *r, const BIGNUM *a,
const unsigned int p[], BN_CTX *ctx); /* r = sqrt(a) mod p */ const unsigned int p[], BN_CTX *ctx); /* r = sqrt(a) mod p */
int BN_GF2m_mod_solve_quad_arr(BIGNUM *r, const BIGNUM *a, int BN_GF2m_mod_solve_quad_arr(BIGNUM *r, const BIGNUM *a,
const unsigned int p[], BN_CTX *ctx); /* r^2 + r = a mod p */ const unsigned int p[], BN_CTX *ctx); /* r^2 + r = a mod p */
int BN_GF2m_poly2arr(const BIGNUM *a, unsigned int p[], int max); int BN_GF2m_poly2arr(const BIGNUM *a, unsigned int p[], int max);
int BN_GF2m_arr2poly(const unsigned int p[], BIGNUM *a); int BN_GF2m_arr2poly(const unsigned int p[], BIGNUM *a);
/* faster mod functions for the 'NIST primes' /* faster mod functions for the 'NIST primes'
* 0 <= a < p^2 */ * 0 <= a < p^2 */
@@ -635,7 +661,7 @@ const BIGNUM *BN_get0_nist_prime_521(void);
/* library internal functions */ /* library internal functions */
#define bn_expand(a,bits) ((((((bits+BN_BITS2-1))/BN_BITS2)) <= (a)->dmax)?\ #define bn_expand(a,bits) ((((((bits+BN_BITS2-1))/BN_BITS2)) <= (a)->dmax)?\
(a):bn_expand2((a),(bits+BN_BITS2-1)/BN_BITS2)) (a):bn_expand2((a),(bits+BN_BITS2-1)/BN_BITS2))
#define bn_wexpand(a,words) (((words) <= (a)->dmax)?(a):bn_expand2((a),(words))) #define bn_wexpand(a,words) (((words) <= (a)->dmax)?(a):bn_expand2((a),(words)))
BIGNUM *bn_expand2(BIGNUM *a, int words); BIGNUM *bn_expand2(BIGNUM *a, int words);
#ifndef OPENSSL_NO_DEPRECATED #ifndef OPENSSL_NO_DEPRECATED
@@ -682,20 +708,20 @@ int RAND_pseudo_bytes(unsigned char *buf,int num);
#define BN_DEBUG_TRIX #define BN_DEBUG_TRIX
#endif #endif
#define bn_pollute(a) \ #define bn_pollute(a) \
do { \ do { \
const BIGNUM *_bnum1 = (a); \ const BIGNUM *_bnum1 = (a); \
if(_bnum1->top < _bnum1->dmax) { \ if(_bnum1->top < _bnum1->dmax) { \
unsigned char _tmp_char; \ unsigned char _tmp_char; \
/* We cast away const without the compiler knowing, any \ /* We cast away const without the compiler knowing, any \
* *genuinely* constant variables that aren't mutable \ * *genuinely* constant variables that aren't mutable \
* wouldn't be constructed with top!=dmax. */ \ * wouldn't be constructed with top!=dmax. */ \
BN_ULONG *_not_const; \ BN_ULONG *_not_const; \
memcpy(&_not_const, &_bnum1->d, sizeof(BN_ULONG*)); \ memcpy(&_not_const, &_bnum1->d, sizeof(BN_ULONG*)); \
RAND_pseudo_bytes(&_tmp_char, 1); \ RAND_pseudo_bytes(&_tmp_char, 1); \
memset((unsigned char *)(_not_const + _bnum1->top), _tmp_char, \ memset((unsigned char *)(_not_const + _bnum1->top), _tmp_char, \
(_bnum1->dmax - _bnum1->top) * sizeof(BN_ULONG)); \ (_bnum1->dmax - _bnum1->top) * sizeof(BN_ULONG)); \
} \ } \
} while(0) } while(0)
#ifdef BN_DEBUG_TRIX #ifdef BN_DEBUG_TRIX
#undef RAND_pseudo_bytes #undef RAND_pseudo_bytes
#endif #endif
@@ -703,35 +729,35 @@ int RAND_pseudo_bytes(unsigned char *buf,int num);
#define bn_pollute(a) #define bn_pollute(a)
#endif #endif
#define bn_check_top(a) \ #define bn_check_top(a) \
do { \ do { \
const BIGNUM *_bnum2 = (a); \ const BIGNUM *_bnum2 = (a); \
if (_bnum2 != NULL) { \ if (_bnum2 != NULL) { \
assert((_bnum2->top == 0) || \ assert((_bnum2->top == 0) || \
(_bnum2->d[_bnum2->top - 1] != 0)); \ (_bnum2->d[_bnum2->top - 1] != 0)); \
bn_pollute(_bnum2); \ bn_pollute(_bnum2); \
} \ } \
} while(0) } while(0)
#define bn_fix_top(a) bn_check_top(a) #define bn_fix_top(a) bn_check_top(a)
#else /* !BN_DEBUG */ #else /* !BN_DEBUG */
#define bn_pollute(a) #define bn_pollute(a)
#define bn_check_top(a) #define bn_check_top(a)
#define bn_fix_top(a) bn_correct_top(a) #define bn_fix_top(a) bn_correct_top(a)
#endif #endif
#define bn_correct_top(a) \ #define bn_correct_top(a) \
{ \ { \
BN_ULONG *ftl; \ BN_ULONG *ftl; \
if ((a)->top > 0) \ if ((a)->top > 0) \
{ \ { \
for (ftl= &((a)->d[(a)->top-1]); (a)->top > 0; (a)->top--) \ for (ftl= &((a)->d[(a)->top-1]); (a)->top > 0; (a)->top--) \
if (*(ftl--)) break; \ if (*(ftl--)) break; \
} \ } \
bn_pollute(a); \ bn_pollute(a); \
} }
BN_ULONG bn_mul_add_words(BN_ULONG *rp, const BN_ULONG *ap, int num, BN_ULONG w); BN_ULONG bn_mul_add_words(BN_ULONG *rp, const BN_ULONG *ap, int num, BN_ULONG w);
BN_ULONG bn_mul_words(BN_ULONG *rp, const BN_ULONG *ap, int num, BN_ULONG w); BN_ULONG bn_mul_words(BN_ULONG *rp, const BN_ULONG *ap, int num, BN_ULONG w);
@@ -763,66 +789,67 @@ void ERR_load_BN_strings(void);
/* Error codes for the BN functions. */ /* Error codes for the BN functions. */
/* Function codes. */ /* Function codes. */
#define BN_F_BNRAND 127 #define BN_F_BNRAND 127
#define BN_F_BN_BLINDING_CONVERT_EX 100 #define BN_F_BN_BLINDING_CONVERT_EX 100
#define BN_F_BN_BLINDING_CREATE_PARAM 128 #define BN_F_BN_BLINDING_CREATE_PARAM 128
#define BN_F_BN_BLINDING_INVERT_EX 101 #define BN_F_BN_BLINDING_INVERT_EX 101
#define BN_F_BN_BLINDING_NEW 102 #define BN_F_BN_BLINDING_NEW 102
#define BN_F_BN_BLINDING_UPDATE 103 #define BN_F_BN_BLINDING_UPDATE 103
#define BN_F_BN_BN2DEC 104 #define BN_F_BN_BN2DEC 104
#define BN_F_BN_BN2HEX 105 #define BN_F_BN_BN2HEX 105
#define BN_F_BN_CTX_GET 116 #define BN_F_BN_CTX_GET 116
#define BN_F_BN_CTX_NEW 106 #define BN_F_BN_CTX_NEW 106
#define BN_F_BN_CTX_START 129 #define BN_F_BN_CTX_START 129
#define BN_F_BN_DIV 107 #define BN_F_BN_DIV 107
#define BN_F_BN_DIV_RECP 130 #define BN_F_BN_DIV_NO_BRANCH 138
#define BN_F_BN_EXP 123 #define BN_F_BN_DIV_RECP 130
#define BN_F_BN_EXPAND2 108 #define BN_F_BN_EXP 123
#define BN_F_BN_EXPAND_INTERNAL 120 #define BN_F_BN_EXPAND2 108
#define BN_F_BN_GF2M_MOD 131 #define BN_F_BN_EXPAND_INTERNAL 120
#define BN_F_BN_GF2M_MOD_EXP 132 #define BN_F_BN_GF2M_MOD 131
#define BN_F_BN_GF2M_MOD_MUL 133 #define BN_F_BN_GF2M_MOD_EXP 132
#define BN_F_BN_GF2M_MOD_SOLVE_QUAD 134 #define BN_F_BN_GF2M_MOD_MUL 133
#define BN_F_BN_GF2M_MOD_SOLVE_QUAD_ARR 135 #define BN_F_BN_GF2M_MOD_SOLVE_QUAD 134
#define BN_F_BN_GF2M_MOD_SQR 136 #define BN_F_BN_GF2M_MOD_SOLVE_QUAD_ARR 135
#define BN_F_BN_GF2M_MOD_SQRT 137 #define BN_F_BN_GF2M_MOD_SQR 136
#define BN_F_BN_MOD_EXP2_MONT 118 #define BN_F_BN_GF2M_MOD_SQRT 137
#define BN_F_BN_MOD_EXP_MONT 109 #define BN_F_BN_MOD_EXP2_MONT 118
#define BN_F_BN_MOD_EXP_MONT_CONSTTIME 124 #define BN_F_BN_MOD_EXP_MONT 109
#define BN_F_BN_MOD_EXP_MONT_WORD 117 #define BN_F_BN_MOD_EXP_MONT_CONSTTIME 124
#define BN_F_BN_MOD_EXP_RECP 125 #define BN_F_BN_MOD_EXP_MONT_WORD 117
#define BN_F_BN_MOD_EXP_SIMPLE 126 #define BN_F_BN_MOD_EXP_RECP 125
#define BN_F_BN_MOD_INVERSE 110 #define BN_F_BN_MOD_EXP_SIMPLE 126
#define BN_F_BN_MOD_LSHIFT_QUICK 119 #define BN_F_BN_MOD_INVERSE 110
#define BN_F_BN_MOD_MUL_RECIPROCAL 111 #define BN_F_BN_MOD_INVERSE_NO_BRANCH 139
#define BN_F_BN_MOD_SQRT 121 #define BN_F_BN_MOD_LSHIFT_QUICK 119
#define BN_F_BN_MPI2BN 112 #define BN_F_BN_MOD_MUL_RECIPROCAL 111
#define BN_F_BN_NEW 113 #define BN_F_BN_MOD_SQRT 121
#define BN_F_BN_RAND 114 #define BN_F_BN_MPI2BN 112
#define BN_F_BN_RAND_RANGE 122 #define BN_F_BN_NEW 113
#define BN_F_BN_USUB 115 #define BN_F_BN_RAND 114
#define BN_F_BN_RAND_RANGE 122
#define BN_F_BN_USUB 115
/* Reason codes. */ /* Reason codes. */
#define BN_R_ARG2_LT_ARG3 100 #define BN_R_ARG2_LT_ARG3 100
#define BN_R_BAD_RECIPROCAL 101 #define BN_R_BAD_RECIPROCAL 101
#define BN_R_BIGNUM_TOO_LONG 114 #define BN_R_BIGNUM_TOO_LONG 114
#define BN_R_CALLED_WITH_EVEN_MODULUS 102 #define BN_R_CALLED_WITH_EVEN_MODULUS 102
#define BN_R_DIV_BY_ZERO 103 #define BN_R_DIV_BY_ZERO 103
#define BN_R_ENCODING_ERROR 104 #define BN_R_ENCODING_ERROR 104
#define BN_R_EXPAND_ON_STATIC_BIGNUM_DATA 105 #define BN_R_EXPAND_ON_STATIC_BIGNUM_DATA 105
#define BN_R_INPUT_NOT_REDUCED 110 #define BN_R_INPUT_NOT_REDUCED 110
#define BN_R_INVALID_LENGTH 106 #define BN_R_INVALID_LENGTH 106
#define BN_R_INVALID_RANGE 115 #define BN_R_INVALID_RANGE 115
#define BN_R_NOT_A_SQUARE 111 #define BN_R_NOT_A_SQUARE 111
#define BN_R_NOT_INITIALIZED 107 #define BN_R_NOT_INITIALIZED 107
#define BN_R_NO_INVERSE 108 #define BN_R_NO_INVERSE 108
#define BN_R_NO_SOLUTION 116 #define BN_R_NO_SOLUTION 116
#define BN_R_P_IS_NOT_PRIME 112 #define BN_R_P_IS_NOT_PRIME 112
#define BN_R_TOO_MANY_ITERATIONS 113 #define BN_R_TOO_MANY_ITERATIONS 113
#define BN_R_TOO_MANY_TEMPORARY_VARIABLES 109 #define BN_R_TOO_MANY_TEMPORARY_VARIABLES 109
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif #endif
dep/include/openssl/cast.h
+17 -16
View File
@@ -69,38 +69,39 @@ extern "C" {
#error CAST is disabled. #error CAST is disabled.
#endif #endif
#define CAST_ENCRYPT 1 #define CAST_ENCRYPT 1
#define CAST_DECRYPT 0 #define CAST_DECRYPT 0
#define CAST_LONG unsigned long #define CAST_LONG unsigned long
#define CAST_BLOCK 8 #define CAST_BLOCK 8
#define CAST_KEY_LENGTH 16 #define CAST_KEY_LENGTH 16
typedef struct cast_key_st typedef struct cast_key_st
{ {
CAST_LONG data[32]; CAST_LONG data[32];
int short_key; /* Use reduced rounds for short key */ int short_key; /* Use reduced rounds for short key */
} CAST_KEY; } CAST_KEY;
#ifdef OPENSSL_FIPS
void private_CAST_set_key(CAST_KEY *key, int len, const unsigned char *data);
#endif
void CAST_set_key(CAST_KEY *key, int len, const unsigned char *data); void CAST_set_key(CAST_KEY *key, int len, const unsigned char *data);
void CAST_ecb_encrypt(const unsigned char *in,unsigned char *out,CAST_KEY *key, void CAST_ecb_encrypt(const unsigned char *in,unsigned char *out,CAST_KEY *key,
int enc); int enc);
void CAST_encrypt(CAST_LONG *data,CAST_KEY *key); void CAST_encrypt(CAST_LONG *data,CAST_KEY *key);
void CAST_decrypt(CAST_LONG *data,CAST_KEY *key); void CAST_decrypt(CAST_LONG *data,CAST_KEY *key);
void CAST_cbc_encrypt(const unsigned char *in, unsigned char *out, long length, void CAST_cbc_encrypt(const unsigned char *in, unsigned char *out, long length,
CAST_KEY *ks, unsigned char *iv, int enc); CAST_KEY *ks, unsigned char *iv, int enc);
void CAST_cfb64_encrypt(const unsigned char *in, unsigned char *out, void CAST_cfb64_encrypt(const unsigned char *in, unsigned char *out,
long length, CAST_KEY *schedule, unsigned char *ivec, long length, CAST_KEY *schedule, unsigned char *ivec,
int *num, int enc); int *num, int enc);
void CAST_ofb64_encrypt(const unsigned char *in, unsigned char *out, void CAST_ofb64_encrypt(const unsigned char *in, unsigned char *out,
long length, CAST_KEY *schedule, unsigned char *ivec, long length, CAST_KEY *schedule, unsigned char *ivec,
int *num); int *num);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif #endif
dep/include/openssl/comp.h
+39 -26
View File
@@ -11,42 +11,49 @@ extern "C" {
typedef struct comp_ctx_st COMP_CTX; typedef struct comp_ctx_st COMP_CTX;
typedef struct comp_method_st typedef struct comp_method_st
{ {
int type; /* NID for compression library */ int type; /* NID for compression library */
const char *name; /* A text string to identify the library */ const char *name; /* A text string to identify the library */
int (*init)(COMP_CTX *ctx); int (*init)(COMP_CTX *ctx);
void (*finish)(COMP_CTX *ctx); void (*finish)(COMP_CTX *ctx);
int (*compress)(COMP_CTX *ctx, int (*compress)(COMP_CTX *ctx,
unsigned char *out, unsigned int olen, unsigned char *out, unsigned int olen,
unsigned char *in, unsigned int ilen); unsigned char *in, unsigned int ilen);
int (*expand)(COMP_CTX *ctx, int (*expand)(COMP_CTX *ctx,
unsigned char *out, unsigned int olen, unsigned char *out, unsigned int olen,
unsigned char *in, unsigned int ilen); unsigned char *in, unsigned int ilen);
/* The following two do NOTHING, but are kept for backward compatibility */ /* The following two do NOTHING, but are kept for backward compatibility */
long (*ctrl)(void); long (*ctrl)(void);
long (*callback_ctrl)(void); long (*callback_ctrl)(void);
} COMP_METHOD; } COMP_METHOD;
struct comp_ctx_st struct comp_ctx_st
{ {
COMP_METHOD *meth; COMP_METHOD *meth;
unsigned long compress_in; unsigned long compress_in;
unsigned long compress_out; unsigned long compress_out;
unsigned long expand_in; unsigned long expand_in;
unsigned long expand_out; unsigned long expand_out;
CRYPTO_EX_DATA ex_data; CRYPTO_EX_DATA ex_data;
}; };
COMP_CTX *COMP_CTX_new(COMP_METHOD *meth); COMP_CTX *COMP_CTX_new(COMP_METHOD *meth);
void COMP_CTX_free(COMP_CTX *ctx); void COMP_CTX_free(COMP_CTX *ctx);
int COMP_compress_block(COMP_CTX *ctx, unsigned char *out, int olen, int COMP_compress_block(COMP_CTX *ctx, unsigned char *out, int olen,
unsigned char *in, int ilen); unsigned char *in, int ilen);
int COMP_expand_block(COMP_CTX *ctx, unsigned char *out, int olen, int COMP_expand_block(COMP_CTX *ctx, unsigned char *out, int olen,
unsigned char *in, int ilen); unsigned char *in, int ilen);
COMP_METHOD *COMP_rle(void ); COMP_METHOD *COMP_rle(void );
COMP_METHOD *COMP_zlib(void ); COMP_METHOD *COMP_zlib(void );
void COMP_zlib_cleanup(void);
#ifdef HEADER_BIO_H
#ifdef ZLIB
BIO_METHOD *BIO_f_zlib(void);
#endif
#endif
/* BEGIN ERROR CODES */ /* BEGIN ERROR CODES */
/* The following lines are auto generated by the script mkerr.pl. Any changes /* The following lines are auto generated by the script mkerr.pl. Any changes
@@ -57,11 +64,17 @@ void ERR_load_COMP_strings(void);
/* Error codes for the COMP functions. */ /* Error codes for the COMP functions. */
/* Function codes. */ /* Function codes. */
#define COMP_F_BIO_ZLIB_FLUSH 99
#define COMP_F_BIO_ZLIB_NEW 100
#define COMP_F_BIO_ZLIB_READ 101
#define COMP_F_BIO_ZLIB_WRITE 102
/* Reason codes. */ /* Reason codes. */
#define COMP_R_ZLIB_DEFLATE_ERROR 99
#define COMP_R_ZLIB_INFLATE_ERROR 100
#define COMP_R_ZLIB_NOT_SUPPORTED 101
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif #endif
dep/include/openssl/conf.h
+70 -70
View File
@@ -72,11 +72,11 @@ extern "C" {
#endif #endif
typedef struct typedef struct
{ {
char *section; char *section;
char *name; char *name;
char *value; char *value;
} CONF_VALUE; } CONF_VALUE;
DECLARE_STACK_OF(CONF_VALUE) DECLARE_STACK_OF(CONF_VALUE)
DECLARE_STACK_OF(CONF_MODULE) DECLARE_STACK_OF(CONF_MODULE)
@@ -87,18 +87,18 @@ struct conf_method_st;
typedef struct conf_method_st CONF_METHOD; typedef struct conf_method_st CONF_METHOD;
struct conf_method_st struct conf_method_st
{ {
const char *name; const char *name;
CONF *(*create)(CONF_METHOD *meth); CONF *(*create)(CONF_METHOD *meth);
int (*init)(CONF *conf); int (*init)(CONF *conf);
int (*destroy)(CONF *conf); int (*destroy)(CONF *conf);
int (*destroy_data)(CONF *conf); int (*destroy_data)(CONF *conf);
int (*load_bio)(CONF *conf, BIO *bp, long *eline); int (*load_bio)(CONF *conf, BIO *bp, long *eline);
int (*dump)(const CONF *conf, BIO *bp); int (*dump)(const CONF *conf, BIO *bp);
int (*is_number)(const CONF *conf, char c); int (*is_number)(const CONF *conf, char c);
int (*to_int)(const CONF *conf, char c); int (*to_int)(const CONF *conf, char c);
int (*load)(CONF *conf, const char *name, long *eline); int (*load)(CONF *conf, const char *name, long *eline);
}; };
/* Module definitions */ /* Module definitions */
@@ -109,11 +109,12 @@ typedef struct conf_module_st CONF_MODULE;
typedef int conf_init_func(CONF_IMODULE *md, const CONF *cnf); typedef int conf_init_func(CONF_IMODULE *md, const CONF *cnf);
typedef void conf_finish_func(CONF_IMODULE *md); typedef void conf_finish_func(CONF_IMODULE *md);
#define CONF_MFLAGS_IGNORE_ERRORS 0x1 #define CONF_MFLAGS_IGNORE_ERRORS 0x1
#define CONF_MFLAGS_IGNORE_RETURN_CODES 0x2 #define CONF_MFLAGS_IGNORE_RETURN_CODES 0x2
#define CONF_MFLAGS_SILENT 0x4 #define CONF_MFLAGS_SILENT 0x4
#define CONF_MFLAGS_NO_DSO 0x8 #define CONF_MFLAGS_NO_DSO 0x8
#define CONF_MFLAGS_IGNORE_MISSING_FILE 0x10 #define CONF_MFLAGS_IGNORE_MISSING_FILE 0x10
#define CONF_MFLAGS_DEFAULT_SECTION 0x20
int CONF_set_default_method(CONF_METHOD *meth); int CONF_set_default_method(CONF_METHOD *meth);
void CONF_set_nconf(CONF *conf,LHASH *hash); void CONF_set_nconf(CONF *conf,LHASH *hash);
@@ -136,11 +137,11 @@ void OPENSSL_no_config(void);
If that wasn't the case, the above functions would have been replaced */ If that wasn't the case, the above functions would have been replaced */
struct conf_st struct conf_st
{ {
CONF_METHOD *meth; CONF_METHOD *meth;
void *meth_data; void *meth_data;
LHASH *data; LHASH *data;
}; };
CONF *NCONF_new(CONF_METHOD *meth); CONF *NCONF_new(CONF_METHOD *meth);
CONF_METHOD *NCONF_default(void); CONF_METHOD *NCONF_default(void);
@@ -159,12 +160,12 @@ int NCONF_load_bio(CONF *conf, BIO *bp,long *eline);
STACK_OF(CONF_VALUE) *NCONF_get_section(const CONF *conf,const char *section); STACK_OF(CONF_VALUE) *NCONF_get_section(const CONF *conf,const char *section);
char *NCONF_get_string(const CONF *conf,const char *group,const char *name); char *NCONF_get_string(const CONF *conf,const char *group,const char *name);
int NCONF_get_number_e(const CONF *conf,const char *group,const char *name, int NCONF_get_number_e(const CONF *conf,const char *group,const char *name,
long *result); long *result);
int NCONF_dump_fp(const CONF *conf, FILE *out); int NCONF_dump_fp(const CONF *conf, FILE *out);
int NCONF_dump_bio(const CONF *conf, BIO *out); int NCONF_dump_bio(const CONF *conf, BIO *out);
#if 0 /* The following function has no error checking, #if 0 /* The following function has no error checking,
and should therefore be avoided */ and should therefore be avoided */
long NCONF_get_number(CONF *conf,char *group,char *name); long NCONF_get_number(CONF *conf,char *group,char *name);
#else #else
#define NCONF_get_number(c,g,n,r) NCONF_get_number_e(c,g,n,r) #define NCONF_get_number(c,g,n,r) NCONF_get_number_e(c,g,n,r)
@@ -173,14 +174,14 @@ long NCONF_get_number(CONF *conf,char *group,char *name);
/* Module functions */ /* Module functions */
int CONF_modules_load(const CONF *cnf, const char *appname, int CONF_modules_load(const CONF *cnf, const char *appname,
unsigned long flags); unsigned long flags);
int CONF_modules_load_file(const char *filename, const char *appname, int CONF_modules_load_file(const char *filename, const char *appname,
unsigned long flags); unsigned long flags);
void CONF_modules_unload(int all); void CONF_modules_unload(int all);
void CONF_modules_finish(void); void CONF_modules_finish(void);
void CONF_modules_free(void); void CONF_modules_free(void);
int CONF_module_add(const char *name, conf_init_func *ifunc, int CONF_module_add(const char *name, conf_init_func *ifunc,
conf_finish_func *ffunc); conf_finish_func *ffunc);
const char *CONF_imodule_get_name(const CONF_IMODULE *md); const char *CONF_imodule_get_name(const CONF_IMODULE *md);
const char *CONF_imodule_get_value(const CONF_IMODULE *md); const char *CONF_imodule_get_value(const CONF_IMODULE *md);
@@ -195,7 +196,7 @@ void CONF_module_set_usr_data(CONF_MODULE *pmod, void *usr_data);
char *CONF_get1_default_config_file(void); char *CONF_get1_default_config_file(void);
int CONF_parse_list(const char *list, int sep, int nospc, int CONF_parse_list(const char *list, int sep, int nospc,
int (*list_cb)(const char *elem, int len, void *usr), void *arg); int (*list_cb)(const char *elem, int len, void *usr), void *arg);
void OPENSSL_load_builtin_modules(void); void OPENSSL_load_builtin_modules(void);
@@ -208,47 +209,46 @@ void ERR_load_CONF_strings(void);
/* Error codes for the CONF functions. */ /* Error codes for the CONF functions. */
/* Function codes. */ /* Function codes. */
#define CONF_F_CONF_DUMP_FP 104 #define CONF_F_CONF_DUMP_FP 104
#define CONF_F_CONF_LOAD 100 #define CONF_F_CONF_LOAD 100
#define CONF_F_CONF_LOAD_BIO 102 #define CONF_F_CONF_LOAD_BIO 102
#define CONF_F_CONF_LOAD_FP 103 #define CONF_F_CONF_LOAD_FP 103
#define CONF_F_CONF_MODULES_LOAD 116 #define CONF_F_CONF_MODULES_LOAD 116
#define CONF_F_DEF_LOAD 120 #define CONF_F_DEF_LOAD 120
#define CONF_F_DEF_LOAD_BIO 121 #define CONF_F_DEF_LOAD_BIO 121
#define CONF_F_MODULE_INIT 115 #define CONF_F_MODULE_INIT 115
#define CONF_F_MODULE_LOAD_DSO 117 #define CONF_F_MODULE_LOAD_DSO 117
#define CONF_F_MODULE_RUN 118 #define CONF_F_MODULE_RUN 118
#define CONF_F_NCONF_DUMP_BIO 105 #define CONF_F_NCONF_DUMP_BIO 105
#define CONF_F_NCONF_DUMP_FP 106 #define CONF_F_NCONF_DUMP_FP 106
#define CONF_F_NCONF_GET_NUMBER 107 #define CONF_F_NCONF_GET_NUMBER 107
#define CONF_F_NCONF_GET_NUMBER_E 112 #define CONF_F_NCONF_GET_NUMBER_E 112
#define CONF_F_NCONF_GET_SECTION 108 #define CONF_F_NCONF_GET_SECTION 108
#define CONF_F_NCONF_GET_STRING 109 #define CONF_F_NCONF_GET_STRING 109
#define CONF_F_NCONF_LOAD 113 #define CONF_F_NCONF_LOAD 113
#define CONF_F_NCONF_LOAD_BIO 110 #define CONF_F_NCONF_LOAD_BIO 110
#define CONF_F_NCONF_LOAD_FP 114 #define CONF_F_NCONF_LOAD_FP 114
#define CONF_F_NCONF_NEW 111 #define CONF_F_NCONF_NEW 111
#define CONF_F_STR_COPY 101 #define CONF_F_STR_COPY 101
/* Reason codes. */ /* Reason codes. */
#define CONF_R_ERROR_LOADING_DSO 110 #define CONF_R_ERROR_LOADING_DSO 110
#define CONF_R_MISSING_CLOSE_SQUARE_BRACKET 100 #define CONF_R_MISSING_CLOSE_SQUARE_BRACKET 100
#define CONF_R_MISSING_EQUAL_SIGN 101 #define CONF_R_MISSING_EQUAL_SIGN 101
#define CONF_R_MISSING_FINISH_FUNCTION 111 #define CONF_R_MISSING_FINISH_FUNCTION 111
#define CONF_R_MISSING_INIT_FUNCTION 112 #define CONF_R_MISSING_INIT_FUNCTION 112
#define CONF_R_MODULE_INITIALIZATION_ERROR 109 #define CONF_R_MODULE_INITIALIZATION_ERROR 109
#define CONF_R_NO_CLOSE_BRACE 102 #define CONF_R_NO_CLOSE_BRACE 102
#define CONF_R_NO_CONF 105 #define CONF_R_NO_CONF 105
#define CONF_R_NO_CONF_OR_ENVIRONMENT_VARIABLE 106 #define CONF_R_NO_CONF_OR_ENVIRONMENT_VARIABLE 106
#define CONF_R_NO_SECTION 107 #define CONF_R_NO_SECTION 107
#define CONF_R_NO_SUCH_FILE 114 #define CONF_R_NO_SUCH_FILE 114
#define CONF_R_NO_VALUE 108 #define CONF_R_NO_VALUE 108
#define CONF_R_UNABLE_TO_CREATE_NEW_SECTION 103 #define CONF_R_UNABLE_TO_CREATE_NEW_SECTION 103
#define CONF_R_UNKNOWN_MODULE_NAME 113 #define CONF_R_UNKNOWN_MODULE_NAME 113
#define CONF_R_VARIABLE_HAS_NO_VALUE 104 #define CONF_R_VARIABLE_HAS_NO_VALUE 104
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif #endif
dep/include/openssl/crypto.h
+226 -158
View File
@@ -145,106 +145,112 @@ extern "C" {
/* Backward compatibility to SSLeay */ /* Backward compatibility to SSLeay */
/* This is more to be used to check the correct DLL is being used /* This is more to be used to check the correct DLL is being used
* in the MS world. */ * in the MS world. */
#define SSLEAY_VERSION_NUMBER OPENSSL_VERSION_NUMBER #define SSLEAY_VERSION_NUMBER OPENSSL_VERSION_NUMBER
#define SSLEAY_VERSION 0 #define SSLEAY_VERSION 0
/* #define SSLEAY_OPTIONS 1 no longer supported */ /* #define SSLEAY_OPTIONS 1 no longer supported */
#define SSLEAY_CFLAGS 2 #define SSLEAY_CFLAGS 2
#define SSLEAY_BUILT_ON 3 #define SSLEAY_BUILT_ON 3
#define SSLEAY_PLATFORM 4 #define SSLEAY_PLATFORM 4
#define SSLEAY_DIR 5 #define SSLEAY_DIR 5
/* Already declared in ossl_typ.h */ /* Already declared in ossl_typ.h */
#if 0 #if 0
typedef struct crypto_ex_data_st CRYPTO_EX_DATA; typedef struct crypto_ex_data_st CRYPTO_EX_DATA;
/* Called when a new object is created */ /* Called when a new object is created */
typedef int CRYPTO_EX_new(void *parent, void *ptr, CRYPTO_EX_DATA *ad, typedef int CRYPTO_EX_new(void *parent, void *ptr, CRYPTO_EX_DATA *ad,
int idx, long argl, void *argp); int idx, long argl, void *argp);
/* Called when an object is free()ed */ /* Called when an object is free()ed */
typedef void CRYPTO_EX_free(void *parent, void *ptr, CRYPTO_EX_DATA *ad, typedef void CRYPTO_EX_free(void *parent, void *ptr, CRYPTO_EX_DATA *ad,
int idx, long argl, void *argp); int idx, long argl, void *argp);
/* Called when we need to dup an object */ /* Called when we need to dup an object */
typedef int CRYPTO_EX_dup(CRYPTO_EX_DATA *to, CRYPTO_EX_DATA *from, void *from_d, typedef int CRYPTO_EX_dup(CRYPTO_EX_DATA *to, CRYPTO_EX_DATA *from, void *from_d,
int idx, long argl, void *argp); int idx, long argl, void *argp);
#endif #endif
/* A generic structure to pass assorted data in a expandable way */ /* A generic structure to pass assorted data in a expandable way */
typedef struct openssl_item_st typedef struct openssl_item_st
{ {
int code; int code;
void *value; /* Not used for flag attributes */ void *value; /* Not used for flag attributes */
size_t value_size; /* Max size of value for output, length for input */ size_t value_size; /* Max size of value for output, length for input */
size_t *value_length; /* Returned length of value for output */ size_t *value_length; /* Returned length of value for output */
} OPENSSL_ITEM; } OPENSSL_ITEM;
/* When changing the CRYPTO_LOCK_* list, be sure to maintin the text lock /* When changing the CRYPTO_LOCK_* list, be sure to maintin the text lock
* names in cryptlib.c * names in cryptlib.c
*/ */
#define CRYPTO_LOCK_ERR 1 #define CRYPTO_LOCK_ERR 1
#define CRYPTO_LOCK_EX_DATA 2 #define CRYPTO_LOCK_EX_DATA 2
#define CRYPTO_LOCK_X509 3 #define CRYPTO_LOCK_X509 3
#define CRYPTO_LOCK_X509_INFO 4 #define CRYPTO_LOCK_X509_INFO 4
#define CRYPTO_LOCK_X509_PKEY 5 #define CRYPTO_LOCK_X509_PKEY 5
#define CRYPTO_LOCK_X509_CRL 6 #define CRYPTO_LOCK_X509_CRL 6
#define CRYPTO_LOCK_X509_REQ 7 #define CRYPTO_LOCK_X509_REQ 7
#define CRYPTO_LOCK_DSA 8 #define CRYPTO_LOCK_DSA 8
#define CRYPTO_LOCK_RSA 9 #define CRYPTO_LOCK_RSA 9
#define CRYPTO_LOCK_EVP_PKEY 10 #define CRYPTO_LOCK_EVP_PKEY 10
#define CRYPTO_LOCK_X509_STORE 11 #define CRYPTO_LOCK_X509_STORE 11
#define CRYPTO_LOCK_SSL_CTX 12 #define CRYPTO_LOCK_SSL_CTX 12
#define CRYPTO_LOCK_SSL_CERT 13 #define CRYPTO_LOCK_SSL_CERT 13
#define CRYPTO_LOCK_SSL_SESSION 14 #define CRYPTO_LOCK_SSL_SESSION 14
#define CRYPTO_LOCK_SSL_SESS_CERT 15 #define CRYPTO_LOCK_SSL_SESS_CERT 15
#define CRYPTO_LOCK_SSL 16 #define CRYPTO_LOCK_SSL 16
#define CRYPTO_LOCK_SSL_METHOD 17 #define CRYPTO_LOCK_SSL_METHOD 17
#define CRYPTO_LOCK_RAND 18 #define CRYPTO_LOCK_RAND 18
#define CRYPTO_LOCK_RAND2 19 #define CRYPTO_LOCK_RAND2 19
#define CRYPTO_LOCK_MALLOC 20 #define CRYPTO_LOCK_MALLOC 20
#define CRYPTO_LOCK_BIO 21 #define CRYPTO_LOCK_BIO 21
#define CRYPTO_LOCK_GETHOSTBYNAME 22 #define CRYPTO_LOCK_GETHOSTBYNAME 22
#define CRYPTO_LOCK_GETSERVBYNAME 23 #define CRYPTO_LOCK_GETSERVBYNAME 23
#define CRYPTO_LOCK_READDIR 24 #define CRYPTO_LOCK_READDIR 24
#define CRYPTO_LOCK_RSA_BLINDING 25 #define CRYPTO_LOCK_RSA_BLINDING 25
#define CRYPTO_LOCK_DH 26 #define CRYPTO_LOCK_DH 26
#define CRYPTO_LOCK_MALLOC2 27 #define CRYPTO_LOCK_MALLOC2 27
#define CRYPTO_LOCK_DSO 28 #define CRYPTO_LOCK_DSO 28
#define CRYPTO_LOCK_DYNLOCK 29 #define CRYPTO_LOCK_DYNLOCK 29
#define CRYPTO_LOCK_ENGINE 30 #define CRYPTO_LOCK_ENGINE 30
#define CRYPTO_LOCK_UI 31 #define CRYPTO_LOCK_UI 31
#define CRYPTO_LOCK_ECDSA 32 #define CRYPTO_LOCK_ECDSA 32
#define CRYPTO_LOCK_EC 33 #define CRYPTO_LOCK_EC 33
#define CRYPTO_LOCK_ECDH 34 #define CRYPTO_LOCK_ECDH 34
#define CRYPTO_LOCK_BN 35 #define CRYPTO_LOCK_BN 35
#define CRYPTO_LOCK_EC_PRE_COMP 36 #define CRYPTO_LOCK_EC_PRE_COMP 36
#define CRYPTO_LOCK_STORE 37 #define CRYPTO_LOCK_STORE 37
#define CRYPTO_LOCK_COMP 38 #define CRYPTO_LOCK_COMP 38
#define CRYPTO_NUM_LOCKS 39 #ifndef OPENSSL_FIPS
#define CRYPTO_NUM_LOCKS 39
#else
#define CRYPTO_LOCK_FIPS 39
#define CRYPTO_LOCK_FIPS2 40
#define CRYPTO_NUM_LOCKS 41
#endif
#define CRYPTO_LOCK 1 #define CRYPTO_LOCK 1
#define CRYPTO_UNLOCK 2 #define CRYPTO_UNLOCK 2
#define CRYPTO_READ 4 #define CRYPTO_READ 4
#define CRYPTO_WRITE 8 #define CRYPTO_WRITE 8
#ifndef OPENSSL_NO_LOCKING #ifndef OPENSSL_NO_LOCKING
#ifndef CRYPTO_w_lock #ifndef CRYPTO_w_lock
#define CRYPTO_w_lock(type) \ #define CRYPTO_w_lock(type) \
CRYPTO_lock(CRYPTO_LOCK|CRYPTO_WRITE,type,__FILE__,__LINE__) CRYPTO_lock(CRYPTO_LOCK|CRYPTO_WRITE,type,__FILE__,__LINE__)
#define CRYPTO_w_unlock(type) \ #define CRYPTO_w_unlock(type) \
CRYPTO_lock(CRYPTO_UNLOCK|CRYPTO_WRITE,type,__FILE__,__LINE__) CRYPTO_lock(CRYPTO_UNLOCK|CRYPTO_WRITE,type,__FILE__,__LINE__)
#define CRYPTO_r_lock(type) \ #define CRYPTO_r_lock(type) \
CRYPTO_lock(CRYPTO_LOCK|CRYPTO_READ,type,__FILE__,__LINE__) CRYPTO_lock(CRYPTO_LOCK|CRYPTO_READ,type,__FILE__,__LINE__)
#define CRYPTO_r_unlock(type) \ #define CRYPTO_r_unlock(type) \
CRYPTO_lock(CRYPTO_UNLOCK|CRYPTO_READ,type,__FILE__,__LINE__) CRYPTO_lock(CRYPTO_UNLOCK|CRYPTO_READ,type,__FILE__,__LINE__)
#define CRYPTO_add(addr,amount,type) \ #define CRYPTO_add(addr,amount,type) \
CRYPTO_add_lock(addr,amount,type,__FILE__,__LINE__) CRYPTO_add_lock(addr,amount,type,__FILE__,__LINE__)
#endif #endif
#else #else
#define CRYPTO_w_lock(a) #define CRYPTO_w_lock(a)
#define CRYPTO_w_unlock(a) #define CRYPTO_w_unlock(a)
#define CRYPTO_r_lock(a) #define CRYPTO_r_lock(a)
#define CRYPTO_r_unlock(a) #define CRYPTO_r_unlock(a)
#define CRYPTO_add(a,b,c) ((*(a))+=(b)) #define CRYPTO_add(a,b,c) ((*(a))+=(b))
#endif #endif
/* Some applications as well as some parts of OpenSSL need to allocate /* Some applications as well as some parts of OpenSSL need to allocate
@@ -252,27 +258,27 @@ typedef struct openssl_item_st
makes this possible in a type-safe manner. */ makes this possible in a type-safe manner. */
/* struct CRYPTO_dynlock_value has to be defined by the application. */ /* struct CRYPTO_dynlock_value has to be defined by the application. */
typedef struct typedef struct
{ {
int references; int references;
struct CRYPTO_dynlock_value *data; struct CRYPTO_dynlock_value *data;
} CRYPTO_dynlock; } CRYPTO_dynlock;
/* The following can be used to detect memory leaks in the SSLeay library. /* The following can be used to detect memory leaks in the SSLeay library.
* It used, it turns on malloc checking */ * It used, it turns on malloc checking */
#define CRYPTO_MEM_CHECK_OFF 0x0 /* an enume */ #define CRYPTO_MEM_CHECK_OFF 0x0 /* an enume */
#define CRYPTO_MEM_CHECK_ON 0x1 /* a bit */ #define CRYPTO_MEM_CHECK_ON 0x1 /* a bit */
#define CRYPTO_MEM_CHECK_ENABLE 0x2 /* a bit */ #define CRYPTO_MEM_CHECK_ENABLE 0x2 /* a bit */
#define CRYPTO_MEM_CHECK_DISABLE 0x3 /* an enume */ #define CRYPTO_MEM_CHECK_DISABLE 0x3 /* an enume */
/* The following are bit values to turn on or off options connected to the /* The following are bit values to turn on or off options connected to the
* malloc checking functionality */ * malloc checking functionality */
/* Adds time to the memory checking information */ /* Adds time to the memory checking information */
#define V_CRYPTO_MDEBUG_TIME 0x1 /* a bit */ #define V_CRYPTO_MDEBUG_TIME 0x1 /* a bit */
/* Adds thread number to the memory checking information */ /* Adds thread number to the memory checking information */
#define V_CRYPTO_MDEBUG_THREAD 0x2 /* a bit */ #define V_CRYPTO_MDEBUG_THREAD 0x2 /* a bit */
#define V_CRYPTO_MDEBUG_ALL (V_CRYPTO_MDEBUG_TIME | V_CRYPTO_MDEBUG_THREAD) #define V_CRYPTO_MDEBUG_ALL (V_CRYPTO_MDEBUG_TIME | V_CRYPTO_MDEBUG_THREAD)
@@ -281,22 +287,22 @@ typedef struct
typedef struct bio_st BIO_dummy; typedef struct bio_st BIO_dummy;
struct crypto_ex_data_st struct crypto_ex_data_st
{ {
STACK *sk; STACK *sk;
int dummy; /* gcc is screwing up this data structure :-( */ int dummy; /* gcc is screwing up this data structure :-( */
}; };
/* This stuff is basically class callback functions /* This stuff is basically class callback functions
* The current classes are SSL_CTX, SSL, SSL_SESSION, and a few more */ * The current classes are SSL_CTX, SSL, SSL_SESSION, and a few more */
typedef struct crypto_ex_data_func_st typedef struct crypto_ex_data_func_st
{ {
long argl; /* Arbitary long */ long argl; /* Arbitary long */
void *argp; /* Arbitary void * */ void *argp; /* Arbitary void * */
CRYPTO_EX_new *new_func; CRYPTO_EX_new *new_func;
CRYPTO_EX_free *free_func; CRYPTO_EX_free *free_func;
CRYPTO_EX_dup *dup_func; CRYPTO_EX_dup *dup_func;
} CRYPTO_EX_DATA_FUNCS; } CRYPTO_EX_DATA_FUNCS;
DECLARE_STACK_OF(CRYPTO_EX_DATA_FUNCS) DECLARE_STACK_OF(CRYPTO_EX_DATA_FUNCS)
@@ -304,34 +310,34 @@ DECLARE_STACK_OF(CRYPTO_EX_DATA_FUNCS)
* entry. * entry.
*/ */
#define CRYPTO_EX_INDEX_BIO 0 #define CRYPTO_EX_INDEX_BIO 0
#define CRYPTO_EX_INDEX_SSL 1 #define CRYPTO_EX_INDEX_SSL 1
#define CRYPTO_EX_INDEX_SSL_CTX 2 #define CRYPTO_EX_INDEX_SSL_CTX 2
#define CRYPTO_EX_INDEX_SSL_SESSION 3 #define CRYPTO_EX_INDEX_SSL_SESSION 3
#define CRYPTO_EX_INDEX_X509_STORE 4 #define CRYPTO_EX_INDEX_X509_STORE 4
#define CRYPTO_EX_INDEX_X509_STORE_CTX 5 #define CRYPTO_EX_INDEX_X509_STORE_CTX 5
#define CRYPTO_EX_INDEX_RSA 6 #define CRYPTO_EX_INDEX_RSA 6
#define CRYPTO_EX_INDEX_DSA 7 #define CRYPTO_EX_INDEX_DSA 7
#define CRYPTO_EX_INDEX_DH 8 #define CRYPTO_EX_INDEX_DH 8
#define CRYPTO_EX_INDEX_ENGINE 9 #define CRYPTO_EX_INDEX_ENGINE 9
#define CRYPTO_EX_INDEX_X509 10 #define CRYPTO_EX_INDEX_X509 10
#define CRYPTO_EX_INDEX_UI 11 #define CRYPTO_EX_INDEX_UI 11
#define CRYPTO_EX_INDEX_ECDSA 12 #define CRYPTO_EX_INDEX_ECDSA 12
#define CRYPTO_EX_INDEX_ECDH 13 #define CRYPTO_EX_INDEX_ECDH 13
#define CRYPTO_EX_INDEX_COMP 14 #define CRYPTO_EX_INDEX_COMP 14
#define CRYPTO_EX_INDEX_STORE 15 #define CRYPTO_EX_INDEX_STORE 15
/* Dynamically assigned indexes start from this value (don't use directly, use /* Dynamically assigned indexes start from this value (don't use directly, use
* via CRYPTO_ex_data_new_class). */ * via CRYPTO_ex_data_new_class). */
#define CRYPTO_EX_INDEX_USER 100 #define CRYPTO_EX_INDEX_USER 100
/* This is the default callbacks, but we can have others as well: /* This is the default callbacks, but we can have others as well:
* this is needed in Win32 where the application malloc and the * this is needed in Win32 where the application malloc and the
* library malloc may not be the same. * library malloc may not be the same.
*/ */
#define CRYPTO_malloc_init() CRYPTO_set_mem_functions(\ #define CRYPTO_malloc_init() CRYPTO_set_mem_functions(\
malloc, realloc, free) malloc, realloc, free)
#if defined CRYPTO_MDEBUG_ALL || defined CRYPTO_MDEBUG_TIME || defined CRYPTO_MDEBUG_THREAD #if defined CRYPTO_MDEBUG_ALL || defined CRYPTO_MDEBUG_TIME || defined CRYPTO_MDEBUG_THREAD
# ifndef CRYPTO_MDEBUG /* avoid duplicate #define */ # ifndef CRYPTO_MDEBUG /* avoid duplicate #define */
@@ -341,39 +347,33 @@ DECLARE_STACK_OF(CRYPTO_EX_DATA_FUNCS)
/* Set standard debugging functions (not done by default /* Set standard debugging functions (not done by default
* unless CRYPTO_MDEBUG is defined) */ * unless CRYPTO_MDEBUG is defined) */
#define CRYPTO_malloc_debug_init() do {\ void CRYPTO_malloc_debug_init(void);
CRYPTO_set_mem_debug_functions(\
CRYPTO_dbg_malloc,\
CRYPTO_dbg_realloc,\
CRYPTO_dbg_free,\
CRYPTO_dbg_set_options,\
CRYPTO_dbg_get_options);\
} while(0)
int CRYPTO_mem_ctrl(int mode); int CRYPTO_mem_ctrl(int mode);
int CRYPTO_is_mem_check_on(void); int CRYPTO_is_mem_check_on(void);
/* for applications */ /* for applications */
#define MemCheck_start() CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON) #define MemCheck_start() CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON)
#define MemCheck_stop() CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_OFF) #define MemCheck_stop() CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_OFF)
/* for library-internal use */ /* for library-internal use */
#define MemCheck_on() CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ENABLE) #define MemCheck_on() CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ENABLE)
#define MemCheck_off() CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_DISABLE) #define MemCheck_off() CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_DISABLE)
#define is_MemCheck_on() CRYPTO_is_mem_check_on() #define is_MemCheck_on() CRYPTO_is_mem_check_on()
#define OPENSSL_malloc(num) CRYPTO_malloc((int)num,__FILE__,__LINE__) #define OPENSSL_malloc(num) CRYPTO_malloc((int)num,__FILE__,__LINE__)
#define OPENSSL_strdup(str) CRYPTO_strdup((str),__FILE__,__LINE__)
#define OPENSSL_realloc(addr,num) \ #define OPENSSL_realloc(addr,num) \
CRYPTO_realloc((char *)addr,(int)num,__FILE__,__LINE__) CRYPTO_realloc((char *)addr,(int)num,__FILE__,__LINE__)
#define OPENSSL_realloc_clean(addr,old_num,num) \ #define OPENSSL_realloc_clean(addr,old_num,num) \
CRYPTO_realloc_clean(addr,old_num,num,__FILE__,__LINE__) CRYPTO_realloc_clean(addr,old_num,num,__FILE__,__LINE__)
#define OPENSSL_remalloc(addr,num) \ #define OPENSSL_remalloc(addr,num) \
CRYPTO_remalloc((char **)addr,(int)num,__FILE__,__LINE__) CRYPTO_remalloc((char **)addr,(int)num,__FILE__,__LINE__)
#define OPENSSL_freeFunc CRYPTO_free #define OPENSSL_freeFunc CRYPTO_free
#define OPENSSL_free(addr) CRYPTO_free(addr) #define OPENSSL_free(addr) CRYPTO_free(addr)
#define OPENSSL_malloc_locked(num) \ #define OPENSSL_malloc_locked(num) \
CRYPTO_malloc_locked((int)num,__FILE__,__LINE__) CRYPTO_malloc_locked((int)num,__FILE__,__LINE__)
#define OPENSSL_free_locked(addr) CRYPTO_free_locked(addr) #define OPENSSL_free_locked(addr) CRYPTO_free_locked(addr)
@@ -383,7 +383,7 @@ unsigned long SSLeay(void);
int OPENSSL_issetugid(void); int OPENSSL_issetugid(void);
/* An opaque type representing an implementation of "ex_data" support */ /* An opaque type representing an implementation of "ex_data" support */
typedef struct st_CRYPTO_EX_DATA_IMPL CRYPTO_EX_DATA_IMPL; typedef struct st_CRYPTO_EX_DATA_IMPL CRYPTO_EX_DATA_IMPL;
/* Return an opaque pointer to the current "ex_data" implementation */ /* Return an opaque pointer to the current "ex_data" implementation */
const CRYPTO_EX_DATA_IMPL *CRYPTO_get_ex_data_implementation(void); const CRYPTO_EX_DATA_IMPL *CRYPTO_get_ex_data_implementation(void);
/* Sets the "ex_data" implementation to be used (if it's not too late) */ /* Sets the "ex_data" implementation to be used (if it's not too late) */
@@ -392,13 +392,13 @@ int CRYPTO_set_ex_data_implementation(const CRYPTO_EX_DATA_IMPL *i);
int CRYPTO_ex_data_new_class(void); int CRYPTO_ex_data_new_class(void);
/* Within a given class, get/register a new index */ /* Within a given class, get/register a new index */
int CRYPTO_get_ex_new_index(int class_index, long argl, void *argp, int CRYPTO_get_ex_new_index(int class_index, long argl, void *argp,
CRYPTO_EX_new *new_func, CRYPTO_EX_dup *dup_func, CRYPTO_EX_new *new_func, CRYPTO_EX_dup *dup_func,
CRYPTO_EX_free *free_func); CRYPTO_EX_free *free_func);
/* Initialise/duplicate/free CRYPTO_EX_DATA variables corresponding to a given /* Initialise/duplicate/free CRYPTO_EX_DATA variables corresponding to a given
* class (invokes whatever per-class callbacks are applicable) */ * class (invokes whatever per-class callbacks are applicable) */
int CRYPTO_new_ex_data(int class_index, void *obj, CRYPTO_EX_DATA *ad); int CRYPTO_new_ex_data(int class_index, void *obj, CRYPTO_EX_DATA *ad);
int CRYPTO_dup_ex_data(int class_index, CRYPTO_EX_DATA *to, int CRYPTO_dup_ex_data(int class_index, CRYPTO_EX_DATA *to,
CRYPTO_EX_DATA *from); CRYPTO_EX_DATA *from);
void CRYPTO_free_ex_data(int class_index, void *obj, CRYPTO_EX_DATA *ad); void CRYPTO_free_ex_data(int class_index, void *obj, CRYPTO_EX_DATA *ad);
/* Get/set data in a CRYPTO_EX_DATA variable corresponding to a particular index /* Get/set data in a CRYPTO_EX_DATA variable corresponding to a particular index
* (relative to the class type involved) */ * (relative to the class type involved) */
@@ -413,19 +413,22 @@ int CRYPTO_get_new_lockid(char *name);
int CRYPTO_num_locks(void); /* return CRYPTO_NUM_LOCKS (shared libs!) */ int CRYPTO_num_locks(void); /* return CRYPTO_NUM_LOCKS (shared libs!) */
void CRYPTO_lock(int mode, int type,const char *file,int line); void CRYPTO_lock(int mode, int type,const char *file,int line);
void CRYPTO_set_locking_callback(void (*func)(int mode,int type, void CRYPTO_set_locking_callback(void (*func)(int mode,int type,
const char *file,int line)); const char *file,int line));
void (*CRYPTO_get_locking_callback(void))(int mode,int type,const char *file, void (*CRYPTO_get_locking_callback(void))(int mode,int type,const char *file,
int line); int line);
void CRYPTO_set_add_lock_callback(int (*func)(int *num,int mount,int type, void CRYPTO_set_add_lock_callback(int (*func)(int *num,int mount,int type,
const char *file, int line)); const char *file, int line));
int (*CRYPTO_get_add_lock_callback(void))(int *num,int mount,int type, int (*CRYPTO_get_add_lock_callback(void))(int *num,int mount,int type,
const char *file,int line); const char *file,int line);
void CRYPTO_set_id_callback(unsigned long (*func)(void)); void CRYPTO_set_id_callback(unsigned long (*func)(void));
unsigned long (*CRYPTO_get_id_callback(void))(void); unsigned long (*CRYPTO_get_id_callback(void))(void);
unsigned long CRYPTO_thread_id(void); unsigned long CRYPTO_thread_id(void);
const char *CRYPTO_get_lock_name(int type); const char *CRYPTO_get_lock_name(int type);
int CRYPTO_add_lock(int *pointer,int amount,int type, const char *file, int CRYPTO_add_lock(int *pointer,int amount,int type, const char *file,
int line); int line);
void int_CRYPTO_set_do_dynlock_callback(
void (*do_dynlock_cb)(int mode, int type, const char *file, int line));
int CRYPTO_get_new_dynlockid(void); int CRYPTO_get_new_dynlockid(void);
void CRYPTO_destroy_dynlockid(int i); void CRYPTO_destroy_dynlockid(int i);
@@ -447,10 +450,14 @@ int CRYPTO_set_mem_ex_functions(void *(*m)(size_t,const char *,int),
int CRYPTO_set_locked_mem_ex_functions(void *(*m)(size_t,const char *,int), int CRYPTO_set_locked_mem_ex_functions(void *(*m)(size_t,const char *,int),
void (*free_func)(void *)); void (*free_func)(void *));
int CRYPTO_set_mem_debug_functions(void (*m)(void *,int,const char *,int,int), int CRYPTO_set_mem_debug_functions(void (*m)(void *,int,const char *,int,int),
void (*r)(void *,void *,int,const char *,int,int), void (*r)(void *,void *,int,const char *,int,int),
void (*f)(void *,int), void (*f)(void *,int),
void (*so)(long), void (*so)(long),
long (*go)(void)); long (*go)(void));
void CRYPTO_set_mem_info_functions(
int (*push_info_fn)(const char *info, const char *file, int line),
int (*pop_info_fn)(void),
int (*remove_all_info_fn)(void));
void CRYPTO_get_mem_functions(void *(**m)(size_t),void *(**r)(void *, size_t), void (**f)(void *)); void CRYPTO_get_mem_functions(void *(**m)(size_t),void *(**r)(void *, size_t), void (**f)(void *));
void CRYPTO_get_locked_mem_functions(void *(**m)(size_t), void (**f)(void *)); void CRYPTO_get_locked_mem_functions(void *(**m)(size_t), void (**f)(void *));
void CRYPTO_get_mem_ex_functions(void *(**m)(size_t,const char *,int), void CRYPTO_get_mem_ex_functions(void *(**m)(size_t,const char *,int),
@@ -459,18 +466,19 @@ void CRYPTO_get_mem_ex_functions(void *(**m)(size_t,const char *,int),
void CRYPTO_get_locked_mem_ex_functions(void *(**m)(size_t,const char *,int), void CRYPTO_get_locked_mem_ex_functions(void *(**m)(size_t,const char *,int),
void (**f)(void *)); void (**f)(void *));
void CRYPTO_get_mem_debug_functions(void (**m)(void *,int,const char *,int,int), void CRYPTO_get_mem_debug_functions(void (**m)(void *,int,const char *,int,int),
void (**r)(void *,void *,int,const char *,int,int), void (**r)(void *,void *,int,const char *,int,int),
void (**f)(void *,int), void (**f)(void *,int),
void (**so)(long), void (**so)(long),
long (**go)(void)); long (**go)(void));
void *CRYPTO_malloc_locked(int num, const char *file, int line); void *CRYPTO_malloc_locked(int num, const char *file, int line);
void CRYPTO_free_locked(void *); void CRYPTO_free_locked(void *);
void *CRYPTO_malloc(int num, const char *file, int line); void *CRYPTO_malloc(int num, const char *file, int line);
char *CRYPTO_strdup(const char *str, const char *file, int line);
void CRYPTO_free(void *); void CRYPTO_free(void *);
void *CRYPTO_realloc(void *addr,int num, const char *file, int line); void *CRYPTO_realloc(void *addr,int num, const char *file, int line);
void *CRYPTO_realloc_clean(void *addr,int old_num,int num,const char *file, void *CRYPTO_realloc_clean(void *addr,int old_num,int num,const char *file,
int line); int line);
void *CRYPTO_remalloc(void *addr,int num, const char *file, int line); void *CRYPTO_remalloc(void *addr,int num, const char *file, int line);
void OPENSSL_cleanse(void *ptr, size_t len); void OPENSSL_cleanse(void *ptr, size_t len);
@@ -489,8 +497,8 @@ int CRYPTO_remove_all_info(void);
* used as default in CRYPTO_MDEBUG compilations): */ * used as default in CRYPTO_MDEBUG compilations): */
/* The last argument has the following significance: /* The last argument has the following significance:
* *
* 0: called before the actual memory allocation has taken place * 0: called before the actual memory allocation has taken place
* 1: called after the actual memory allocation has taken place * 1: called after the actual memory allocation has taken place
*/ */
void CRYPTO_dbg_malloc(void *addr,int num,const char *file,int line,int before_p); void CRYPTO_dbg_malloc(void *addr,int num,const char *file,int line,int before_p);
void CRYPTO_dbg_realloc(void *addr1,void *addr2,int num,const char *file,int line,int before_p); void CRYPTO_dbg_realloc(void *addr1,void *addr2,int num,const char *file,int line,int before_p);
@@ -506,6 +514,9 @@ void CRYPTO_dbg_free(void *addr,int before_p);
void CRYPTO_dbg_set_options(long bits); void CRYPTO_dbg_set_options(long bits);
long CRYPTO_dbg_get_options(void); long CRYPTO_dbg_get_options(void);
int CRYPTO_dbg_push_info(const char *info, const char *file, int line);
int CRYPTO_dbg_pop_info(void);
int CRYPTO_dbg_remove_all_info(void);
#ifndef OPENSSL_NO_FP_API #ifndef OPENSSL_NO_FP_API
void CRYPTO_mem_leaks_fp(FILE *); void CRYPTO_mem_leaks_fp(FILE *);
@@ -521,6 +532,61 @@ void OpenSSLDie(const char *file,int line,const char *assertion);
unsigned long *OPENSSL_ia32cap_loc(void); unsigned long *OPENSSL_ia32cap_loc(void);
#define OPENSSL_ia32cap (*(OPENSSL_ia32cap_loc())) #define OPENSSL_ia32cap (*(OPENSSL_ia32cap_loc()))
int OPENSSL_isservice(void);
#ifdef OPENSSL_FIPS
#define FIPS_ERROR_IGNORED(alg) OpenSSLDie(__FILE__, __LINE__, \
alg " previous FIPS forbidden algorithm error ignored");
#define FIPS_BAD_ABORT(alg) OpenSSLDie(__FILE__, __LINE__, \
#alg " Algorithm forbidden in FIPS mode");
#ifdef OPENSSL_FIPS_STRICT
#define FIPS_BAD_ALGORITHM(alg) FIPS_BAD_ABORT(alg)
#else
#define FIPS_BAD_ALGORITHM(alg) \
{ \
FIPSerr(FIPS_F_HASH_FINAL,FIPS_R_NON_FIPS_METHOD); \
ERR_add_error_data(2, "Algorithm=", #alg); \
return 0; \
}
#endif
/* Low level digest API blocking macro */
#define FIPS_NON_FIPS_MD_Init(alg) \
int alg##_Init(alg##_CTX *c) \
{ \
if (FIPS_mode()) \
FIPS_BAD_ALGORITHM(alg) \
return private_##alg##_Init(c); \
} \
int private_##alg##_Init(alg##_CTX *c)
/* For ciphers the API often varies from cipher to cipher and each needs to
* be treated as a special case. Variable key length ciphers (Blowfish, RC4,
* CAST) however are very similar and can use a blocking macro.
*/
#define FIPS_NON_FIPS_VCIPHER_Init(alg) \
void alg##_set_key(alg##_KEY *key, int len, const unsigned char *data) \
{ \
if (FIPS_mode()) \
FIPS_BAD_ABORT(alg) \
private_##alg##_set_key(key, len, data); \
} \
void private_##alg##_set_key(alg##_KEY *key, int len, \
const unsigned char *data)
#else
#define FIPS_NON_FIPS_VCIPHER_Init(alg) \
void alg##_set_key(alg##_KEY *key, int len, const unsigned char *data)
#define FIPS_NON_FIPS_MD_Init(alg) \
int alg##_Init(alg##_CTX *c)
#endif /* def OPENSSL_FIPS */
/* BEGIN ERROR CODES */ /* BEGIN ERROR CODES */
/* The following lines are auto generated by the script mkerr.pl. Any changes /* The following lines are auto generated by the script mkerr.pl. Any changes
@@ -528,24 +594,26 @@ unsigned long *OPENSSL_ia32cap_loc(void);
*/ */
void ERR_load_CRYPTO_strings(void); void ERR_load_CRYPTO_strings(void);
#define OPENSSL_HAVE_INIT 1
void OPENSSL_init(void);
/* Error codes for the CRYPTO functions. */ /* Error codes for the CRYPTO functions. */
/* Function codes. */ /* Function codes. */
#define CRYPTO_F_CRYPTO_GET_EX_NEW_INDEX 100 #define CRYPTO_F_CRYPTO_GET_EX_NEW_INDEX 100
#define CRYPTO_F_CRYPTO_GET_NEW_DYNLOCKID 103 #define CRYPTO_F_CRYPTO_GET_NEW_DYNLOCKID 103
#define CRYPTO_F_CRYPTO_GET_NEW_LOCKID 101 #define CRYPTO_F_CRYPTO_GET_NEW_LOCKID 101
#define CRYPTO_F_CRYPTO_SET_EX_DATA 102 #define CRYPTO_F_CRYPTO_SET_EX_DATA 102
#define CRYPTO_F_DEF_ADD_INDEX 104 #define CRYPTO_F_DEF_ADD_INDEX 104
#define CRYPTO_F_DEF_GET_CLASS 105 #define CRYPTO_F_DEF_GET_CLASS 105
#define CRYPTO_F_INT_DUP_EX_DATA 106 #define CRYPTO_F_INT_DUP_EX_DATA 106
#define CRYPTO_F_INT_FREE_EX_DATA 107 #define CRYPTO_F_INT_FREE_EX_DATA 107
#define CRYPTO_F_INT_NEW_EX_DATA 108 #define CRYPTO_F_INT_NEW_EX_DATA 108
/* Reason codes. */ /* Reason codes. */
#define CRYPTO_R_NO_DYNLOCK_CREATE_CALLBACK 100 #define CRYPTO_R_NO_DYNLOCK_CREATE_CALLBACK 100
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif #endif
dep/include/openssl/des.h
+79 -79
View File
@@ -59,8 +59,8 @@
#ifndef HEADER_NEW_DES_H #ifndef HEADER_NEW_DES_H
#define HEADER_NEW_DES_H #define HEADER_NEW_DES_H
#include <openssl/e_os2.h> /* OPENSSL_EXTERN, OPENSSL_NO_DES, #include <openssl/e_os2.h> /* OPENSSL_EXTERN, OPENSSL_NO_DES,
DES_LONG (via openssl/opensslconf.h */ DES_LONG (via openssl/opensslconf.h */
#ifdef OPENSSL_NO_DES #ifdef OPENSSL_NO_DES
#error DES is disabled. #error DES is disabled.
@@ -83,12 +83,12 @@ typedef /* const */ unsigned char const_DES_cblock[8];
typedef struct DES_ks typedef struct DES_ks
{ {
union union
{ {
DES_cblock cblock; DES_cblock cblock;
/* make sure things are correct size on machines with /* make sure things are correct size on machines with
* 8 byte longs */ * 8 byte longs */
DES_LONG deslong[2]; DES_LONG deslong[2];
} ks[16]; } ks[16];
} DES_key_schedule; } DES_key_schedule;
#ifndef OPENSSL_DISABLE_OLD_DES_SUPPORT #ifndef OPENSSL_DISABLE_OLD_DES_SUPPORT
@@ -101,117 +101,118 @@ typedef struct DES_ks
# include <openssl/des_old.h> # include <openssl/des_old.h>
#endif #endif
#define DES_KEY_SZ (sizeof(DES_cblock)) #define DES_KEY_SZ (sizeof(DES_cblock))
#define DES_SCHEDULE_SZ (sizeof(DES_key_schedule)) #define DES_SCHEDULE_SZ (sizeof(DES_key_schedule))
#define DES_ENCRYPT 1 #define DES_ENCRYPT 1
#define DES_DECRYPT 0 #define DES_DECRYPT 0
#define DES_CBC_MODE 0 #define DES_CBC_MODE 0
#define DES_PCBC_MODE 1 #define DES_PCBC_MODE 1
#define DES_ecb2_encrypt(i,o,k1,k2,e) \ #define DES_ecb2_encrypt(i,o,k1,k2,e) \
DES_ecb3_encrypt((i),(o),(k1),(k2),(k1),(e)) DES_ecb3_encrypt((i),(o),(k1),(k2),(k1),(e))
#define DES_ede2_cbc_encrypt(i,o,l,k1,k2,iv,e) \ #define DES_ede2_cbc_encrypt(i,o,l,k1,k2,iv,e) \
DES_ede3_cbc_encrypt((i),(o),(l),(k1),(k2),(k1),(iv),(e)) DES_ede3_cbc_encrypt((i),(o),(l),(k1),(k2),(k1),(iv),(e))
#define DES_ede2_cfb64_encrypt(i,o,l,k1,k2,iv,n,e) \ #define DES_ede2_cfb64_encrypt(i,o,l,k1,k2,iv,n,e) \
DES_ede3_cfb64_encrypt((i),(o),(l),(k1),(k2),(k1),(iv),(n),(e)) DES_ede3_cfb64_encrypt((i),(o),(l),(k1),(k2),(k1),(iv),(n),(e))
#define DES_ede2_ofb64_encrypt(i,o,l,k1,k2,iv,n) \ #define DES_ede2_ofb64_encrypt(i,o,l,k1,k2,iv,n) \
DES_ede3_ofb64_encrypt((i),(o),(l),(k1),(k2),(k1),(iv),(n)) DES_ede3_ofb64_encrypt((i),(o),(l),(k1),(k2),(k1),(iv),(n))
OPENSSL_DECLARE_GLOBAL(int,DES_check_key); /* defaults to false */ OPENSSL_DECLARE_GLOBAL(int,DES_check_key); /* defaults to false */
#define DES_check_key OPENSSL_GLOBAL_REF(DES_check_key) #define DES_check_key OPENSSL_GLOBAL_REF(DES_check_key)
OPENSSL_DECLARE_GLOBAL(int,DES_rw_mode); /* defaults to DES_PCBC_MODE */ OPENSSL_DECLARE_GLOBAL(int,DES_rw_mode); /* defaults to DES_PCBC_MODE */
#define DES_rw_mode OPENSSL_GLOBAL_REF(DES_rw_mode) #define DES_rw_mode OPENSSL_GLOBAL_REF(DES_rw_mode)
const char *DES_options(void); const char *DES_options(void);
void DES_ecb3_encrypt(const_DES_cblock *input, DES_cblock *output, void DES_ecb3_encrypt(const_DES_cblock *input, DES_cblock *output,
DES_key_schedule *ks1,DES_key_schedule *ks2, DES_key_schedule *ks1,DES_key_schedule *ks2,
DES_key_schedule *ks3, int enc); DES_key_schedule *ks3, int enc);
DES_LONG DES_cbc_cksum(const unsigned char *input,DES_cblock *output, DES_LONG DES_cbc_cksum(const unsigned char *input,DES_cblock *output,
long length,DES_key_schedule *schedule, long length,DES_key_schedule *schedule,
const_DES_cblock *ivec); const_DES_cblock *ivec);
/* DES_cbc_encrypt does not update the IV! Use DES_ncbc_encrypt instead. */ /* DES_cbc_encrypt does not update the IV! Use DES_ncbc_encrypt instead. */
void DES_cbc_encrypt(const unsigned char *input,unsigned char *output, void DES_cbc_encrypt(const unsigned char *input,unsigned char *output,
long length,DES_key_schedule *schedule,DES_cblock *ivec, long length,DES_key_schedule *schedule,DES_cblock *ivec,
int enc); int enc);
void DES_ncbc_encrypt(const unsigned char *input,unsigned char *output, void DES_ncbc_encrypt(const unsigned char *input,unsigned char *output,
long length,DES_key_schedule *schedule,DES_cblock *ivec, long length,DES_key_schedule *schedule,DES_cblock *ivec,
int enc); int enc);
void DES_xcbc_encrypt(const unsigned char *input,unsigned char *output, void DES_xcbc_encrypt(const unsigned char *input,unsigned char *output,
long length,DES_key_schedule *schedule,DES_cblock *ivec, long length,DES_key_schedule *schedule,DES_cblock *ivec,
const_DES_cblock *inw,const_DES_cblock *outw,int enc); const_DES_cblock *inw,const_DES_cblock *outw,int enc);
void DES_cfb_encrypt(const unsigned char *in,unsigned char *out,int numbits, void DES_cfb_encrypt(const unsigned char *in,unsigned char *out,int numbits,
long length,DES_key_schedule *schedule,DES_cblock *ivec, long length,DES_key_schedule *schedule,DES_cblock *ivec,
int enc); int enc);
void DES_ecb_encrypt(const_DES_cblock *input,DES_cblock *output, void DES_ecb_encrypt(const_DES_cblock *input,DES_cblock *output,
DES_key_schedule *ks,int enc); DES_key_schedule *ks,int enc);
/* This is the DES encryption function that gets called by just about /* This is the DES encryption function that gets called by just about
every other DES routine in the library. You should not use this every other DES routine in the library. You should not use this
function except to implement 'modes' of DES. I say this because the function except to implement 'modes' of DES. I say this because the
functions that call this routine do the conversion from 'char *' to functions that call this routine do the conversion from 'char *' to
long, and this needs to be done to make sure 'non-aligned' memory long, and this needs to be done to make sure 'non-aligned' memory
access do not occur. The characters are loaded 'little endian'. access do not occur. The characters are loaded 'little endian'.
Data is a pointer to 2 unsigned long's and ks is the Data is a pointer to 2 unsigned long's and ks is the
DES_key_schedule to use. enc, is non zero specifies encryption, DES_key_schedule to use. enc, is non zero specifies encryption,
zero if decryption. */ zero if decryption. */
void DES_encrypt1(DES_LONG *data,DES_key_schedule *ks, int enc); void DES_encrypt1(DES_LONG *data,DES_key_schedule *ks, int enc);
/* This functions is the same as DES_encrypt1() except that the DES /* This functions is the same as DES_encrypt1() except that the DES
initial permutation (IP) and final permutation (FP) have been left initial permutation (IP) and final permutation (FP) have been left
out. As for DES_encrypt1(), you should not use this function. out. As for DES_encrypt1(), you should not use this function.
It is used by the routines in the library that implement triple DES. It is used by the routines in the library that implement triple DES.
IP() DES_encrypt2() DES_encrypt2() DES_encrypt2() FP() is the same IP() DES_encrypt2() DES_encrypt2() DES_encrypt2() FP() is the same
as DES_encrypt1() DES_encrypt1() DES_encrypt1() except faster :-). */ as DES_encrypt1() DES_encrypt1() DES_encrypt1() except faster :-). */
void DES_encrypt2(DES_LONG *data,DES_key_schedule *ks, int enc); void DES_encrypt2(DES_LONG *data,DES_key_schedule *ks, int enc);
void DES_encrypt3(DES_LONG *data, DES_key_schedule *ks1, void DES_encrypt3(DES_LONG *data, DES_key_schedule *ks1,
DES_key_schedule *ks2, DES_key_schedule *ks3); DES_key_schedule *ks2, DES_key_schedule *ks3);
void DES_decrypt3(DES_LONG *data, DES_key_schedule *ks1, void DES_decrypt3(DES_LONG *data, DES_key_schedule *ks1,
DES_key_schedule *ks2, DES_key_schedule *ks3); DES_key_schedule *ks2, DES_key_schedule *ks3);
void DES_ede3_cbc_encrypt(const unsigned char *input,unsigned char *output, void DES_ede3_cbc_encrypt(const unsigned char *input,unsigned char *output,
long length, long length,
DES_key_schedule *ks1,DES_key_schedule *ks2, DES_key_schedule *ks1,DES_key_schedule *ks2,
DES_key_schedule *ks3,DES_cblock *ivec,int enc); DES_key_schedule *ks3,DES_cblock *ivec,int enc);
void DES_ede3_cbcm_encrypt(const unsigned char *in,unsigned char *out, void DES_ede3_cbcm_encrypt(const unsigned char *in,unsigned char *out,
long length, long length,
DES_key_schedule *ks1,DES_key_schedule *ks2, DES_key_schedule *ks1,DES_key_schedule *ks2,
DES_key_schedule *ks3, DES_key_schedule *ks3,
DES_cblock *ivec1,DES_cblock *ivec2, DES_cblock *ivec1,DES_cblock *ivec2,
int enc); int enc);
void DES_ede3_cfb64_encrypt(const unsigned char *in,unsigned char *out, void DES_ede3_cfb64_encrypt(const unsigned char *in,unsigned char *out,
long length,DES_key_schedule *ks1, long length,DES_key_schedule *ks1,
DES_key_schedule *ks2,DES_key_schedule *ks3, DES_key_schedule *ks2,DES_key_schedule *ks3,
DES_cblock *ivec,int *num,int enc); DES_cblock *ivec,int *num,int enc);
void DES_ede3_cfb_encrypt(const unsigned char *in,unsigned char *out, void DES_ede3_cfb_encrypt(const unsigned char *in,unsigned char *out,
int numbits,long length,DES_key_schedule *ks1, int numbits,long length,DES_key_schedule *ks1,
DES_key_schedule *ks2,DES_key_schedule *ks3, DES_key_schedule *ks2,DES_key_schedule *ks3,
DES_cblock *ivec,int enc); DES_cblock *ivec,int enc);
void DES_ede3_ofb64_encrypt(const unsigned char *in,unsigned char *out, void DES_ede3_ofb64_encrypt(const unsigned char *in,unsigned char *out,
long length,DES_key_schedule *ks1, long length,DES_key_schedule *ks1,
DES_key_schedule *ks2,DES_key_schedule *ks3, DES_key_schedule *ks2,DES_key_schedule *ks3,
DES_cblock *ivec,int *num); DES_cblock *ivec,int *num);
#if 0
void DES_xwhite_in2out(const_DES_cblock *DES_key,const_DES_cblock *in_white, void DES_xwhite_in2out(const_DES_cblock *DES_key,const_DES_cblock *in_white,
DES_cblock *out_white); DES_cblock *out_white);
#endif
int DES_enc_read(int fd,void *buf,int len,DES_key_schedule *sched, int DES_enc_read(int fd,void *buf,int len,DES_key_schedule *sched,
DES_cblock *iv); DES_cblock *iv);
int DES_enc_write(int fd,const void *buf,int len,DES_key_schedule *sched, int DES_enc_write(int fd,const void *buf,int len,DES_key_schedule *sched,
DES_cblock *iv); DES_cblock *iv);
char *DES_fcrypt(const char *buf,const char *salt, char *ret); char *DES_fcrypt(const char *buf,const char *salt, char *ret);
char *DES_crypt(const char *buf,const char *salt); char *DES_crypt(const char *buf,const char *salt);
void DES_ofb_encrypt(const unsigned char *in,unsigned char *out,int numbits, void DES_ofb_encrypt(const unsigned char *in,unsigned char *out,int numbits,
long length,DES_key_schedule *schedule,DES_cblock *ivec); long length,DES_key_schedule *schedule,DES_cblock *ivec);
void DES_pcbc_encrypt(const unsigned char *input,unsigned char *output, void DES_pcbc_encrypt(const unsigned char *input,unsigned char *output,
long length,DES_key_schedule *schedule,DES_cblock *ivec, long length,DES_key_schedule *schedule,DES_cblock *ivec,
int enc); int enc);
DES_LONG DES_quad_cksum(const unsigned char *input,DES_cblock output[], DES_LONG DES_quad_cksum(const unsigned char *input,DES_cblock output[],
long length,int out_count,DES_cblock *seed); long length,int out_count,DES_cblock *seed);
int DES_random_key(DES_cblock *ret); int DES_random_key(DES_cblock *ret);
void DES_set_odd_parity(DES_cblock *key); void DES_set_odd_parity(DES_cblock *key);
int DES_check_key_parity(const_DES_cblock *key); int DES_check_key_parity(const_DES_cblock *key);
@@ -226,14 +227,14 @@ void DES_set_key_unchecked(const_DES_cblock *key,DES_key_schedule *schedule);
void DES_string_to_key(const char *str,DES_cblock *key); void DES_string_to_key(const char *str,DES_cblock *key);
void DES_string_to_2keys(const char *str,DES_cblock *key1,DES_cblock *key2); void DES_string_to_2keys(const char *str,DES_cblock *key1,DES_cblock *key2);
void DES_cfb64_encrypt(const unsigned char *in,unsigned char *out,long length, void DES_cfb64_encrypt(const unsigned char *in,unsigned char *out,long length,
DES_key_schedule *schedule,DES_cblock *ivec,int *num, DES_key_schedule *schedule,DES_cblock *ivec,int *num,
int enc); int enc);
void DES_ofb64_encrypt(const unsigned char *in,unsigned char *out,long length, void DES_ofb64_encrypt(const unsigned char *in,unsigned char *out,long length,
DES_key_schedule *schedule,DES_cblock *ivec,int *num); DES_key_schedule *schedule,DES_cblock *ivec,int *num);
int DES_read_password(DES_cblock *key, const char *prompt, int verify); int DES_read_password(DES_cblock *key, const char *prompt, int verify);
int DES_read_2passwords(DES_cblock *key1, DES_cblock *key2, const char *prompt, int DES_read_2passwords(DES_cblock *key1, DES_cblock *key2, const char *prompt,
int verify); int verify);
#define DES_fixup_key_parity DES_set_odd_parity #define DES_fixup_key_parity DES_set_odd_parity
@@ -242,4 +243,3 @@ int DES_read_2passwords(DES_cblock *key1, DES_cblock *key2, const char *prompt,
#endif #endif
#endif #endif
dep/include/openssl/des_old.h
+121 -121
View File
@@ -91,7 +91,7 @@
#ifndef HEADER_DES_H #ifndef HEADER_DES_H
#define HEADER_DES_H #define HEADER_DES_H
#include <openssl/e_os2.h> /* OPENSSL_EXTERN, OPENSSL_NO_DES, DES_LONG */ #include <openssl/e_os2.h> /* OPENSSL_EXTERN, OPENSSL_NO_DES, DES_LONG */
#ifdef OPENSSL_NO_DES #ifdef OPENSSL_NO_DES
#error DES is disabled. #error DES is disabled.
@@ -122,116 +122,116 @@ extern "C" {
typedef unsigned char _ossl_old_des_cblock[8]; typedef unsigned char _ossl_old_des_cblock[8];
typedef struct _ossl_old_des_ks_struct typedef struct _ossl_old_des_ks_struct
{ {
union { union {
_ossl_old_des_cblock _; _ossl_old_des_cblock _;
/* make sure things are correct size on machines with /* make sure things are correct size on machines with
* 8 byte longs */ * 8 byte longs */
DES_LONG pad[2]; DES_LONG pad[2];
} ks; } ks;
} _ossl_old_des_key_schedule[16]; } _ossl_old_des_key_schedule[16];
#ifndef OPENSSL_DES_LIBDES_COMPATIBILITY #ifndef OPENSSL_DES_LIBDES_COMPATIBILITY
#define des_cblock DES_cblock #define des_cblock DES_cblock
#define const_des_cblock const_DES_cblock #define const_des_cblock const_DES_cblock
#define des_key_schedule DES_key_schedule #define des_key_schedule DES_key_schedule
#define des_ecb3_encrypt(i,o,k1,k2,k3,e)\ #define des_ecb3_encrypt(i,o,k1,k2,k3,e)\
DES_ecb3_encrypt((i),(o),&(k1),&(k2),&(k3),(e)) DES_ecb3_encrypt((i),(o),&(k1),&(k2),&(k3),(e))
#define des_ede3_cbc_encrypt(i,o,l,k1,k2,k3,iv,e)\ #define des_ede3_cbc_encrypt(i,o,l,k1,k2,k3,iv,e)\
DES_ede3_cbc_encrypt((i),(o),(l),&(k1),&(k2),&(k3),(iv),(e)) DES_ede3_cbc_encrypt((i),(o),(l),&(k1),&(k2),&(k3),(iv),(e))
#define des_ede3_cbcm_encrypt(i,o,l,k1,k2,k3,iv1,iv2,e)\ #define des_ede3_cbcm_encrypt(i,o,l,k1,k2,k3,iv1,iv2,e)\
DES_ede3_cbcm_encrypt((i),(o),(l),&(k1),&(k2),&(k3),(iv1),(iv2),(e)) DES_ede3_cbcm_encrypt((i),(o),(l),&(k1),&(k2),&(k3),(iv1),(iv2),(e))
#define des_ede3_cfb64_encrypt(i,o,l,k1,k2,k3,iv,n,e)\ #define des_ede3_cfb64_encrypt(i,o,l,k1,k2,k3,iv,n,e)\
DES_ede3_cfb64_encrypt((i),(o),(l),&(k1),&(k2),&(k3),(iv),(n),(e)) DES_ede3_cfb64_encrypt((i),(o),(l),&(k1),&(k2),&(k3),(iv),(n),(e))
#define des_ede3_ofb64_encrypt(i,o,l,k1,k2,k3,iv,n)\ #define des_ede3_ofb64_encrypt(i,o,l,k1,k2,k3,iv,n)\
DES_ede3_ofb64_encrypt((i),(o),(l),&(k1),&(k2),&(k3),(iv),(n)) DES_ede3_ofb64_encrypt((i),(o),(l),&(k1),&(k2),&(k3),(iv),(n))
#define des_options()\ #define des_options()\
DES_options() DES_options()
#define des_cbc_cksum(i,o,l,k,iv)\ #define des_cbc_cksum(i,o,l,k,iv)\
DES_cbc_cksum((i),(o),(l),&(k),(iv)) DES_cbc_cksum((i),(o),(l),&(k),(iv))
#define des_cbc_encrypt(i,o,l,k,iv,e)\ #define des_cbc_encrypt(i,o,l,k,iv,e)\
DES_cbc_encrypt((i),(o),(l),&(k),(iv),(e)) DES_cbc_encrypt((i),(o),(l),&(k),(iv),(e))
#define des_ncbc_encrypt(i,o,l,k,iv,e)\ #define des_ncbc_encrypt(i,o,l,k,iv,e)\
DES_ncbc_encrypt((i),(o),(l),&(k),(iv),(e)) DES_ncbc_encrypt((i),(o),(l),&(k),(iv),(e))
#define des_xcbc_encrypt(i,o,l,k,iv,inw,outw,e)\ #define des_xcbc_encrypt(i,o,l,k,iv,inw,outw,e)\
DES_xcbc_encrypt((i),(o),(l),&(k),(iv),(inw),(outw),(e)) DES_xcbc_encrypt((i),(o),(l),&(k),(iv),(inw),(outw),(e))
#define des_cfb_encrypt(i,o,n,l,k,iv,e)\ #define des_cfb_encrypt(i,o,n,l,k,iv,e)\
DES_cfb_encrypt((i),(o),(n),(l),&(k),(iv),(e)) DES_cfb_encrypt((i),(o),(n),(l),&(k),(iv),(e))
#define des_ecb_encrypt(i,o,k,e)\ #define des_ecb_encrypt(i,o,k,e)\
DES_ecb_encrypt((i),(o),&(k),(e)) DES_ecb_encrypt((i),(o),&(k),(e))
#define des_encrypt1(d,k,e)\ #define des_encrypt1(d,k,e)\
DES_encrypt1((d),&(k),(e)) DES_encrypt1((d),&(k),(e))
#define des_encrypt2(d,k,e)\ #define des_encrypt2(d,k,e)\
DES_encrypt2((d),&(k),(e)) DES_encrypt2((d),&(k),(e))
#define des_encrypt3(d,k1,k2,k3)\ #define des_encrypt3(d,k1,k2,k3)\
DES_encrypt3((d),&(k1),&(k2),&(k3)) DES_encrypt3((d),&(k1),&(k2),&(k3))
#define des_decrypt3(d,k1,k2,k3)\ #define des_decrypt3(d,k1,k2,k3)\
DES_decrypt3((d),&(k1),&(k2),&(k3)) DES_decrypt3((d),&(k1),&(k2),&(k3))
#define des_xwhite_in2out(k,i,o)\ #define des_xwhite_in2out(k,i,o)\
DES_xwhite_in2out((k),(i),(o)) DES_xwhite_in2out((k),(i),(o))
#define des_enc_read(f,b,l,k,iv)\ #define des_enc_read(f,b,l,k,iv)\
DES_enc_read((f),(b),(l),&(k),(iv)) DES_enc_read((f),(b),(l),&(k),(iv))
#define des_enc_write(f,b,l,k,iv)\ #define des_enc_write(f,b,l,k,iv)\
DES_enc_write((f),(b),(l),&(k),(iv)) DES_enc_write((f),(b),(l),&(k),(iv))
#define des_fcrypt(b,s,r)\ #define des_fcrypt(b,s,r)\
DES_fcrypt((b),(s),(r)) DES_fcrypt((b),(s),(r))
#if 0 #if 0
#define des_crypt(b,s)\ #define des_crypt(b,s)\
DES_crypt((b),(s)) DES_crypt((b),(s))
#if !defined(PERL5) && !defined(__FreeBSD__) && !defined(NeXT) && !defined(__OpenBSD__) #if !defined(PERL5) && !defined(__FreeBSD__) && !defined(NeXT) && !defined(__OpenBSD__)
#define crypt(b,s)\ #define crypt(b,s)\
DES_crypt((b),(s)) DES_crypt((b),(s))
#endif #endif
#endif #endif
#define des_ofb_encrypt(i,o,n,l,k,iv)\ #define des_ofb_encrypt(i,o,n,l,k,iv)\
DES_ofb_encrypt((i),(o),(n),(l),&(k),(iv)) DES_ofb_encrypt((i),(o),(n),(l),&(k),(iv))
#define des_pcbc_encrypt(i,o,l,k,iv,e)\ #define des_pcbc_encrypt(i,o,l,k,iv,e)\
DES_pcbc_encrypt((i),(o),(l),&(k),(iv),(e)) DES_pcbc_encrypt((i),(o),(l),&(k),(iv),(e))
#define des_quad_cksum(i,o,l,c,s)\ #define des_quad_cksum(i,o,l,c,s)\
DES_quad_cksum((i),(o),(l),(c),(s)) DES_quad_cksum((i),(o),(l),(c),(s))
#define des_random_seed(k)\ #define des_random_seed(k)\
_ossl_096_des_random_seed((k)) _ossl_096_des_random_seed((k))
#define des_random_key(r)\ #define des_random_key(r)\
DES_random_key((r)) DES_random_key((r))
#define des_read_password(k,p,v) \ #define des_read_password(k,p,v) \
DES_read_password((k),(p),(v)) DES_read_password((k),(p),(v))
#define des_read_2passwords(k1,k2,p,v) \ #define des_read_2passwords(k1,k2,p,v) \
DES_read_2passwords((k1),(k2),(p),(v)) DES_read_2passwords((k1),(k2),(p),(v))
#define des_set_odd_parity(k)\ #define des_set_odd_parity(k)\
DES_set_odd_parity((k)) DES_set_odd_parity((k))
#define des_check_key_parity(k)\ #define des_check_key_parity(k)\
DES_check_key_parity((k)) DES_check_key_parity((k))
#define des_is_weak_key(k)\ #define des_is_weak_key(k)\
DES_is_weak_key((k)) DES_is_weak_key((k))
#define des_set_key(k,ks)\ #define des_set_key(k,ks)\
DES_set_key((k),&(ks)) DES_set_key((k),&(ks))
#define des_key_sched(k,ks)\ #define des_key_sched(k,ks)\
DES_key_sched((k),&(ks)) DES_key_sched((k),&(ks))
#define des_set_key_checked(k,ks)\ #define des_set_key_checked(k,ks)\
DES_set_key_checked((k),&(ks)) DES_set_key_checked((k),&(ks))
#define des_set_key_unchecked(k,ks)\ #define des_set_key_unchecked(k,ks)\
DES_set_key_unchecked((k),&(ks)) DES_set_key_unchecked((k),&(ks))
#define des_string_to_key(s,k)\ #define des_string_to_key(s,k)\
DES_string_to_key((s),(k)) DES_string_to_key((s),(k))
#define des_string_to_2keys(s,k1,k2)\ #define des_string_to_2keys(s,k1,k2)\
DES_string_to_2keys((s),(k1),(k2)) DES_string_to_2keys((s),(k1),(k2))
#define des_cfb64_encrypt(i,o,l,ks,iv,n,e)\ #define des_cfb64_encrypt(i,o,l,ks,iv,n,e)\
DES_cfb64_encrypt((i),(o),(l),&(ks),(iv),(n),(e)) DES_cfb64_encrypt((i),(o),(l),&(ks),(iv),(n),(e))
#define des_ofb64_encrypt(i,o,l,ks,iv,n)\ #define des_ofb64_encrypt(i,o,l,ks,iv,n)\
DES_ofb64_encrypt((i),(o),(l),&(ks),(iv),(n)) DES_ofb64_encrypt((i),(o),(l),&(ks),(iv),(n))
#define des_ecb2_encrypt(i,o,k1,k2,e) \ #define des_ecb2_encrypt(i,o,k1,k2,e) \
des_ecb3_encrypt((i),(o),(k1),(k2),(k1),(e)) des_ecb3_encrypt((i),(o),(k1),(k2),(k1),(e))
#define des_ede2_cbc_encrypt(i,o,l,k1,k2,iv,e) \ #define des_ede2_cbc_encrypt(i,o,l,k1,k2,iv,e) \
des_ede3_cbc_encrypt((i),(o),(l),(k1),(k2),(k1),(iv),(e)) des_ede3_cbc_encrypt((i),(o),(l),(k1),(k2),(k1),(iv),(e))
#define des_ede2_cfb64_encrypt(i,o,l,k1,k2,iv,n,e) \ #define des_ede2_cfb64_encrypt(i,o,l,k1,k2,iv,n,e) \
des_ede3_cfb64_encrypt((i),(o),(l),(k1),(k2),(k1),(iv),(n),(e)) des_ede3_cfb64_encrypt((i),(o),(l),(k1),(k2),(k1),(iv),(n),(e))
#define des_ede2_ofb64_encrypt(i,o,l,k1,k2,iv,n) \ #define des_ede2_ofb64_encrypt(i,o,l,k1,k2,iv,n) \
des_ede3_ofb64_encrypt((i),(o),(l),(k1),(k2),(k1),(iv),(n)) des_ede3_ofb64_encrypt((i),(o),(l),(k1),(k2),(k1),(iv),(n))
#define des_check_key DES_check_key #define des_check_key DES_check_key
#define des_rw_mode DES_rw_mode #define des_rw_mode DES_rw_mode
@@ -241,92 +241,92 @@ typedef struct _ossl_old_des_ks_struct
#define des_cblock _ossl_old_des_cblock #define des_cblock _ossl_old_des_cblock
#define des_key_schedule _ossl_old_des_key_schedule #define des_key_schedule _ossl_old_des_key_schedule
#define des_ecb3_encrypt(i,o,k1,k2,k3,e)\ #define des_ecb3_encrypt(i,o,k1,k2,k3,e)\
_ossl_old_des_ecb3_encrypt((i),(o),(k1),(k2),(k3),(e)) _ossl_old_des_ecb3_encrypt((i),(o),(k1),(k2),(k3),(e))
#define des_ede3_cbc_encrypt(i,o,l,k1,k2,k3,iv,e)\ #define des_ede3_cbc_encrypt(i,o,l,k1,k2,k3,iv,e)\
_ossl_old_des_ede3_cbc_encrypt((i),(o),(l),(k1),(k2),(k3),(iv),(e)) _ossl_old_des_ede3_cbc_encrypt((i),(o),(l),(k1),(k2),(k3),(iv),(e))
#define des_ede3_cfb64_encrypt(i,o,l,k1,k2,k3,iv,n,e)\ #define des_ede3_cfb64_encrypt(i,o,l,k1,k2,k3,iv,n,e)\
_ossl_old_des_ede3_cfb64_encrypt((i),(o),(l),(k1),(k2),(k3),(iv),(n),(e)) _ossl_old_des_ede3_cfb64_encrypt((i),(o),(l),(k1),(k2),(k3),(iv),(n),(e))
#define des_ede3_ofb64_encrypt(i,o,l,k1,k2,k3,iv,n)\ #define des_ede3_ofb64_encrypt(i,o,l,k1,k2,k3,iv,n)\
_ossl_old_des_ede3_ofb64_encrypt((i),(o),(l),(k1),(k2),(k3),(iv),(n)) _ossl_old_des_ede3_ofb64_encrypt((i),(o),(l),(k1),(k2),(k3),(iv),(n))
#define des_options()\ #define des_options()\
_ossl_old_des_options() _ossl_old_des_options()
#define des_cbc_cksum(i,o,l,k,iv)\ #define des_cbc_cksum(i,o,l,k,iv)\
_ossl_old_des_cbc_cksum((i),(o),(l),(k),(iv)) _ossl_old_des_cbc_cksum((i),(o),(l),(k),(iv))
#define des_cbc_encrypt(i,o,l,k,iv,e)\ #define des_cbc_encrypt(i,o,l,k,iv,e)\
_ossl_old_des_cbc_encrypt((i),(o),(l),(k),(iv),(e)) _ossl_old_des_cbc_encrypt((i),(o),(l),(k),(iv),(e))
#define des_ncbc_encrypt(i,o,l,k,iv,e)\ #define des_ncbc_encrypt(i,o,l,k,iv,e)\
_ossl_old_des_ncbc_encrypt((i),(o),(l),(k),(iv),(e)) _ossl_old_des_ncbc_encrypt((i),(o),(l),(k),(iv),(e))
#define des_xcbc_encrypt(i,o,l,k,iv,inw,outw,e)\ #define des_xcbc_encrypt(i,o,l,k,iv,inw,outw,e)\
_ossl_old_des_xcbc_encrypt((i),(o),(l),(k),(iv),(inw),(outw),(e)) _ossl_old_des_xcbc_encrypt((i),(o),(l),(k),(iv),(inw),(outw),(e))
#define des_cfb_encrypt(i,o,n,l,k,iv,e)\ #define des_cfb_encrypt(i,o,n,l,k,iv,e)\
_ossl_old_des_cfb_encrypt((i),(o),(n),(l),(k),(iv),(e)) _ossl_old_des_cfb_encrypt((i),(o),(n),(l),(k),(iv),(e))
#define des_ecb_encrypt(i,o,k,e)\ #define des_ecb_encrypt(i,o,k,e)\
_ossl_old_des_ecb_encrypt((i),(o),(k),(e)) _ossl_old_des_ecb_encrypt((i),(o),(k),(e))
#define des_encrypt(d,k,e)\ #define des_encrypt(d,k,e)\
_ossl_old_des_encrypt((d),(k),(e)) _ossl_old_des_encrypt((d),(k),(e))
#define des_encrypt2(d,k,e)\ #define des_encrypt2(d,k,e)\
_ossl_old_des_encrypt2((d),(k),(e)) _ossl_old_des_encrypt2((d),(k),(e))
#define des_encrypt3(d,k1,k2,k3)\ #define des_encrypt3(d,k1,k2,k3)\
_ossl_old_des_encrypt3((d),(k1),(k2),(k3)) _ossl_old_des_encrypt3((d),(k1),(k2),(k3))
#define des_decrypt3(d,k1,k2,k3)\ #define des_decrypt3(d,k1,k2,k3)\
_ossl_old_des_decrypt3((d),(k1),(k2),(k3)) _ossl_old_des_decrypt3((d),(k1),(k2),(k3))
#define des_xwhite_in2out(k,i,o)\ #define des_xwhite_in2out(k,i,o)\
_ossl_old_des_xwhite_in2out((k),(i),(o)) _ossl_old_des_xwhite_in2out((k),(i),(o))
#define des_enc_read(f,b,l,k,iv)\ #define des_enc_read(f,b,l,k,iv)\
_ossl_old_des_enc_read((f),(b),(l),(k),(iv)) _ossl_old_des_enc_read((f),(b),(l),(k),(iv))
#define des_enc_write(f,b,l,k,iv)\ #define des_enc_write(f,b,l,k,iv)\
_ossl_old_des_enc_write((f),(b),(l),(k),(iv)) _ossl_old_des_enc_write((f),(b),(l),(k),(iv))
#define des_fcrypt(b,s,r)\ #define des_fcrypt(b,s,r)\
_ossl_old_des_fcrypt((b),(s),(r)) _ossl_old_des_fcrypt((b),(s),(r))
#define des_crypt(b,s)\ #define des_crypt(b,s)\
_ossl_old_des_crypt((b),(s)) _ossl_old_des_crypt((b),(s))
#if 0 #if 0
#define crypt(b,s)\ #define crypt(b,s)\
_ossl_old_crypt((b),(s)) _ossl_old_crypt((b),(s))
#endif #endif
#define des_ofb_encrypt(i,o,n,l,k,iv)\ #define des_ofb_encrypt(i,o,n,l,k,iv)\
_ossl_old_des_ofb_encrypt((i),(o),(n),(l),(k),(iv)) _ossl_old_des_ofb_encrypt((i),(o),(n),(l),(k),(iv))
#define des_pcbc_encrypt(i,o,l,k,iv,e)\ #define des_pcbc_encrypt(i,o,l,k,iv,e)\
_ossl_old_des_pcbc_encrypt((i),(o),(l),(k),(iv),(e)) _ossl_old_des_pcbc_encrypt((i),(o),(l),(k),(iv),(e))
#define des_quad_cksum(i,o,l,c,s)\ #define des_quad_cksum(i,o,l,c,s)\
_ossl_old_des_quad_cksum((i),(o),(l),(c),(s)) _ossl_old_des_quad_cksum((i),(o),(l),(c),(s))
#define des_random_seed(k)\ #define des_random_seed(k)\
_ossl_old_des_random_seed((k)) _ossl_old_des_random_seed((k))
#define des_random_key(r)\ #define des_random_key(r)\
_ossl_old_des_random_key((r)) _ossl_old_des_random_key((r))
#define des_read_password(k,p,v) \ #define des_read_password(k,p,v) \
_ossl_old_des_read_password((k),(p),(v)) _ossl_old_des_read_password((k),(p),(v))
#define des_read_2passwords(k1,k2,p,v) \ #define des_read_2passwords(k1,k2,p,v) \
_ossl_old_des_read_2passwords((k1),(k2),(p),(v)) _ossl_old_des_read_2passwords((k1),(k2),(p),(v))
#define des_set_odd_parity(k)\ #define des_set_odd_parity(k)\
_ossl_old_des_set_odd_parity((k)) _ossl_old_des_set_odd_parity((k))
#define des_is_weak_key(k)\ #define des_is_weak_key(k)\
_ossl_old_des_is_weak_key((k)) _ossl_old_des_is_weak_key((k))
#define des_set_key(k,ks)\ #define des_set_key(k,ks)\
_ossl_old_des_set_key((k),(ks)) _ossl_old_des_set_key((k),(ks))
#define des_key_sched(k,ks)\ #define des_key_sched(k,ks)\
_ossl_old_des_key_sched((k),(ks)) _ossl_old_des_key_sched((k),(ks))
#define des_string_to_key(s,k)\ #define des_string_to_key(s,k)\
_ossl_old_des_string_to_key((s),(k)) _ossl_old_des_string_to_key((s),(k))
#define des_string_to_2keys(s,k1,k2)\ #define des_string_to_2keys(s,k1,k2)\
_ossl_old_des_string_to_2keys((s),(k1),(k2)) _ossl_old_des_string_to_2keys((s),(k1),(k2))
#define des_cfb64_encrypt(i,o,l,ks,iv,n,e)\ #define des_cfb64_encrypt(i,o,l,ks,iv,n,e)\
_ossl_old_des_cfb64_encrypt((i),(o),(l),(ks),(iv),(n),(e)) _ossl_old_des_cfb64_encrypt((i),(o),(l),(ks),(iv),(n),(e))
#define des_ofb64_encrypt(i,o,l,ks,iv,n)\ #define des_ofb64_encrypt(i,o,l,ks,iv,n)\
_ossl_old_des_ofb64_encrypt((i),(o),(l),(ks),(iv),(n)) _ossl_old_des_ofb64_encrypt((i),(o),(l),(ks),(iv),(n))
#define des_ecb2_encrypt(i,o,k1,k2,e) \ #define des_ecb2_encrypt(i,o,k1,k2,e) \
des_ecb3_encrypt((i),(o),(k1),(k2),(k1),(e)) des_ecb3_encrypt((i),(o),(k1),(k2),(k1),(e))
#define des_ede2_cbc_encrypt(i,o,l,k1,k2,iv,e) \ #define des_ede2_cbc_encrypt(i,o,l,k1,k2,iv,e) \
des_ede3_cbc_encrypt((i),(o),(l),(k1),(k2),(k1),(iv),(e)) des_ede3_cbc_encrypt((i),(o),(l),(k1),(k2),(k1),(iv),(e))
#define des_ede2_cfb64_encrypt(i,o,l,k1,k2,iv,n,e) \ #define des_ede2_cfb64_encrypt(i,o,l,k1,k2,iv,n,e) \
des_ede3_cfb64_encrypt((i),(o),(l),(k1),(k2),(k1),(iv),(n),(e)) des_ede3_cfb64_encrypt((i),(o),(l),(k1),(k2),(k1),(iv),(n),(e))
#define des_ede2_ofb64_encrypt(i,o,l,k1,k2,iv,n) \ #define des_ede2_ofb64_encrypt(i,o,l,k1,k2,iv,n) \
des_ede3_ofb64_encrypt((i),(o),(l),(k1),(k2),(k1),(iv),(n)) des_ede3_ofb64_encrypt((i),(o),(l),(k1),(k2),(k1),(iv),(n))
#define des_check_key DES_check_key #define des_check_key DES_check_key
#define des_rw_mode DES_rw_mode #define des_rw_mode DES_rw_mode
@@ -334,60 +334,61 @@ typedef struct _ossl_old_des_ks_struct
const char *_ossl_old_des_options(void); const char *_ossl_old_des_options(void);
void _ossl_old_des_ecb3_encrypt(_ossl_old_des_cblock *input,_ossl_old_des_cblock *output, void _ossl_old_des_ecb3_encrypt(_ossl_old_des_cblock *input,_ossl_old_des_cblock *output,
_ossl_old_des_key_schedule ks1,_ossl_old_des_key_schedule ks2, _ossl_old_des_key_schedule ks1,_ossl_old_des_key_schedule ks2,
_ossl_old_des_key_schedule ks3, int enc); _ossl_old_des_key_schedule ks3, int enc);
DES_LONG _ossl_old_des_cbc_cksum(_ossl_old_des_cblock *input,_ossl_old_des_cblock *output, DES_LONG _ossl_old_des_cbc_cksum(_ossl_old_des_cblock *input,_ossl_old_des_cblock *output,
long length,_ossl_old_des_key_schedule schedule,_ossl_old_des_cblock *ivec); long length,_ossl_old_des_key_schedule schedule,_ossl_old_des_cblock *ivec);
void _ossl_old_des_cbc_encrypt(_ossl_old_des_cblock *input,_ossl_old_des_cblock *output,long length, void _ossl_old_des_cbc_encrypt(_ossl_old_des_cblock *input,_ossl_old_des_cblock *output,long length,
_ossl_old_des_key_schedule schedule,_ossl_old_des_cblock *ivec,int enc); _ossl_old_des_key_schedule schedule,_ossl_old_des_cblock *ivec,int enc);
void _ossl_old_des_ncbc_encrypt(_ossl_old_des_cblock *input,_ossl_old_des_cblock *output,long length, void _ossl_old_des_ncbc_encrypt(_ossl_old_des_cblock *input,_ossl_old_des_cblock *output,long length,
_ossl_old_des_key_schedule schedule,_ossl_old_des_cblock *ivec,int enc); _ossl_old_des_key_schedule schedule,_ossl_old_des_cblock *ivec,int enc);
void _ossl_old_des_xcbc_encrypt(_ossl_old_des_cblock *input,_ossl_old_des_cblock *output,long length, void _ossl_old_des_xcbc_encrypt(_ossl_old_des_cblock *input,_ossl_old_des_cblock *output,long length,
_ossl_old_des_key_schedule schedule,_ossl_old_des_cblock *ivec, _ossl_old_des_key_schedule schedule,_ossl_old_des_cblock *ivec,
_ossl_old_des_cblock *inw,_ossl_old_des_cblock *outw,int enc); _ossl_old_des_cblock *inw,_ossl_old_des_cblock *outw,int enc);
void _ossl_old_des_cfb_encrypt(unsigned char *in,unsigned char *out,int numbits, void _ossl_old_des_cfb_encrypt(unsigned char *in,unsigned char *out,int numbits,
long length,_ossl_old_des_key_schedule schedule,_ossl_old_des_cblock *ivec,int enc); long length,_ossl_old_des_key_schedule schedule,_ossl_old_des_cblock *ivec,int enc);
void _ossl_old_des_ecb_encrypt(_ossl_old_des_cblock *input,_ossl_old_des_cblock *output, void _ossl_old_des_ecb_encrypt(_ossl_old_des_cblock *input,_ossl_old_des_cblock *output,
_ossl_old_des_key_schedule ks,int enc); _ossl_old_des_key_schedule ks,int enc);
void _ossl_old_des_encrypt(DES_LONG *data,_ossl_old_des_key_schedule ks, int enc); void _ossl_old_des_encrypt(DES_LONG *data,_ossl_old_des_key_schedule ks, int enc);
void _ossl_old_des_encrypt2(DES_LONG *data,_ossl_old_des_key_schedule ks, int enc); void _ossl_old_des_encrypt2(DES_LONG *data,_ossl_old_des_key_schedule ks, int enc);
void _ossl_old_des_encrypt3(DES_LONG *data, _ossl_old_des_key_schedule ks1, void _ossl_old_des_encrypt3(DES_LONG *data, _ossl_old_des_key_schedule ks1,
_ossl_old_des_key_schedule ks2, _ossl_old_des_key_schedule ks3); _ossl_old_des_key_schedule ks2, _ossl_old_des_key_schedule ks3);
void _ossl_old_des_decrypt3(DES_LONG *data, _ossl_old_des_key_schedule ks1, void _ossl_old_des_decrypt3(DES_LONG *data, _ossl_old_des_key_schedule ks1,
_ossl_old_des_key_schedule ks2, _ossl_old_des_key_schedule ks3); _ossl_old_des_key_schedule ks2, _ossl_old_des_key_schedule ks3);
void _ossl_old_des_ede3_cbc_encrypt(_ossl_old_des_cblock *input, _ossl_old_des_cblock *output, void _ossl_old_des_ede3_cbc_encrypt(_ossl_old_des_cblock *input, _ossl_old_des_cblock *output,
long length, _ossl_old_des_key_schedule ks1, _ossl_old_des_key_schedule ks2, long length, _ossl_old_des_key_schedule ks1, _ossl_old_des_key_schedule ks2,
_ossl_old_des_key_schedule ks3, _ossl_old_des_cblock *ivec, int enc); _ossl_old_des_key_schedule ks3, _ossl_old_des_cblock *ivec, int enc);
void _ossl_old_des_ede3_cfb64_encrypt(unsigned char *in, unsigned char *out, void _ossl_old_des_ede3_cfb64_encrypt(unsigned char *in, unsigned char *out,
long length, _ossl_old_des_key_schedule ks1, _ossl_old_des_key_schedule ks2, long length, _ossl_old_des_key_schedule ks1, _ossl_old_des_key_schedule ks2,
_ossl_old_des_key_schedule ks3, _ossl_old_des_cblock *ivec, int *num, int enc); _ossl_old_des_key_schedule ks3, _ossl_old_des_cblock *ivec, int *num, int enc);
void _ossl_old_des_ede3_ofb64_encrypt(unsigned char *in, unsigned char *out, void _ossl_old_des_ede3_ofb64_encrypt(unsigned char *in, unsigned char *out,
long length, _ossl_old_des_key_schedule ks1, _ossl_old_des_key_schedule ks2, long length, _ossl_old_des_key_schedule ks1, _ossl_old_des_key_schedule ks2,
_ossl_old_des_key_schedule ks3, _ossl_old_des_cblock *ivec, int *num); _ossl_old_des_key_schedule ks3, _ossl_old_des_cblock *ivec, int *num);
#if 0
void _ossl_old_des_xwhite_in2out(_ossl_old_des_cblock (*des_key), _ossl_old_des_cblock (*in_white), void _ossl_old_des_xwhite_in2out(_ossl_old_des_cblock (*des_key), _ossl_old_des_cblock (*in_white),
_ossl_old_des_cblock (*out_white)); _ossl_old_des_cblock (*out_white));
#endif
int _ossl_old_des_enc_read(int fd,char *buf,int len,_ossl_old_des_key_schedule sched, int _ossl_old_des_enc_read(int fd,char *buf,int len,_ossl_old_des_key_schedule sched,
_ossl_old_des_cblock *iv); _ossl_old_des_cblock *iv);
int _ossl_old_des_enc_write(int fd,char *buf,int len,_ossl_old_des_key_schedule sched, int _ossl_old_des_enc_write(int fd,char *buf,int len,_ossl_old_des_key_schedule sched,
_ossl_old_des_cblock *iv); _ossl_old_des_cblock *iv);
char *_ossl_old_des_fcrypt(const char *buf,const char *salt, char *ret); char *_ossl_old_des_fcrypt(const char *buf,const char *salt, char *ret);
char *_ossl_old_des_crypt(const char *buf,const char *salt); char *_ossl_old_des_crypt(const char *buf,const char *salt);
#if !defined(PERL5) && !defined(NeXT) #if !defined(PERL5) && !defined(NeXT)
char *_ossl_old_crypt(const char *buf,const char *salt); char *_ossl_old_crypt(const char *buf,const char *salt);
#endif #endif
void _ossl_old_des_ofb_encrypt(unsigned char *in,unsigned char *out, void _ossl_old_des_ofb_encrypt(unsigned char *in,unsigned char *out,
int numbits,long length,_ossl_old_des_key_schedule schedule,_ossl_old_des_cblock *ivec); int numbits,long length,_ossl_old_des_key_schedule schedule,_ossl_old_des_cblock *ivec);
void _ossl_old_des_pcbc_encrypt(_ossl_old_des_cblock *input,_ossl_old_des_cblock *output,long length, void _ossl_old_des_pcbc_encrypt(_ossl_old_des_cblock *input,_ossl_old_des_cblock *output,long length,
_ossl_old_des_key_schedule schedule,_ossl_old_des_cblock *ivec,int enc); _ossl_old_des_key_schedule schedule,_ossl_old_des_cblock *ivec,int enc);
DES_LONG _ossl_old_des_quad_cksum(_ossl_old_des_cblock *input,_ossl_old_des_cblock *output, DES_LONG _ossl_old_des_quad_cksum(_ossl_old_des_cblock *input,_ossl_old_des_cblock *output,
long length,int out_count,_ossl_old_des_cblock *seed); long length,int out_count,_ossl_old_des_cblock *seed);
void _ossl_old_des_random_seed(_ossl_old_des_cblock key); void _ossl_old_des_random_seed(_ossl_old_des_cblock key);
void _ossl_old_des_random_key(_ossl_old_des_cblock ret); void _ossl_old_des_random_key(_ossl_old_des_cblock ret);
int _ossl_old_des_read_password(_ossl_old_des_cblock *key,const char *prompt,int verify); int _ossl_old_des_read_password(_ossl_old_des_cblock *key,const char *prompt,int verify);
int _ossl_old_des_read_2passwords(_ossl_old_des_cblock *key1,_ossl_old_des_cblock *key2, int _ossl_old_des_read_2passwords(_ossl_old_des_cblock *key1,_ossl_old_des_cblock *key2,
const char *prompt,int verify); const char *prompt,int verify);
void _ossl_old_des_set_odd_parity(_ossl_old_des_cblock *key); void _ossl_old_des_set_odd_parity(_ossl_old_des_cblock *key);
int _ossl_old_des_is_weak_key(_ossl_old_des_cblock *key); int _ossl_old_des_is_weak_key(_ossl_old_des_cblock *key);
int _ossl_old_des_set_key(_ossl_old_des_cblock *key,_ossl_old_des_key_schedule schedule); int _ossl_old_des_set_key(_ossl_old_des_cblock *key,_ossl_old_des_key_schedule schedule);
@@ -395,9 +396,9 @@ int _ossl_old_des_key_sched(_ossl_old_des_cblock *key,_ossl_old_des_key_schedule
void _ossl_old_des_string_to_key(char *str,_ossl_old_des_cblock *key); void _ossl_old_des_string_to_key(char *str,_ossl_old_des_cblock *key);
void _ossl_old_des_string_to_2keys(char *str,_ossl_old_des_cblock *key1,_ossl_old_des_cblock *key2); void _ossl_old_des_string_to_2keys(char *str,_ossl_old_des_cblock *key1,_ossl_old_des_cblock *key2);
void _ossl_old_des_cfb64_encrypt(unsigned char *in, unsigned char *out, long length, void _ossl_old_des_cfb64_encrypt(unsigned char *in, unsigned char *out, long length,
_ossl_old_des_key_schedule schedule, _ossl_old_des_cblock *ivec, int *num, int enc); _ossl_old_des_key_schedule schedule, _ossl_old_des_cblock *ivec, int *num, int enc);
void _ossl_old_des_ofb64_encrypt(unsigned char *in, unsigned char *out, long length, void _ossl_old_des_ofb64_encrypt(unsigned char *in, unsigned char *out, long length,
_ossl_old_des_key_schedule schedule, _ossl_old_des_cblock *ivec, int *num); _ossl_old_des_key_schedule schedule, _ossl_old_des_cblock *ivec, int *num);
void _ossl_096_des_random_seed(des_cblock *key); void _ossl_096_des_random_seed(des_cblock *key);
@@ -443,4 +444,3 @@ void _ossl_096_des_random_seed(des_cblock *key);
#include <openssl/ui_compat.h> #include <openssl/ui_compat.h>
#endif #endif
dep/include/openssl/dh.h
+90 -80
View File
@@ -74,9 +74,11 @@
#endif #endif
#ifndef OPENSSL_DH_MAX_MODULUS_BITS #ifndef OPENSSL_DH_MAX_MODULUS_BITS
# define OPENSSL_DH_MAX_MODULUS_BITS 10000 # define OPENSSL_DH_MAX_MODULUS_BITS 10000
#endif #endif
#define OPENSSL_DH_FIPS_MIN_MODULUS_BITS 1024
#define DH_FLAG_CACHE_MONT_P 0x01 #define DH_FLAG_CACHE_MONT_P 0x01
#define DH_FLAG_NO_EXP_CONSTTIME 0x02 /* new with 0.9.7h; the built-in DH #define DH_FLAG_NO_EXP_CONSTTIME 0x02 /* new with 0.9.7h; the built-in DH
* implementation now uses constant time * implementation now uses constant time
@@ -95,114 +97,119 @@ extern "C" {
/* typedef struct dh_method DH_METHOD; */ /* typedef struct dh_method DH_METHOD; */
struct dh_method struct dh_method
{ {
const char *name; const char *name;
/* Methods here */ /* Methods here */
int (*generate_key)(DH *dh); int (*generate_key)(DH *dh);
int (*compute_key)(unsigned char *key,const BIGNUM *pub_key,DH *dh); int (*compute_key)(unsigned char *key,const BIGNUM *pub_key,DH *dh);
int (*bn_mod_exp)(const DH *dh, BIGNUM *r, const BIGNUM *a, int (*bn_mod_exp)(const DH *dh, BIGNUM *r, const BIGNUM *a,
const BIGNUM *p, const BIGNUM *m, BN_CTX *ctx, const BIGNUM *p, const BIGNUM *m, BN_CTX *ctx,
BN_MONT_CTX *m_ctx); /* Can be null */ BN_MONT_CTX *m_ctx); /* Can be null */
int (*init)(DH *dh); int (*init)(DH *dh);
int (*finish)(DH *dh); int (*finish)(DH *dh);
int flags; int flags;
char *app_data; char *app_data;
/* If this is non-NULL, it will be used to generate parameters */ /* If this is non-NULL, it will be used to generate parameters */
int (*generate_params)(DH *dh, int prime_len, int generator, BN_GENCB *cb); int (*generate_params)(DH *dh, int prime_len, int generator, BN_GENCB *cb);
}; };
struct dh_st struct dh_st
{ {
/* This first argument is used to pick up errors when /* This first argument is used to pick up errors when
* a DH is passed instead of a EVP_PKEY */ * a DH is passed instead of a EVP_PKEY */
int pad; int pad;
int version; int version;
BIGNUM *p; BIGNUM *p;
BIGNUM *g; BIGNUM *g;
long length; /* optional */ long length; /* optional */
BIGNUM *pub_key; /* g^x */ BIGNUM *pub_key; /* g^x */
BIGNUM *priv_key; /* x */ BIGNUM *priv_key; /* x */
int flags; int flags;
BN_MONT_CTX *method_mont_p; BN_MONT_CTX *method_mont_p;
/* Place holders if we want to do X9.42 DH */ /* Place holders if we want to do X9.42 DH */
BIGNUM *q; BIGNUM *q;
BIGNUM *j; BIGNUM *j;
unsigned char *seed; unsigned char *seed;
int seedlen; int seedlen;
BIGNUM *counter; BIGNUM *counter;
int references; int references;
CRYPTO_EX_DATA ex_data; CRYPTO_EX_DATA ex_data;
const DH_METHOD *meth; const DH_METHOD *meth;
ENGINE *engine; ENGINE *engine;
}; };
#define DH_GENERATOR_2 2 #define DH_GENERATOR_2 2
/* #define DH_GENERATOR_3 3 */ /* #define DH_GENERATOR_3 3 */
#define DH_GENERATOR_5 5 #define DH_GENERATOR_5 5
/* DH_check error codes */ /* DH_check error codes */
#define DH_CHECK_P_NOT_PRIME 0x01 #define DH_CHECK_P_NOT_PRIME 0x01
#define DH_CHECK_P_NOT_SAFE_PRIME 0x02 #define DH_CHECK_P_NOT_SAFE_PRIME 0x02
#define DH_UNABLE_TO_CHECK_GENERATOR 0x04 #define DH_UNABLE_TO_CHECK_GENERATOR 0x04
#define DH_NOT_SUITABLE_GENERATOR 0x08 #define DH_NOT_SUITABLE_GENERATOR 0x08
/* DH_check_pub_key error codes */ /* DH_check_pub_key error codes */
#define DH_CHECK_PUBKEY_TOO_SMALL 0x01 #define DH_CHECK_PUBKEY_TOO_SMALL 0x01
#define DH_CHECK_PUBKEY_TOO_LARGE 0x02 #define DH_CHECK_PUBKEY_TOO_LARGE 0x02
/* primes p where (p-1)/2 is prime too are called "safe"; we define /* primes p where (p-1)/2 is prime too are called "safe"; we define
this for backward compatibility: */ this for backward compatibility: */
#define DH_CHECK_P_NOT_STRONG_PRIME DH_CHECK_P_NOT_SAFE_PRIME #define DH_CHECK_P_NOT_STRONG_PRIME DH_CHECK_P_NOT_SAFE_PRIME
#define DHparams_dup(x) ASN1_dup_of_const(DH,i2d_DHparams,d2i_DHparams,x) #define DHparams_dup(x) ASN1_dup_of_const(DH,i2d_DHparams,d2i_DHparams,x)
#define d2i_DHparams_fp(fp,x) (DH *)ASN1_d2i_fp((char *(*)())DH_new, \ #define d2i_DHparams_fp(fp,x) (DH *)ASN1_d2i_fp((char *(*)())DH_new, \
(char *(*)())d2i_DHparams,(fp),(unsigned char **)(x)) (char *(*)())d2i_DHparams,(fp),(unsigned char **)(x))
#define i2d_DHparams_fp(fp,x) ASN1_i2d_fp(i2d_DHparams,(fp), \ #define i2d_DHparams_fp(fp,x) ASN1_i2d_fp(i2d_DHparams,(fp), \
(unsigned char *)(x)) (unsigned char *)(x))
#define d2i_DHparams_bio(bp,x) ASN1_d2i_bio_of(DH,DH_new,d2i_DHparams,bp,x) #define d2i_DHparams_bio(bp,x) ASN1_d2i_bio_of(DH,DH_new,d2i_DHparams,bp,x)
#define i2d_DHparams_bio(bp,x) ASN1_i2d_bio_of_const(DH,i2d_DHparams,bp,x) #define i2d_DHparams_bio(bp,x) ASN1_i2d_bio_of_const(DH,i2d_DHparams,bp,x)
const DH_METHOD *DH_OpenSSL(void); const DH_METHOD *DH_OpenSSL(void);
#ifdef OPENSSL_FIPS
DH * FIPS_dh_new(void);
void FIPS_dh_free(DH *dh);
#endif
void DH_set_default_method(const DH_METHOD *meth); void DH_set_default_method(const DH_METHOD *meth);
const DH_METHOD *DH_get_default_method(void); const DH_METHOD *DH_get_default_method(void);
int DH_set_method(DH *dh, const DH_METHOD *meth); int DH_set_method(DH *dh, const DH_METHOD *meth);
DH *DH_new_method(ENGINE *engine); DH *DH_new_method(ENGINE *engine);
DH * DH_new(void); DH * DH_new(void);
void DH_free(DH *dh); void DH_free(DH *dh);
int DH_up_ref(DH *dh); int DH_up_ref(DH *dh);
int DH_size(const DH *dh); int DH_size(const DH *dh);
int DH_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func, int DH_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func,
CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func); CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func);
int DH_set_ex_data(DH *d, int idx, void *arg); int DH_set_ex_data(DH *d, int idx, void *arg);
void *DH_get_ex_data(DH *d, int idx); void *DH_get_ex_data(DH *d, int idx);
/* Deprecated version */ /* Deprecated version */
#ifndef OPENSSL_NO_DEPRECATED #ifndef OPENSSL_NO_DEPRECATED
DH * DH_generate_parameters(int prime_len,int generator, DH * DH_generate_parameters(int prime_len,int generator,
void (*callback)(int,int,void *),void *cb_arg); void (*callback)(int,int,void *),void *cb_arg);
#endif /* !defined(OPENSSL_NO_DEPRECATED) */ #endif /* !defined(OPENSSL_NO_DEPRECATED) */
/* New version */ /* New version */
int DH_generate_parameters_ex(DH *dh, int prime_len,int generator, BN_GENCB *cb); int DH_generate_parameters_ex(DH *dh, int prime_len,int generator, BN_GENCB *cb);
int DH_check(const DH *dh,int *codes); int DH_check(const DH *dh,int *codes);
int DH_check_pub_key(const DH *dh,const BIGNUM *pub_key, int *codes); int DH_check_pub_key(const DH *dh,const BIGNUM *pub_key, int *codes);
int DH_generate_key(DH *dh); int DH_generate_key(DH *dh);
int DH_compute_key(unsigned char *key,const BIGNUM *pub_key,DH *dh); int DH_compute_key(unsigned char *key,const BIGNUM *pub_key,DH *dh);
DH * d2i_DHparams(DH **a,const unsigned char **pp, long length); DH * d2i_DHparams(DH **a,const unsigned char **pp, long length);
int i2d_DHparams(const DH *a,unsigned char **pp); int i2d_DHparams(const DH *a,unsigned char **pp);
#ifndef OPENSSL_NO_FP_API #ifndef OPENSSL_NO_FP_API
int DHparams_print_fp(FILE *fp, const DH *x); int DHparams_print_fp(FILE *fp, const DH *x);
#endif #endif
#ifndef OPENSSL_NO_BIO #ifndef OPENSSL_NO_BIO
int DHparams_print(BIO *bp, const DH *x); int DHparams_print(BIO *bp, const DH *x);
#else #else
int DHparams_print(char *bp, const DH *x); int DHparams_print(char *bp, const DH *x);
#endif #endif
/* BEGIN ERROR CODES */ /* BEGIN ERROR CODES */
@@ -214,22 +221,25 @@ void ERR_load_DH_strings(void);
/* Error codes for the DH functions. */ /* Error codes for the DH functions. */
/* Function codes. */ /* Function codes. */
#define DH_F_COMPUTE_KEY 102 #define DH_F_COMPUTE_KEY 102
#define DH_F_DHPARAMS_PRINT 100 #define DH_F_DHPARAMS_PRINT 100
#define DH_F_DHPARAMS_PRINT_FP 101 #define DH_F_DHPARAMS_PRINT_FP 101
#define DH_F_DH_BUILTIN_GENPARAMS 106 #define DH_F_DH_BUILTIN_GENPARAMS 106
#define DH_F_DH_NEW_METHOD 105 #define DH_F_DH_COMPUTE_KEY 107
#define DH_F_GENERATE_KEY 103 #define DH_F_DH_GENERATE_KEY 108
#define DH_F_GENERATE_PARAMETERS 104 #define DH_F_DH_GENERATE_PARAMETERS 109
#define DH_F_DH_NEW_METHOD 105
#define DH_F_GENERATE_KEY 103
#define DH_F_GENERATE_PARAMETERS 104
/* Reason codes. */ /* Reason codes. */
#define DH_R_BAD_GENERATOR 101 #define DH_R_BAD_GENERATOR 101
#define DH_R_INVALID_PUBKEY 102 #define DH_R_INVALID_PUBKEY 102
#define DH_R_MODULUS_TOO_LARGE 103 #define DH_R_KEY_SIZE_TOO_SMALL 104
#define DH_R_NO_PRIVATE_VALUE 100 #define DH_R_MODULUS_TOO_LARGE 103
#define DH_R_NO_PRIVATE_VALUE 100
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif #endif
dep/include/openssl/dsa.h
+149 -111
View File
@@ -85,10 +85,12 @@
#endif #endif
#ifndef OPENSSL_DSA_MAX_MODULUS_BITS #ifndef OPENSSL_DSA_MAX_MODULUS_BITS
# define OPENSSL_DSA_MAX_MODULUS_BITS 10000 # define OPENSSL_DSA_MAX_MODULUS_BITS 10000
#endif #endif
#define DSA_FLAG_CACHE_MONT_P 0x01 #define OPENSSL_DSA_FIPS_MIN_MODULUS_BITS 1024
#define DSA_FLAG_CACHE_MONT_P 0x01
#define DSA_FLAG_NO_EXP_CONSTTIME 0x02 /* new with 0.9.7h; the built-in DSA #define DSA_FLAG_NO_EXP_CONSTTIME 0x02 /* new with 0.9.7h; the built-in DSA
* implementation now uses constant time * implementation now uses constant time
* modular exponentiation for secret exponents * modular exponentiation for secret exponents
@@ -97,6 +99,25 @@
* be used for all exponents. * be used for all exponents.
*/ */
/* If this flag is set the DSA method is FIPS compliant and can be used
* in FIPS mode. This is set in the validated module method. If an
* application sets this flag in its own methods it is its reposibility
* to ensure the result is compliant.
*/
#define DSA_FLAG_FIPS_METHOD 0x0400
/* If this flag is set the operations normally disabled in FIPS mode are
* permitted it is then the applications responsibility to ensure that the
* usage is compliant.
*/
#define DSA_FLAG_NON_FIPS_ALLOW 0x0400
#ifdef OPENSSL_FIPS
#define FIPS_DSA_SIZE_T int
#endif
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
@@ -106,142 +127,147 @@ extern "C" {
/* typedef struct dsa_method DSA_METHOD; */ /* typedef struct dsa_method DSA_METHOD; */
typedef struct DSA_SIG_st typedef struct DSA_SIG_st
{ {
BIGNUM *r; BIGNUM *r;
BIGNUM *s; BIGNUM *s;
} DSA_SIG; } DSA_SIG;
struct dsa_method struct dsa_method
{ {
const char *name; const char *name;
DSA_SIG * (*dsa_do_sign)(const unsigned char *dgst, int dlen, DSA *dsa); DSA_SIG * (*dsa_do_sign)(const unsigned char *dgst, int dlen, DSA *dsa);
int (*dsa_sign_setup)(DSA *dsa, BN_CTX *ctx_in, BIGNUM **kinvp, int (*dsa_sign_setup)(DSA *dsa, BN_CTX *ctx_in, BIGNUM **kinvp,
BIGNUM **rp); BIGNUM **rp);
int (*dsa_do_verify)(const unsigned char *dgst, int dgst_len, int (*dsa_do_verify)(const unsigned char *dgst, int dgst_len,
DSA_SIG *sig, DSA *dsa); DSA_SIG *sig, DSA *dsa);
int (*dsa_mod_exp)(DSA *dsa, BIGNUM *rr, BIGNUM *a1, BIGNUM *p1, int (*dsa_mod_exp)(DSA *dsa, BIGNUM *rr, BIGNUM *a1, BIGNUM *p1,
BIGNUM *a2, BIGNUM *p2, BIGNUM *m, BN_CTX *ctx, BIGNUM *a2, BIGNUM *p2, BIGNUM *m, BN_CTX *ctx,
BN_MONT_CTX *in_mont); BN_MONT_CTX *in_mont);
int (*bn_mod_exp)(DSA *dsa, BIGNUM *r, BIGNUM *a, const BIGNUM *p, int (*bn_mod_exp)(DSA *dsa, BIGNUM *r, BIGNUM *a, const BIGNUM *p,
const BIGNUM *m, BN_CTX *ctx, const BIGNUM *m, BN_CTX *ctx,
BN_MONT_CTX *m_ctx); /* Can be null */ BN_MONT_CTX *m_ctx); /* Can be null */
int (*init)(DSA *dsa); int (*init)(DSA *dsa);
int (*finish)(DSA *dsa); int (*finish)(DSA *dsa);
int flags; int flags;
char *app_data; char *app_data;
/* If this is non-NULL, it is used to generate DSA parameters */ /* If this is non-NULL, it is used to generate DSA parameters */
int (*dsa_paramgen)(DSA *dsa, int bits, int (*dsa_paramgen)(DSA *dsa, int bits,
unsigned char *seed, int seed_len, unsigned char *seed, int seed_len,
int *counter_ret, unsigned long *h_ret, int *counter_ret, unsigned long *h_ret,
BN_GENCB *cb); BN_GENCB *cb);
/* If this is non-NULL, it is used to generate DSA keys */ /* If this is non-NULL, it is used to generate DSA keys */
int (*dsa_keygen)(DSA *dsa); int (*dsa_keygen)(DSA *dsa);
}; };
struct dsa_st struct dsa_st
{ {
/* This first variable is used to pick up errors where /* This first variable is used to pick up errors where
* a DSA is passed instead of of a EVP_PKEY */ * a DSA is passed instead of of a EVP_PKEY */
int pad; int pad;
long version; long version;
int write_params; int write_params;
BIGNUM *p; BIGNUM *p;
BIGNUM *q; /* == 20 */ BIGNUM *q; /* == 20 */
BIGNUM *g; BIGNUM *g;
BIGNUM *pub_key; /* y public key */ BIGNUM *pub_key; /* y public key */
BIGNUM *priv_key; /* x private key */ BIGNUM *priv_key; /* x private key */
BIGNUM *kinv; /* Signing pre-calc */ BIGNUM *kinv; /* Signing pre-calc */
BIGNUM *r; /* Signing pre-calc */ BIGNUM *r; /* Signing pre-calc */
int flags; int flags;
/* Normally used to cache montgomery values */ /* Normally used to cache montgomery values */
BN_MONT_CTX *method_mont_p; BN_MONT_CTX *method_mont_p;
int references; int references;
CRYPTO_EX_DATA ex_data; CRYPTO_EX_DATA ex_data;
const DSA_METHOD *meth; const DSA_METHOD *meth;
/* functional reference if 'meth' is ENGINE-provided */ /* functional reference if 'meth' is ENGINE-provided */
ENGINE *engine; ENGINE *engine;
}; };
#define DSAparams_dup(x) ASN1_dup_of_const(DSA,i2d_DSAparams,d2i_DSAparams,x) #define DSAparams_dup(x) ASN1_dup_of_const(DSA,i2d_DSAparams,d2i_DSAparams,x)
#define d2i_DSAparams_fp(fp,x) (DSA *)ASN1_d2i_fp((char *(*)())DSA_new, \ #define d2i_DSAparams_fp(fp,x) (DSA *)ASN1_d2i_fp((char *(*)())DSA_new, \
(char *(*)())d2i_DSAparams,(fp),(unsigned char **)(x)) (char *(*)())d2i_DSAparams,(fp),(unsigned char **)(x))
#define i2d_DSAparams_fp(fp,x) ASN1_i2d_fp(i2d_DSAparams,(fp), \ #define i2d_DSAparams_fp(fp,x) ASN1_i2d_fp(i2d_DSAparams,(fp), \
(unsigned char *)(x)) (unsigned char *)(x))
#define d2i_DSAparams_bio(bp,x) ASN1_d2i_bio_of(DSA,DSA_new,d2i_DSAparams,bp,x) #define d2i_DSAparams_bio(bp,x) ASN1_d2i_bio_of(DSA,DSA_new,d2i_DSAparams,bp,x)
#define i2d_DSAparams_bio(bp,x) ASN1_i2d_bio_of_const(DSA,i2d_DSAparams,bp,x) #define i2d_DSAparams_bio(bp,x) ASN1_i2d_bio_of_const(DSA,i2d_DSAparams,bp,x)
DSA_SIG * DSA_SIG_new(void); DSA_SIG * DSA_SIG_new(void);
void DSA_SIG_free(DSA_SIG *a); void DSA_SIG_free(DSA_SIG *a);
int i2d_DSA_SIG(const DSA_SIG *a, unsigned char **pp); int i2d_DSA_SIG(const DSA_SIG *a, unsigned char **pp);
DSA_SIG * d2i_DSA_SIG(DSA_SIG **v, const unsigned char **pp, long length); DSA_SIG * d2i_DSA_SIG(DSA_SIG **v, const unsigned char **pp, long length);
DSA_SIG * DSA_do_sign(const unsigned char *dgst,int dlen,DSA *dsa); DSA_SIG * DSA_do_sign(const unsigned char *dgst,int dlen,DSA *dsa);
int DSA_do_verify(const unsigned char *dgst,int dgst_len, int DSA_do_verify(const unsigned char *dgst,int dgst_len,
DSA_SIG *sig,DSA *dsa); DSA_SIG *sig,DSA *dsa);
const DSA_METHOD *DSA_OpenSSL(void); const DSA_METHOD *DSA_OpenSSL(void);
void DSA_set_default_method(const DSA_METHOD *); void DSA_set_default_method(const DSA_METHOD *);
const DSA_METHOD *DSA_get_default_method(void); const DSA_METHOD *DSA_get_default_method(void);
int DSA_set_method(DSA *dsa, const DSA_METHOD *); int DSA_set_method(DSA *dsa, const DSA_METHOD *);
DSA * DSA_new(void); #ifdef OPENSSL_FIPS
DSA * DSA_new_method(ENGINE *engine); DSA * FIPS_dsa_new(void);
void DSA_free (DSA *r); void FIPS_dsa_free (DSA *r);
#endif
DSA * DSA_new(void);
DSA * DSA_new_method(ENGINE *engine);
void DSA_free (DSA *r);
/* "up" the DSA object's reference count */ /* "up" the DSA object's reference count */
int DSA_up_ref(DSA *r); int DSA_up_ref(DSA *r);
int DSA_size(const DSA *); int DSA_size(const DSA *);
/* next 4 return -1 on error */ /* next 4 return -1 on error */
int DSA_sign_setup( DSA *dsa,BN_CTX *ctx_in,BIGNUM **kinvp,BIGNUM **rp); int DSA_sign_setup( DSA *dsa,BN_CTX *ctx_in,BIGNUM **kinvp,BIGNUM **rp);
int DSA_sign(int type,const unsigned char *dgst,int dlen, int DSA_sign(int type,const unsigned char *dgst,int dlen,
unsigned char *sig, unsigned int *siglen, DSA *dsa); unsigned char *sig, unsigned int *siglen, DSA *dsa);
int DSA_verify(int type,const unsigned char *dgst,int dgst_len, int DSA_verify(int type,const unsigned char *dgst,int dgst_len,
const unsigned char *sigbuf, int siglen, DSA *dsa); const unsigned char *sigbuf, int siglen, DSA *dsa);
int DSA_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func, int DSA_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func,
CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func); CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func);
int DSA_set_ex_data(DSA *d, int idx, void *arg); int DSA_set_ex_data(DSA *d, int idx, void *arg);
void *DSA_get_ex_data(DSA *d, int idx); void *DSA_get_ex_data(DSA *d, int idx);
DSA * d2i_DSAPublicKey(DSA **a, const unsigned char **pp, long length); DSA * d2i_DSAPublicKey(DSA **a, const unsigned char **pp, long length);
DSA * d2i_DSAPrivateKey(DSA **a, const unsigned char **pp, long length); DSA * d2i_DSAPrivateKey(DSA **a, const unsigned char **pp, long length);
DSA * d2i_DSAparams(DSA **a, const unsigned char **pp, long length); DSA * d2i_DSAparams(DSA **a, const unsigned char **pp, long length);
/* Deprecated version */ /* Deprecated version */
#ifndef OPENSSL_NO_DEPRECATED #ifndef OPENSSL_NO_DEPRECATED
DSA * DSA_generate_parameters(int bits, DSA * DSA_generate_parameters(int bits,
unsigned char *seed,int seed_len, unsigned char *seed,int seed_len,
int *counter_ret, unsigned long *h_ret,void int *counter_ret, unsigned long *h_ret,void
(*callback)(int, int, void *),void *cb_arg); (*callback)(int, int, void *),void *cb_arg);
#endif /* !defined(OPENSSL_NO_DEPRECATED) */ #endif /* !defined(OPENSSL_NO_DEPRECATED) */
/* New version */ /* New version */
int DSA_generate_parameters_ex(DSA *dsa, int bits, int DSA_generate_parameters_ex(DSA *dsa, int bits,
unsigned char *seed,int seed_len, unsigned char *seed,int seed_len,
int *counter_ret, unsigned long *h_ret, BN_GENCB *cb); int *counter_ret, unsigned long *h_ret, BN_GENCB *cb);
int DSA_generate_key(DSA *a); int DSA_generate_key(DSA *a);
int i2d_DSAPublicKey(const DSA *a, unsigned char **pp); int i2d_DSAPublicKey(const DSA *a, unsigned char **pp);
int i2d_DSAPrivateKey(const DSA *a, unsigned char **pp); int i2d_DSAPrivateKey(const DSA *a, unsigned char **pp);
int i2d_DSAparams(const DSA *a,unsigned char **pp); int i2d_DSAparams(const DSA *a,unsigned char **pp);
#ifndef OPENSSL_NO_BIO #ifndef OPENSSL_NO_BIO
int DSAparams_print(BIO *bp, const DSA *x); int DSAparams_print(BIO *bp, const DSA *x);
int DSA_print(BIO *bp, const DSA *x, int off); int DSA_print(BIO *bp, const DSA *x, int off);
#endif #endif
#ifndef OPENSSL_NO_FP_API #ifndef OPENSSL_NO_FP_API
int DSAparams_print_fp(FILE *fp, const DSA *x); int DSAparams_print_fp(FILE *fp, const DSA *x);
int DSA_print_fp(FILE *bp, const DSA *x, int off); int DSA_print_fp(FILE *bp, const DSA *x, int off);
#endif #endif
#define DSS_prime_checks 50 #define DSS_prime_checks 50
/* Primality test according to FIPS PUB 186[-1], Appendix 2.1: /* Primality test according to FIPS PUB 186[-1], Appendix 2.1:
* 50 rounds of Rabin-Miller */ * 50 rounds of Rabin-Miller */
#define DSA_is_prime(n, callback, cb_arg) \ #define DSA_is_prime(n, callback, cb_arg) \
BN_is_prime(n, DSS_prime_checks, callback, NULL, cb_arg) BN_is_prime(n, DSS_prime_checks, callback, NULL, cb_arg)
#ifndef OPENSSL_NO_DH #ifndef OPENSSL_NO_DH
/* Convert DSA structure (key or just parameters) into DH structure /* Convert DSA structure (key or just parameters) into DH structure
@@ -249,6 +275,11 @@ int DSA_print_fp(FILE *bp, const DSA *x, int off);
DH *DSA_dup_DH(const DSA *r); DH *DSA_dup_DH(const DSA *r);
#endif #endif
#ifdef OPENSSL_FIPS
int FIPS_dsa_sig_encode(unsigned char *out, DSA_SIG *sig);
int FIPS_dsa_sig_decode(DSA_SIG *sig, const unsigned char *in, int inlen);
#endif
/* BEGIN ERROR CODES */ /* BEGIN ERROR CODES */
/* The following lines are auto generated by the script mkerr.pl. Any changes /* The following lines are auto generated by the script mkerr.pl. Any changes
* made after this point may be overwritten when the script is next run. * made after this point may be overwritten when the script is next run.
@@ -258,29 +289,36 @@ void ERR_load_DSA_strings(void);
/* Error codes for the DSA functions. */ /* Error codes for the DSA functions. */
/* Function codes. */ /* Function codes. */
#define DSA_F_D2I_DSA_SIG 110 #define DSA_F_D2I_DSA_SIG 110
#define DSA_F_DSAPARAMS_PRINT 100 #define DSA_F_DSAPARAMS_PRINT 100
#define DSA_F_DSAPARAMS_PRINT_FP 101 #define DSA_F_DSAPARAMS_PRINT_FP 101
#define DSA_F_DSA_DO_SIGN 112 #define DSA_F_DSA_BUILTIN_KEYGEN 119
#define DSA_F_DSA_DO_VERIFY 113 #define DSA_F_DSA_BUILTIN_PARAMGEN 118
#define DSA_F_DSA_NEW_METHOD 103 #define DSA_F_DSA_DO_SIGN 112
#define DSA_F_DSA_PRINT 104 #define DSA_F_DSA_DO_VERIFY 113
#define DSA_F_DSA_PRINT_FP 105 #define DSA_F_DSA_GENERATE_PARAMETERS 117
#define DSA_F_DSA_SIGN 106 #define DSA_F_DSA_NEW_METHOD 103
#define DSA_F_DSA_SIGN_SETUP 107 #define DSA_F_DSA_PRINT 104
#define DSA_F_DSA_SIG_NEW 109 #define DSA_F_DSA_PRINT_FP 105
#define DSA_F_DSA_VERIFY 108 #define DSA_F_DSA_SET_DEFAULT_METHOD 115
#define DSA_F_I2D_DSA_SIG 111 #define DSA_F_DSA_SET_METHOD 116
#define DSA_F_SIG_CB 114 #define DSA_F_DSA_SIGN 106
#define DSA_F_DSA_SIGN_SETUP 107
#define DSA_F_DSA_SIG_NEW 109
#define DSA_F_DSA_VERIFY 108
#define DSA_F_I2D_DSA_SIG 111
#define DSA_F_SIG_CB 114
/* Reason codes. */ /* Reason codes. */
#define DSA_R_BAD_Q_VALUE 102 #define DSA_R_BAD_Q_VALUE 102
#define DSA_R_DATA_TOO_LARGE_FOR_KEY_SIZE 100 #define DSA_R_DATA_TOO_LARGE_FOR_KEY_SIZE 100
#define DSA_R_MISSING_PARAMETERS 101 #define DSA_R_KEY_SIZE_TOO_SMALL 106
#define DSA_R_MODULUS_TOO_LARGE 103 #define DSA_R_MISSING_PARAMETERS 101
#define DSA_R_MODULUS_TOO_LARGE 103
#define DSA_R_NON_FIPS_METHOD 104
#define DSA_R_OPERATION_NOT_ALLOWED_IN_FIPS_MODE 105
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif #endif
dep/include/openssl/dtls1.h
+88 -83
View File
@@ -67,11 +67,13 @@
extern "C" { extern "C" {
#endif #endif
#define DTLS1_VERSION 0x0100 #define DTLS1_VERSION 0xFEFF
#define DTLS1_VERSION_MAJOR 0x01 #define DTLS1_BAD_VER 0x0100
#define DTLS1_VERSION_MINOR 0x00
#if 0
/* this alert description is not specified anywhere... */
#define DTLS1_AD_MISSING_HANDSHAKE_MESSAGE 110 #define DTLS1_AD_MISSING_HANDSHAKE_MESSAGE 110
#endif
/* lengths of messages */ /* lengths of messages */
#define DTLS1_COOKIE_LENGTH 32 #define DTLS1_COOKIE_LENGTH 32
@@ -83,120 +85,124 @@ extern "C" {
#define DTLS1_HM_BAD_FRAGMENT -2 #define DTLS1_HM_BAD_FRAGMENT -2
#define DTLS1_HM_FRAGMENT_RETRY -3 #define DTLS1_HM_FRAGMENT_RETRY -3
#define DTLS1_CCS_HEADER_LENGTH 3 #define DTLS1_CCS_HEADER_LENGTH 1
#ifdef DTLS1_AD_MISSING_HANDSHAKE_MESSAGE
#define DTLS1_AL_HEADER_LENGTH 7 #define DTLS1_AL_HEADER_LENGTH 7
#else
#define DTLS1_AL_HEADER_LENGTH 2
#endif
typedef struct dtls1_bitmap_st typedef struct dtls1_bitmap_st
{ {
PQ_64BIT map; PQ_64BIT map;
unsigned long length; /* sizeof the bitmap in bits */ unsigned long length; /* sizeof the bitmap in bits */
PQ_64BIT max_seq_num; /* max record number seen so far */ PQ_64BIT max_seq_num; /* max record number seen so far */
} DTLS1_BITMAP; } DTLS1_BITMAP;
struct hm_header_st struct hm_header_st
{ {
unsigned char type; unsigned char type;
unsigned long msg_len; unsigned long msg_len;
unsigned short seq; unsigned short seq;
unsigned long frag_off; unsigned long frag_off;
unsigned long frag_len; unsigned long frag_len;
unsigned int is_ccs; unsigned int is_ccs;
}; };
struct ccs_header_st struct ccs_header_st
{ {
unsigned char type; unsigned char type;
unsigned short seq; unsigned short seq;
}; };
struct dtls1_timeout_st struct dtls1_timeout_st
{ {
/* Number of read timeouts so far */ /* Number of read timeouts so far */
unsigned int read_timeouts; unsigned int read_timeouts;
/* Number of write timeouts so far */ /* Number of write timeouts so far */
unsigned int write_timeouts; unsigned int write_timeouts;
/* Number of alerts received so far */ /* Number of alerts received so far */
unsigned int num_alerts; unsigned int num_alerts;
}; };
typedef struct record_pqueue_st typedef struct record_pqueue_st
{ {
unsigned short epoch; unsigned short epoch;
pqueue q; pqueue q;
} record_pqueue; } record_pqueue;
typedef struct hm_fragment_st typedef struct hm_fragment_st
{ {
struct hm_header_st msg_header; struct hm_header_st msg_header;
unsigned char *fragment; unsigned char *fragment;
} hm_fragment; } hm_fragment;
typedef struct dtls1_state_st typedef struct dtls1_state_st
{ {
unsigned int send_cookie; unsigned int send_cookie;
unsigned char cookie[DTLS1_COOKIE_LENGTH]; unsigned char cookie[DTLS1_COOKIE_LENGTH];
unsigned char rcvd_cookie[DTLS1_COOKIE_LENGTH]; unsigned char rcvd_cookie[DTLS1_COOKIE_LENGTH];
unsigned int cookie_len; unsigned int cookie_len;
/* /*
* The current data and handshake epoch. This is initially * The current data and handshake epoch. This is initially
* undefined, and starts at zero once the initial handshake is * undefined, and starts at zero once the initial handshake is
* completed * completed
*/ */
unsigned short r_epoch; unsigned short r_epoch;
unsigned short w_epoch; unsigned short w_epoch;
/* records being received in the current epoch */ /* records being received in the current epoch */
DTLS1_BITMAP bitmap; DTLS1_BITMAP bitmap;
/* renegotiation starts a new set of sequence numbers */ /* renegotiation starts a new set of sequence numbers */
DTLS1_BITMAP next_bitmap; DTLS1_BITMAP next_bitmap;
/* handshake message numbers */ /* handshake message numbers */
unsigned short handshake_write_seq; unsigned short handshake_write_seq;
unsigned short next_handshake_write_seq; unsigned short next_handshake_write_seq;
unsigned short handshake_read_seq; unsigned short handshake_read_seq;
/* Received handshake records (processed and unprocessed) */ /* Received handshake records (processed and unprocessed) */
record_pqueue unprocessed_rcds; record_pqueue unprocessed_rcds;
record_pqueue processed_rcds; record_pqueue processed_rcds;
/* Buffered handshake messages */ /* Buffered handshake messages */
pqueue buffered_messages; pqueue buffered_messages;
/* Buffered (sent) handshake records */ /* Buffered (sent) handshake records */
pqueue sent_messages; pqueue sent_messages;
unsigned int mtu; /* max wire packet size */ unsigned int mtu; /* max wire packet size */
struct hm_header_st w_msg_hdr; struct hm_header_st w_msg_hdr;
struct hm_header_st r_msg_hdr; struct hm_header_st r_msg_hdr;
struct dtls1_timeout_st timeout; struct dtls1_timeout_st timeout;
/* storage for Alert/Handshake protocol data received but not /* storage for Alert/Handshake protocol data received but not
* yet processed by ssl3_read_bytes: */ * yet processed by ssl3_read_bytes: */
unsigned char alert_fragment[DTLS1_AL_HEADER_LENGTH]; unsigned char alert_fragment[DTLS1_AL_HEADER_LENGTH];
unsigned int alert_fragment_len; unsigned int alert_fragment_len;
unsigned char handshake_fragment[DTLS1_HM_HEADER_LENGTH]; unsigned char handshake_fragment[DTLS1_HM_HEADER_LENGTH];
unsigned int handshake_fragment_len; unsigned int handshake_fragment_len;
unsigned int retransmitting; unsigned int retransmitting;
} DTLS1_STATE; } DTLS1_STATE;
typedef struct dtls1_record_data_st typedef struct dtls1_record_data_st
{ {
unsigned char *packet; unsigned char *packet;
unsigned int packet_length; unsigned int packet_length;
SSL3_BUFFER rbuf; SSL3_BUFFER rbuf;
SSL3_RECORD rrec; SSL3_RECORD rrec;
} DTLS1_RECORD_DATA; } DTLS1_RECORD_DATA;
/* Timeout multipliers (timeout slice is defined in apps/timeouts.h */ /* Timeout multipliers (timeout slice is defined in apps/timeouts.h */
@@ -210,4 +216,3 @@ typedef struct dtls1_record_data_st
#endif #endif
#endif #endif
dep/include/openssl/ec.h
+180 -180
View File
@@ -98,25 +98,25 @@ extern "C" {
#endif #endif
typedef enum { typedef enum {
/* values as defined in X9.62 (ECDSA) and elsewhere */ /* values as defined in X9.62 (ECDSA) and elsewhere */
POINT_CONVERSION_COMPRESSED = 2, POINT_CONVERSION_COMPRESSED = 2,
POINT_CONVERSION_UNCOMPRESSED = 4, POINT_CONVERSION_UNCOMPRESSED = 4,
POINT_CONVERSION_HYBRID = 6 POINT_CONVERSION_HYBRID = 6
} point_conversion_form_t; } point_conversion_form_t;
typedef struct ec_method_st EC_METHOD; typedef struct ec_method_st EC_METHOD;
typedef struct ec_group_st typedef struct ec_group_st
/* /*
EC_METHOD *meth; EC_METHOD *meth;
-- field definition -- field definition
-- curve coefficients -- curve coefficients
-- optional generator with associated information (order, cofactor) -- optional generator with associated information (order, cofactor)
-- optional extra data (precomputed table for fast computation of multiples of generator) -- optional extra data (precomputed table for fast computation of multiples of generator)
-- ASN1 stuff -- ASN1 stuff
*/ */
EC_GROUP; EC_GROUP;
typedef struct ec_point_st EC_POINT; typedef struct ec_point_st EC_POINT;
@@ -187,9 +187,9 @@ EC_GROUP *EC_GROUP_new_curve_GF2m(const BIGNUM *p, const BIGNUM *a, const BIGNUM
EC_GROUP *EC_GROUP_new_by_curve_name(int nid); EC_GROUP *EC_GROUP_new_by_curve_name(int nid);
/* handling of internal curves */ /* handling of internal curves */
typedef struct { typedef struct {
int nid; int nid;
const char *comment; const char *comment;
} EC_builtin_curve; } EC_builtin_curve;
/* EC_builtin_curves(EC_builtin_curve *r, size_t size) returns number /* EC_builtin_curves(EC_builtin_curve *r, size_t size) returns number
* of all available curves or zero if a error occurred. * of all available curves or zero if a error occurred.
* In case r ist not zero nitems EC_builtin_curve structures * In case r ist not zero nitems EC_builtin_curve structures
@@ -209,22 +209,22 @@ const EC_METHOD *EC_POINT_method_of(const EC_POINT *);
int EC_POINT_set_to_infinity(const EC_GROUP *, EC_POINT *); int EC_POINT_set_to_infinity(const EC_GROUP *, EC_POINT *);
int EC_POINT_set_Jprojective_coordinates_GFp(const EC_GROUP *, EC_POINT *, int EC_POINT_set_Jprojective_coordinates_GFp(const EC_GROUP *, EC_POINT *,
const BIGNUM *x, const BIGNUM *y, const BIGNUM *z, BN_CTX *); const BIGNUM *x, const BIGNUM *y, const BIGNUM *z, BN_CTX *);
int EC_POINT_get_Jprojective_coordinates_GFp(const EC_GROUP *, const EC_POINT *, int EC_POINT_get_Jprojective_coordinates_GFp(const EC_GROUP *, const EC_POINT *,
BIGNUM *x, BIGNUM *y, BIGNUM *z, BN_CTX *); BIGNUM *x, BIGNUM *y, BIGNUM *z, BN_CTX *);
int EC_POINT_set_affine_coordinates_GFp(const EC_GROUP *, EC_POINT *, int EC_POINT_set_affine_coordinates_GFp(const EC_GROUP *, EC_POINT *,
const BIGNUM *x, const BIGNUM *y, BN_CTX *); const BIGNUM *x, const BIGNUM *y, BN_CTX *);
int EC_POINT_get_affine_coordinates_GFp(const EC_GROUP *, const EC_POINT *, int EC_POINT_get_affine_coordinates_GFp(const EC_GROUP *, const EC_POINT *,
BIGNUM *x, BIGNUM *y, BN_CTX *); BIGNUM *x, BIGNUM *y, BN_CTX *);
int EC_POINT_set_compressed_coordinates_GFp(const EC_GROUP *, EC_POINT *, int EC_POINT_set_compressed_coordinates_GFp(const EC_GROUP *, EC_POINT *,
const BIGNUM *x, int y_bit, BN_CTX *); const BIGNUM *x, int y_bit, BN_CTX *);
int EC_POINT_set_affine_coordinates_GF2m(const EC_GROUP *, EC_POINT *, int EC_POINT_set_affine_coordinates_GF2m(const EC_GROUP *, EC_POINT *,
const BIGNUM *x, const BIGNUM *y, BN_CTX *); const BIGNUM *x, const BIGNUM *y, BN_CTX *);
int EC_POINT_get_affine_coordinates_GF2m(const EC_GROUP *, const EC_POINT *, int EC_POINT_get_affine_coordinates_GF2m(const EC_GROUP *, const EC_POINT *,
BIGNUM *x, BIGNUM *y, BN_CTX *); BIGNUM *x, BIGNUM *y, BN_CTX *);
int EC_POINT_set_compressed_coordinates_GF2m(const EC_GROUP *, EC_POINT *, int EC_POINT_set_compressed_coordinates_GF2m(const EC_GROUP *, EC_POINT *,
const BIGNUM *x, int y_bit, BN_CTX *); const BIGNUM *x, int y_bit, BN_CTX *);
size_t EC_POINT_point2oct(const EC_GROUP *, const EC_POINT *, point_conversion_form_t form, size_t EC_POINT_point2oct(const EC_GROUP *, const EC_POINT *, point_conversion_form_t form,
unsigned char *buf, size_t len, BN_CTX *); unsigned char *buf, size_t len, BN_CTX *);
@@ -233,13 +233,13 @@ int EC_POINT_oct2point(const EC_GROUP *, EC_POINT *,
/* other interfaces to point2oct/oct2point: */ /* other interfaces to point2oct/oct2point: */
BIGNUM *EC_POINT_point2bn(const EC_GROUP *, const EC_POINT *, BIGNUM *EC_POINT_point2bn(const EC_GROUP *, const EC_POINT *,
point_conversion_form_t form, BIGNUM *, BN_CTX *); point_conversion_form_t form, BIGNUM *, BN_CTX *);
EC_POINT *EC_POINT_bn2point(const EC_GROUP *, const BIGNUM *, EC_POINT *EC_POINT_bn2point(const EC_GROUP *, const BIGNUM *,
EC_POINT *, BN_CTX *); EC_POINT *, BN_CTX *);
char *EC_POINT_point2hex(const EC_GROUP *, const EC_POINT *, char *EC_POINT_point2hex(const EC_GROUP *, const EC_POINT *,
point_conversion_form_t form, BN_CTX *); point_conversion_form_t form, BN_CTX *);
EC_POINT *EC_POINT_hex2point(const EC_GROUP *, const char *, EC_POINT *EC_POINT_hex2point(const EC_GROUP *, const char *,
EC_POINT *, BN_CTX *); EC_POINT *, BN_CTX *);
int EC_POINT_add(const EC_GROUP *, EC_POINT *r, const EC_POINT *a, const EC_POINT *b, BN_CTX *); int EC_POINT_add(const EC_GROUP *, EC_POINT *r, const EC_POINT *a, const EC_POINT *b, BN_CTX *);
int EC_POINT_dbl(const EC_GROUP *, EC_POINT *r, const EC_POINT *a, BN_CTX *); int EC_POINT_dbl(const EC_GROUP *, EC_POINT *r, const EC_POINT *a, BN_CTX *);
@@ -270,9 +270,9 @@ int EC_GROUP_have_precompute_mult(const EC_GROUP *);
int EC_GROUP_get_basis_type(const EC_GROUP *); int EC_GROUP_get_basis_type(const EC_GROUP *);
int EC_GROUP_get_trinomial_basis(const EC_GROUP *, unsigned int *k); int EC_GROUP_get_trinomial_basis(const EC_GROUP *, unsigned int *k);
int EC_GROUP_get_pentanomial_basis(const EC_GROUP *, unsigned int *k1, int EC_GROUP_get_pentanomial_basis(const EC_GROUP *, unsigned int *k1,
unsigned int *k2, unsigned int *k3); unsigned int *k2, unsigned int *k3);
#define OPENSSL_EC_NAMED_CURVE 0x001 #define OPENSSL_EC_NAMED_CURVE 0x001
typedef struct ecpk_parameters_st ECPKPARAMETERS; typedef struct ecpk_parameters_st ECPKPARAMETERS;
@@ -284,7 +284,7 @@ int i2d_ECPKParameters(const EC_GROUP *, unsigned char **out);
#define d2i_ECPKParameters_fp(fp,x) (EC_GROUP *)ASN1_d2i_fp(NULL, \ #define d2i_ECPKParameters_fp(fp,x) (EC_GROUP *)ASN1_d2i_fp(NULL, \
(char *(*)())d2i_ECPKParameters,(fp),(unsigned char **)(x)) (char *(*)())d2i_ECPKParameters,(fp),(unsigned char **)(x))
#define i2d_ECPKParameters_fp(fp,x) ASN1_i2d_fp(i2d_ECPKParameters,(fp), \ #define i2d_ECPKParameters_fp(fp,x) ASN1_i2d_fp(i2d_ECPKParameters,(fp), \
(unsigned char *)(x)) (unsigned char *)(x))
#ifndef OPENSSL_NO_BIO #ifndef OPENSSL_NO_BIO
int ECPKParameters_print(BIO *bp, const EC_GROUP *x, int off); int ECPKParameters_print(BIO *bp, const EC_GROUP *x, int off);
@@ -297,8 +297,8 @@ int ECPKParameters_print_fp(FILE *fp, const EC_GROUP *x, int off);
typedef struct ec_key_st EC_KEY; typedef struct ec_key_st EC_KEY;
/* some values for the encoding_flag */ /* some values for the encoding_flag */
#define EC_PKEY_NO_PARAMETERS 0x001 #define EC_PKEY_NO_PARAMETERS 0x001
#define EC_PKEY_NO_PUBKEY 0x002 #define EC_PKEY_NO_PUBKEY 0x002
EC_KEY *EC_KEY_new(void); EC_KEY *EC_KEY_new(void);
EC_KEY *EC_KEY_new_by_curve_name(int nid); EC_KEY *EC_KEY_new_by_curve_name(int nid);
@@ -320,9 +320,9 @@ point_conversion_form_t EC_KEY_get_conv_form(const EC_KEY *);
void EC_KEY_set_conv_form(EC_KEY *, point_conversion_form_t); void EC_KEY_set_conv_form(EC_KEY *, point_conversion_form_t);
/* functions to set/get method specific data */ /* functions to set/get method specific data */
void *EC_KEY_get_key_method_data(EC_KEY *, void *EC_KEY_get_key_method_data(EC_KEY *,
void *(*dup_func)(void *), void (*free_func)(void *), void (*clear_free_func)(void *)); void *(*dup_func)(void *), void (*free_func)(void *), void (*clear_free_func)(void *));
void EC_KEY_insert_key_method_data(EC_KEY *, void *data, void EC_KEY_insert_key_method_data(EC_KEY *, void *data,
void *(*dup_func)(void *), void (*free_func)(void *), void (*clear_free_func)(void *)); void *(*dup_func)(void *), void (*free_func)(void *), void (*clear_free_func)(void *));
/* wrapper functions for the underlying EC_GROUP object */ /* wrapper functions for the underlying EC_GROUP object */
void EC_KEY_set_asn1_flag(EC_KEY *, int); void EC_KEY_set_asn1_flag(EC_KEY *, int);
int EC_KEY_precompute_mult(EC_KEY *, BN_CTX *ctx); int EC_KEY_precompute_mult(EC_KEY *, BN_CTX *ctx);
@@ -344,12 +344,12 @@ EC_KEY *o2i_ECPublicKey(EC_KEY **a, const unsigned char **in, long len);
int i2o_ECPublicKey(EC_KEY *a, unsigned char **out); int i2o_ECPublicKey(EC_KEY *a, unsigned char **out);
#ifndef OPENSSL_NO_BIO #ifndef OPENSSL_NO_BIO
int ECParameters_print(BIO *bp, const EC_KEY *x); int ECParameters_print(BIO *bp, const EC_KEY *x);
int EC_KEY_print(BIO *bp, const EC_KEY *x, int off); int EC_KEY_print(BIO *bp, const EC_KEY *x, int off);
#endif #endif
#ifndef OPENSSL_NO_FP_API #ifndef OPENSSL_NO_FP_API
int ECParameters_print_fp(FILE *fp, const EC_KEY *x); int ECParameters_print_fp(FILE *fp, const EC_KEY *x);
int EC_KEY_print_fp(FILE *fp, const EC_KEY *x, int off); int EC_KEY_print_fp(FILE *fp, const EC_KEY *x, int off);
#endif #endif
#define ECParameters_dup(x) ASN1_dup_of(EC_KEY,i2d_ECParameters,d2i_ECParameters,x) #define ECParameters_dup(x) ASN1_dup_of(EC_KEY,i2d_ECParameters,d2i_ECParameters,x)
@@ -371,156 +371,156 @@ void ERR_load_EC_strings(void);
/* Error codes for the EC functions. */ /* Error codes for the EC functions. */
/* Function codes. */ /* Function codes. */
#define EC_F_COMPUTE_WNAF 143 #define EC_F_COMPUTE_WNAF 143
#define EC_F_D2I_ECPARAMETERS 144 #define EC_F_D2I_ECPARAMETERS 144
#define EC_F_D2I_ECPKPARAMETERS 145 #define EC_F_D2I_ECPKPARAMETERS 145
#define EC_F_D2I_ECPRIVATEKEY 146 #define EC_F_D2I_ECPRIVATEKEY 146
#define EC_F_ECPARAMETERS_PRINT 147 #define EC_F_ECPARAMETERS_PRINT 147
#define EC_F_ECPARAMETERS_PRINT_FP 148 #define EC_F_ECPARAMETERS_PRINT_FP 148
#define EC_F_ECPKPARAMETERS_PRINT 149 #define EC_F_ECPKPARAMETERS_PRINT 149
#define EC_F_ECPKPARAMETERS_PRINT_FP 150 #define EC_F_ECPKPARAMETERS_PRINT_FP 150
#define EC_F_ECP_NIST_MOD_192 203 #define EC_F_ECP_NIST_MOD_192 203
#define EC_F_ECP_NIST_MOD_224 204 #define EC_F_ECP_NIST_MOD_224 204
#define EC_F_ECP_NIST_MOD_256 205 #define EC_F_ECP_NIST_MOD_256 205
#define EC_F_ECP_NIST_MOD_521 206 #define EC_F_ECP_NIST_MOD_521 206
#define EC_F_EC_ASN1_GROUP2CURVE 153 #define EC_F_EC_ASN1_GROUP2CURVE 153
#define EC_F_EC_ASN1_GROUP2FIELDID 154 #define EC_F_EC_ASN1_GROUP2FIELDID 154
#define EC_F_EC_ASN1_GROUP2PARAMETERS 155 #define EC_F_EC_ASN1_GROUP2PARAMETERS 155
#define EC_F_EC_ASN1_GROUP2PKPARAMETERS 156 #define EC_F_EC_ASN1_GROUP2PKPARAMETERS 156
#define EC_F_EC_ASN1_PARAMETERS2GROUP 157 #define EC_F_EC_ASN1_PARAMETERS2GROUP 157
#define EC_F_EC_ASN1_PKPARAMETERS2GROUP 158 #define EC_F_EC_ASN1_PKPARAMETERS2GROUP 158
#define EC_F_EC_EX_DATA_SET_DATA 211 #define EC_F_EC_EX_DATA_SET_DATA 211
#define EC_F_EC_GF2M_MONTGOMERY_POINT_MULTIPLY 208 #define EC_F_EC_GF2M_MONTGOMERY_POINT_MULTIPLY 208
#define EC_F_EC_GF2M_SIMPLE_GROUP_CHECK_DISCRIMINANT 159 #define EC_F_EC_GF2M_SIMPLE_GROUP_CHECK_DISCRIMINANT 159
#define EC_F_EC_GF2M_SIMPLE_GROUP_SET_CURVE 195 #define EC_F_EC_GF2M_SIMPLE_GROUP_SET_CURVE 195
#define EC_F_EC_GF2M_SIMPLE_OCT2POINT 160 #define EC_F_EC_GF2M_SIMPLE_OCT2POINT 160
#define EC_F_EC_GF2M_SIMPLE_POINT2OCT 161 #define EC_F_EC_GF2M_SIMPLE_POINT2OCT 161
#define EC_F_EC_GF2M_SIMPLE_POINT_GET_AFFINE_COORDINATES 162 #define EC_F_EC_GF2M_SIMPLE_POINT_GET_AFFINE_COORDINATES 162
#define EC_F_EC_GF2M_SIMPLE_POINT_SET_AFFINE_COORDINATES 163 #define EC_F_EC_GF2M_SIMPLE_POINT_SET_AFFINE_COORDINATES 163
#define EC_F_EC_GF2M_SIMPLE_SET_COMPRESSED_COORDINATES 164 #define EC_F_EC_GF2M_SIMPLE_SET_COMPRESSED_COORDINATES 164
#define EC_F_EC_GFP_MONT_FIELD_DECODE 133 #define EC_F_EC_GFP_MONT_FIELD_DECODE 133
#define EC_F_EC_GFP_MONT_FIELD_ENCODE 134 #define EC_F_EC_GFP_MONT_FIELD_ENCODE 134
#define EC_F_EC_GFP_MONT_FIELD_MUL 131 #define EC_F_EC_GFP_MONT_FIELD_MUL 131
#define EC_F_EC_GFP_MONT_FIELD_SET_TO_ONE 209 #define EC_F_EC_GFP_MONT_FIELD_SET_TO_ONE 209
#define EC_F_EC_GFP_MONT_FIELD_SQR 132 #define EC_F_EC_GFP_MONT_FIELD_SQR 132
#define EC_F_EC_GFP_MONT_GROUP_SET_CURVE 189 #define EC_F_EC_GFP_MONT_GROUP_SET_CURVE 189
#define EC_F_EC_GFP_MONT_GROUP_SET_CURVE_GFP 135 #define EC_F_EC_GFP_MONT_GROUP_SET_CURVE_GFP 135
#define EC_F_EC_GFP_NIST_FIELD_MUL 200 #define EC_F_EC_GFP_NIST_FIELD_MUL 200
#define EC_F_EC_GFP_NIST_FIELD_SQR 201 #define EC_F_EC_GFP_NIST_FIELD_SQR 201
#define EC_F_EC_GFP_NIST_GROUP_SET_CURVE 202 #define EC_F_EC_GFP_NIST_GROUP_SET_CURVE 202
#define EC_F_EC_GFP_SIMPLE_GROUP_CHECK_DISCRIMINANT 165 #define EC_F_EC_GFP_SIMPLE_GROUP_CHECK_DISCRIMINANT 165
#define EC_F_EC_GFP_SIMPLE_GROUP_SET_CURVE 166 #define EC_F_EC_GFP_SIMPLE_GROUP_SET_CURVE 166
#define EC_F_EC_GFP_SIMPLE_GROUP_SET_CURVE_GFP 100 #define EC_F_EC_GFP_SIMPLE_GROUP_SET_CURVE_GFP 100
#define EC_F_EC_GFP_SIMPLE_GROUP_SET_GENERATOR 101 #define EC_F_EC_GFP_SIMPLE_GROUP_SET_GENERATOR 101
#define EC_F_EC_GFP_SIMPLE_MAKE_AFFINE 102 #define EC_F_EC_GFP_SIMPLE_MAKE_AFFINE 102
#define EC_F_EC_GFP_SIMPLE_OCT2POINT 103 #define EC_F_EC_GFP_SIMPLE_OCT2POINT 103
#define EC_F_EC_GFP_SIMPLE_POINT2OCT 104 #define EC_F_EC_GFP_SIMPLE_POINT2OCT 104
#define EC_F_EC_GFP_SIMPLE_POINTS_MAKE_AFFINE 137 #define EC_F_EC_GFP_SIMPLE_POINTS_MAKE_AFFINE 137
#define EC_F_EC_GFP_SIMPLE_POINT_GET_AFFINE_COORDINATES 167 #define EC_F_EC_GFP_SIMPLE_POINT_GET_AFFINE_COORDINATES 167
#define EC_F_EC_GFP_SIMPLE_POINT_GET_AFFINE_COORDINATES_GFP 105 #define EC_F_EC_GFP_SIMPLE_POINT_GET_AFFINE_COORDINATES_GFP 105
#define EC_F_EC_GFP_SIMPLE_POINT_SET_AFFINE_COORDINATES 168 #define EC_F_EC_GFP_SIMPLE_POINT_SET_AFFINE_COORDINATES 168
#define EC_F_EC_GFP_SIMPLE_POINT_SET_AFFINE_COORDINATES_GFP 128 #define EC_F_EC_GFP_SIMPLE_POINT_SET_AFFINE_COORDINATES_GFP 128
#define EC_F_EC_GFP_SIMPLE_SET_COMPRESSED_COORDINATES 169 #define EC_F_EC_GFP_SIMPLE_SET_COMPRESSED_COORDINATES 169
#define EC_F_EC_GFP_SIMPLE_SET_COMPRESSED_COORDINATES_GFP 129 #define EC_F_EC_GFP_SIMPLE_SET_COMPRESSED_COORDINATES_GFP 129
#define EC_F_EC_GROUP_CHECK 170 #define EC_F_EC_GROUP_CHECK 170
#define EC_F_EC_GROUP_CHECK_DISCRIMINANT 171 #define EC_F_EC_GROUP_CHECK_DISCRIMINANT 171
#define EC_F_EC_GROUP_COPY 106 #define EC_F_EC_GROUP_COPY 106
#define EC_F_EC_GROUP_GET0_GENERATOR 139 #define EC_F_EC_GROUP_GET0_GENERATOR 139
#define EC_F_EC_GROUP_GET_COFACTOR 140 #define EC_F_EC_GROUP_GET_COFACTOR 140
#define EC_F_EC_GROUP_GET_CURVE_GF2M 172 #define EC_F_EC_GROUP_GET_CURVE_GF2M 172
#define EC_F_EC_GROUP_GET_CURVE_GFP 130 #define EC_F_EC_GROUP_GET_CURVE_GFP 130
#define EC_F_EC_GROUP_GET_DEGREE 173 #define EC_F_EC_GROUP_GET_DEGREE 173
#define EC_F_EC_GROUP_GET_ORDER 141 #define EC_F_EC_GROUP_GET_ORDER 141
#define EC_F_EC_GROUP_GET_PENTANOMIAL_BASIS 193 #define EC_F_EC_GROUP_GET_PENTANOMIAL_BASIS 193
#define EC_F_EC_GROUP_GET_TRINOMIAL_BASIS 194 #define EC_F_EC_GROUP_GET_TRINOMIAL_BASIS 194
#define EC_F_EC_GROUP_NEW 108 #define EC_F_EC_GROUP_NEW 108
#define EC_F_EC_GROUP_NEW_BY_CURVE_NAME 174 #define EC_F_EC_GROUP_NEW_BY_CURVE_NAME 174
#define EC_F_EC_GROUP_NEW_FROM_DATA 175 #define EC_F_EC_GROUP_NEW_FROM_DATA 175
#define EC_F_EC_GROUP_PRECOMPUTE_MULT 142 #define EC_F_EC_GROUP_PRECOMPUTE_MULT 142
#define EC_F_EC_GROUP_SET_CURVE_GF2M 176 #define EC_F_EC_GROUP_SET_CURVE_GF2M 176
#define EC_F_EC_GROUP_SET_CURVE_GFP 109 #define EC_F_EC_GROUP_SET_CURVE_GFP 109
#define EC_F_EC_GROUP_SET_EXTRA_DATA 110 #define EC_F_EC_GROUP_SET_EXTRA_DATA 110
#define EC_F_EC_GROUP_SET_GENERATOR 111 #define EC_F_EC_GROUP_SET_GENERATOR 111
#define EC_F_EC_KEY_CHECK_KEY 177 #define EC_F_EC_KEY_CHECK_KEY 177
#define EC_F_EC_KEY_COPY 178 #define EC_F_EC_KEY_COPY 178
#define EC_F_EC_KEY_GENERATE_KEY 179 #define EC_F_EC_KEY_GENERATE_KEY 179
#define EC_F_EC_KEY_NEW 182 #define EC_F_EC_KEY_NEW 182
#define EC_F_EC_KEY_PRINT 180 #define EC_F_EC_KEY_PRINT 180
#define EC_F_EC_KEY_PRINT_FP 181 #define EC_F_EC_KEY_PRINT_FP 181
#define EC_F_EC_POINTS_MAKE_AFFINE 136 #define EC_F_EC_POINTS_MAKE_AFFINE 136
#define EC_F_EC_POINTS_MUL 138 #define EC_F_EC_POINTS_MUL 138
#define EC_F_EC_POINT_ADD 112 #define EC_F_EC_POINT_ADD 112
#define EC_F_EC_POINT_CMP 113 #define EC_F_EC_POINT_CMP 113
#define EC_F_EC_POINT_COPY 114 #define EC_F_EC_POINT_COPY 114
#define EC_F_EC_POINT_DBL 115 #define EC_F_EC_POINT_DBL 115
#define EC_F_EC_POINT_GET_AFFINE_COORDINATES_GF2M 183 #define EC_F_EC_POINT_GET_AFFINE_COORDINATES_GF2M 183
#define EC_F_EC_POINT_GET_AFFINE_COORDINATES_GFP 116 #define EC_F_EC_POINT_GET_AFFINE_COORDINATES_GFP 116
#define EC_F_EC_POINT_GET_JPROJECTIVE_COORDINATES_GFP 117 #define EC_F_EC_POINT_GET_JPROJECTIVE_COORDINATES_GFP 117
#define EC_F_EC_POINT_INVERT 210 #define EC_F_EC_POINT_INVERT 210
#define EC_F_EC_POINT_IS_AT_INFINITY 118 #define EC_F_EC_POINT_IS_AT_INFINITY 118
#define EC_F_EC_POINT_IS_ON_CURVE 119 #define EC_F_EC_POINT_IS_ON_CURVE 119
#define EC_F_EC_POINT_MAKE_AFFINE 120 #define EC_F_EC_POINT_MAKE_AFFINE 120
#define EC_F_EC_POINT_MUL 184 #define EC_F_EC_POINT_MUL 184
#define EC_F_EC_POINT_NEW 121 #define EC_F_EC_POINT_NEW 121
#define EC_F_EC_POINT_OCT2POINT 122 #define EC_F_EC_POINT_OCT2POINT 122
#define EC_F_EC_POINT_POINT2OCT 123 #define EC_F_EC_POINT_POINT2OCT 123
#define EC_F_EC_POINT_SET_AFFINE_COORDINATES_GF2M 185 #define EC_F_EC_POINT_SET_AFFINE_COORDINATES_GF2M 185
#define EC_F_EC_POINT_SET_AFFINE_COORDINATES_GFP 124 #define EC_F_EC_POINT_SET_AFFINE_COORDINATES_GFP 124
#define EC_F_EC_POINT_SET_COMPRESSED_COORDINATES_GF2M 186 #define EC_F_EC_POINT_SET_COMPRESSED_COORDINATES_GF2M 186
#define EC_F_EC_POINT_SET_COMPRESSED_COORDINATES_GFP 125 #define EC_F_EC_POINT_SET_COMPRESSED_COORDINATES_GFP 125
#define EC_F_EC_POINT_SET_JPROJECTIVE_COORDINATES_GFP 126 #define EC_F_EC_POINT_SET_JPROJECTIVE_COORDINATES_GFP 126
#define EC_F_EC_POINT_SET_TO_INFINITY 127 #define EC_F_EC_POINT_SET_TO_INFINITY 127
#define EC_F_EC_PRE_COMP_DUP 207 #define EC_F_EC_PRE_COMP_DUP 207
#define EC_F_EC_WNAF_MUL 187 #define EC_F_EC_PRE_COMP_NEW 196
#define EC_F_EC_WNAF_PRECOMPUTE_MULT 188 #define EC_F_EC_WNAF_MUL 187
#define EC_F_I2D_ECPARAMETERS 190 #define EC_F_EC_WNAF_PRECOMPUTE_MULT 188
#define EC_F_I2D_ECPKPARAMETERS 191 #define EC_F_I2D_ECPARAMETERS 190
#define EC_F_I2D_ECPRIVATEKEY 192 #define EC_F_I2D_ECPKPARAMETERS 191
#define EC_F_I2O_ECPUBLICKEY 151 #define EC_F_I2D_ECPRIVATEKEY 192
#define EC_F_O2I_ECPUBLICKEY 152 #define EC_F_I2O_ECPUBLICKEY 151
#define EC_F_O2I_ECPUBLICKEY 152
/* Reason codes. */ /* Reason codes. */
#define EC_R_ASN1_ERROR 115 #define EC_R_ASN1_ERROR 115
#define EC_R_ASN1_UNKNOWN_FIELD 116 #define EC_R_ASN1_UNKNOWN_FIELD 116
#define EC_R_BUFFER_TOO_SMALL 100 #define EC_R_BUFFER_TOO_SMALL 100
#define EC_R_D2I_ECPKPARAMETERS_FAILURE 117 #define EC_R_D2I_ECPKPARAMETERS_FAILURE 117
#define EC_R_DISCRIMINANT_IS_ZERO 118 #define EC_R_DISCRIMINANT_IS_ZERO 118
#define EC_R_EC_GROUP_NEW_BY_NAME_FAILURE 119 #define EC_R_EC_GROUP_NEW_BY_NAME_FAILURE 119
#define EC_R_FIELD_TOO_LARGE 138 #define EC_R_FIELD_TOO_LARGE 138
#define EC_R_GROUP2PKPARAMETERS_FAILURE 120 #define EC_R_GROUP2PKPARAMETERS_FAILURE 120
#define EC_R_I2D_ECPKPARAMETERS_FAILURE 121 #define EC_R_I2D_ECPKPARAMETERS_FAILURE 121
#define EC_R_INCOMPATIBLE_OBJECTS 101 #define EC_R_INCOMPATIBLE_OBJECTS 101
#define EC_R_INVALID_ARGUMENT 112 #define EC_R_INVALID_ARGUMENT 112
#define EC_R_INVALID_COMPRESSED_POINT 110 #define EC_R_INVALID_COMPRESSED_POINT 110
#define EC_R_INVALID_COMPRESSION_BIT 109 #define EC_R_INVALID_COMPRESSION_BIT 109
#define EC_R_INVALID_ENCODING 102 #define EC_R_INVALID_ENCODING 102
#define EC_R_INVALID_FIELD 103 #define EC_R_INVALID_FIELD 103
#define EC_R_INVALID_FORM 104 #define EC_R_INVALID_FORM 104
#define EC_R_INVALID_GROUP_ORDER 122 #define EC_R_INVALID_GROUP_ORDER 122
#define EC_R_INVALID_PENTANOMIAL_BASIS 132 #define EC_R_INVALID_PENTANOMIAL_BASIS 132
#define EC_R_INVALID_PRIVATE_KEY 123 #define EC_R_INVALID_PRIVATE_KEY 123
#define EC_R_INVALID_TRINOMIAL_BASIS 137 #define EC_R_INVALID_TRINOMIAL_BASIS 137
#define EC_R_MISSING_PARAMETERS 124 #define EC_R_MISSING_PARAMETERS 124
#define EC_R_MISSING_PRIVATE_KEY 125 #define EC_R_MISSING_PRIVATE_KEY 125
#define EC_R_NOT_A_NIST_PRIME 135 #define EC_R_NOT_A_NIST_PRIME 135
#define EC_R_NOT_A_SUPPORTED_NIST_PRIME 136 #define EC_R_NOT_A_SUPPORTED_NIST_PRIME 136
#define EC_R_NOT_IMPLEMENTED 126 #define EC_R_NOT_IMPLEMENTED 126
#define EC_R_NOT_INITIALIZED 111 #define EC_R_NOT_INITIALIZED 111
#define EC_R_NO_FIELD_MOD 133 #define EC_R_NO_FIELD_MOD 133
#define EC_R_PASSED_NULL_PARAMETER 134 #define EC_R_PASSED_NULL_PARAMETER 134
#define EC_R_PKPARAMETERS2GROUP_FAILURE 127 #define EC_R_PKPARAMETERS2GROUP_FAILURE 127
#define EC_R_POINT_AT_INFINITY 106 #define EC_R_POINT_AT_INFINITY 106
#define EC_R_POINT_IS_NOT_ON_CURVE 107 #define EC_R_POINT_IS_NOT_ON_CURVE 107
#define EC_R_SLOT_FULL 108 #define EC_R_SLOT_FULL 108
#define EC_R_UNDEFINED_GENERATOR 113 #define EC_R_UNDEFINED_GENERATOR 113
#define EC_R_UNDEFINED_ORDER 128 #define EC_R_UNDEFINED_ORDER 128
#define EC_R_UNKNOWN_GROUP 129 #define EC_R_UNKNOWN_GROUP 129
#define EC_R_UNKNOWN_ORDER 114 #define EC_R_UNKNOWN_ORDER 114
#define EC_R_UNSUPPORTED_FIELD 131 #define EC_R_UNSUPPORTED_FIELD 131
#define EC_R_WRONG_ORDER 130 #define EC_R_WRONG_ORDER 130
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif #endif
dep/include/openssl/engine.h
+194 -179
View File
@@ -93,6 +93,8 @@
#include <openssl/err.h> #include <openssl/err.h>
#endif #endif
#include <openssl/x509.h>
#include <openssl/ossl_typ.h> #include <openssl/ossl_typ.h>
#include <openssl/symhacks.h> #include <openssl/symhacks.h>
@@ -102,32 +104,32 @@ extern "C" {
/* These flags are used to control combinations of algorithm (methods) /* These flags are used to control combinations of algorithm (methods)
* by bitwise "OR"ing. */ * by bitwise "OR"ing. */
#define ENGINE_METHOD_RSA (unsigned int)0x0001 #define ENGINE_METHOD_RSA (unsigned int)0x0001
#define ENGINE_METHOD_DSA (unsigned int)0x0002 #define ENGINE_METHOD_DSA (unsigned int)0x0002
#define ENGINE_METHOD_DH (unsigned int)0x0004 #define ENGINE_METHOD_DH (unsigned int)0x0004
#define ENGINE_METHOD_RAND (unsigned int)0x0008 #define ENGINE_METHOD_RAND (unsigned int)0x0008
#define ENGINE_METHOD_ECDH (unsigned int)0x0010 #define ENGINE_METHOD_ECDH (unsigned int)0x0010
#define ENGINE_METHOD_ECDSA (unsigned int)0x0020 #define ENGINE_METHOD_ECDSA (unsigned int)0x0020
#define ENGINE_METHOD_CIPHERS (unsigned int)0x0040 #define ENGINE_METHOD_CIPHERS (unsigned int)0x0040
#define ENGINE_METHOD_DIGESTS (unsigned int)0x0080 #define ENGINE_METHOD_DIGESTS (unsigned int)0x0080
#define ENGINE_METHOD_STORE (unsigned int)0x0100 #define ENGINE_METHOD_STORE (unsigned int)0x0100
/* Obvious all-or-nothing cases. */ /* Obvious all-or-nothing cases. */
#define ENGINE_METHOD_ALL (unsigned int)0xFFFF #define ENGINE_METHOD_ALL (unsigned int)0xFFFF
#define ENGINE_METHOD_NONE (unsigned int)0x0000 #define ENGINE_METHOD_NONE (unsigned int)0x0000
/* This(ese) flag(s) controls behaviour of the ENGINE_TABLE mechanism used /* This(ese) flag(s) controls behaviour of the ENGINE_TABLE mechanism used
* internally to control registration of ENGINE implementations, and can be set * internally to control registration of ENGINE implementations, and can be set
* by ENGINE_set_table_flags(). The "NOINIT" flag prevents attempts to * by ENGINE_set_table_flags(). The "NOINIT" flag prevents attempts to
* initialise registered ENGINEs if they are not already initialised. */ * initialise registered ENGINEs if they are not already initialised. */
#define ENGINE_TABLE_FLAG_NOINIT (unsigned int)0x0001 #define ENGINE_TABLE_FLAG_NOINIT (unsigned int)0x0001
/* ENGINE flags that can be set by ENGINE_set_flags(). */ /* ENGINE flags that can be set by ENGINE_set_flags(). */
/* #define ENGINE_FLAGS_MALLOCED 0x0001 */ /* Not used */ /* #define ENGINE_FLAGS_MALLOCED 0x0001 */ /* Not used */
/* This flag is for ENGINEs that wish to handle the various 'CMD'-related /* This flag is for ENGINEs that wish to handle the various 'CMD'-related
* control commands on their own. Without this flag, ENGINE_ctrl() handles these * control commands on their own. Without this flag, ENGINE_ctrl() handles these
* control commands on behalf of the ENGINE using their "cmd_defns" data. */ * control commands on behalf of the ENGINE using their "cmd_defns" data. */
#define ENGINE_FLAGS_MANUAL_CMD_CTRL (int)0x0002 #define ENGINE_FLAGS_MANUAL_CMD_CTRL (int)0x0002
/* This flag is for ENGINEs who return new duplicate structures when found via /* This flag is for ENGINEs who return new duplicate structures when found via
* "ENGINE_by_id()". When an ENGINE must store state (eg. if ENGINE_ctrl() * "ENGINE_by_id()". When an ENGINE must store state (eg. if ENGINE_ctrl()
@@ -136,7 +138,7 @@ extern "C" {
* to obtain the ENGINE will result in it being copied into a new structure. * to obtain the ENGINE will result in it being copied into a new structure.
* Normally, ENGINEs don't declare this flag so ENGINE_by_id() just increments * Normally, ENGINEs don't declare this flag so ENGINE_by_id() just increments
* the existing ENGINE's structural reference count. */ * the existing ENGINE's structural reference count. */
#define ENGINE_FLAGS_BY_ID_COPY (int)0x0004 #define ENGINE_FLAGS_BY_ID_COPY (int)0x0004
/* ENGINEs can support their own command types, and these flags are used in /* ENGINEs can support their own command types, and these flags are used in
* ENGINE_CTRL_GET_CMD_FLAGS to indicate to the caller what kind of input each * ENGINE_CTRL_GET_CMD_FLAGS to indicate to the caller what kind of input each
@@ -149,17 +151,17 @@ extern "C" {
* ENGINE_cmd_is_executable() and ENGINE_ctrl_cmd_string(). */ * ENGINE_cmd_is_executable() and ENGINE_ctrl_cmd_string(). */
/* accepts a 'long' input value (3rd parameter to ENGINE_ctrl) */ /* accepts a 'long' input value (3rd parameter to ENGINE_ctrl) */
#define ENGINE_CMD_FLAG_NUMERIC (unsigned int)0x0001 #define ENGINE_CMD_FLAG_NUMERIC (unsigned int)0x0001
/* accepts string input (cast from 'void*' to 'const char *', 4th parameter to /* accepts string input (cast from 'void*' to 'const char *', 4th parameter to
* ENGINE_ctrl) */ * ENGINE_ctrl) */
#define ENGINE_CMD_FLAG_STRING (unsigned int)0x0002 #define ENGINE_CMD_FLAG_STRING (unsigned int)0x0002
/* Indicates that the control command takes *no* input. Ie. the control command /* Indicates that the control command takes *no* input. Ie. the control command
* is unparameterised. */ * is unparameterised. */
#define ENGINE_CMD_FLAG_NO_INPUT (unsigned int)0x0004 #define ENGINE_CMD_FLAG_NO_INPUT (unsigned int)0x0004
/* Indicates that the control command is internal. This control command won't /* Indicates that the control command is internal. This control command won't
* be shown in any output, and is only usable through the ENGINE_ctrl_cmd() * be shown in any output, and is only usable through the ENGINE_ctrl_cmd()
* function. */ * function. */
#define ENGINE_CMD_FLAG_INTERNAL (unsigned int)0x0008 #define ENGINE_CMD_FLAG_INTERNAL (unsigned int)0x0008
/* NB: These 3 control commands are deprecated and should not be used. ENGINEs /* NB: These 3 control commands are deprecated and should not be used. ENGINEs
* relying on these commands should compile conditional support for * relying on these commands should compile conditional support for
@@ -174,21 +176,21 @@ extern "C" {
* All command numbers are shared between all engines, even if some don't * All command numbers are shared between all engines, even if some don't
* make sense to some engines. In such a case, they do nothing but return * make sense to some engines. In such a case, they do nothing but return
* the error ENGINE_R_CTRL_COMMAND_NOT_IMPLEMENTED. */ * the error ENGINE_R_CTRL_COMMAND_NOT_IMPLEMENTED. */
#define ENGINE_CTRL_SET_LOGSTREAM 1 #define ENGINE_CTRL_SET_LOGSTREAM 1
#define ENGINE_CTRL_SET_PASSWORD_CALLBACK 2 #define ENGINE_CTRL_SET_PASSWORD_CALLBACK 2
#define ENGINE_CTRL_HUP 3 /* Close and reinitialise any #define ENGINE_CTRL_HUP 3 /* Close and reinitialise any
handles/connections etc. */ handles/connections etc. */
#define ENGINE_CTRL_SET_USER_INTERFACE 4 /* Alternative to callback */ #define ENGINE_CTRL_SET_USER_INTERFACE 4 /* Alternative to callback */
#define ENGINE_CTRL_SET_CALLBACK_DATA 5 /* User-specific data, used #define ENGINE_CTRL_SET_CALLBACK_DATA 5 /* User-specific data, used
when calling the password when calling the password
callback and the user callback and the user
interface */ interface */
#define ENGINE_CTRL_LOAD_CONFIGURATION 6 /* Load a configuration, given #define ENGINE_CTRL_LOAD_CONFIGURATION 6 /* Load a configuration, given
a string that represents a a string that represents a
file name or so */ file name or so */
#define ENGINE_CTRL_LOAD_SECTION 7 /* Load data from a given #define ENGINE_CTRL_LOAD_SECTION 7 /* Load data from a given
section in the already loaded section in the already loaded
configuration */ configuration */
/* These control commands allow an application to deal with an arbitrary engine /* These control commands allow an application to deal with an arbitrary engine
* in a dynamic way. Warn: Negative return values indicate errors FOR THESE * in a dynamic way. Warn: Negative return values indicate errors FOR THESE
@@ -207,35 +209,35 @@ extern "C" {
* all the remaining control commands will return failure, so it is worth * all the remaining control commands will return failure, so it is worth
* checking this first if the caller is trying to "discover" the engine's * checking this first if the caller is trying to "discover" the engine's
* capabilities and doesn't want errors generated unnecessarily. */ * capabilities and doesn't want errors generated unnecessarily. */
#define ENGINE_CTRL_HAS_CTRL_FUNCTION 10 #define ENGINE_CTRL_HAS_CTRL_FUNCTION 10
/* Returns a positive command number for the first command supported by the /* Returns a positive command number for the first command supported by the
* engine. Returns zero if no ctrl commands are supported. */ * engine. Returns zero if no ctrl commands are supported. */
#define ENGINE_CTRL_GET_FIRST_CMD_TYPE 11 #define ENGINE_CTRL_GET_FIRST_CMD_TYPE 11
/* The 'long' argument specifies a command implemented by the engine, and the /* The 'long' argument specifies a command implemented by the engine, and the
* return value is the next command supported, or zero if there are no more. */ * return value is the next command supported, or zero if there are no more. */
#define ENGINE_CTRL_GET_NEXT_CMD_TYPE 12 #define ENGINE_CTRL_GET_NEXT_CMD_TYPE 12
/* The 'void*' argument is a command name (cast from 'const char *'), and the /* The 'void*' argument is a command name (cast from 'const char *'), and the
* return value is the command that corresponds to it. */ * return value is the command that corresponds to it. */
#define ENGINE_CTRL_GET_CMD_FROM_NAME 13 #define ENGINE_CTRL_GET_CMD_FROM_NAME 13
/* The next two allow a command to be converted into its corresponding string /* The next two allow a command to be converted into its corresponding string
* form. In each case, the 'long' argument supplies the command. In the NAME_LEN * form. In each case, the 'long' argument supplies the command. In the NAME_LEN
* case, the return value is the length of the command name (not counting a * case, the return value is the length of the command name (not counting a
* trailing EOL). In the NAME case, the 'void*' argument must be a string buffer * trailing EOL). In the NAME case, the 'void*' argument must be a string buffer
* large enough, and it will be populated with the name of the command (WITH a * large enough, and it will be populated with the name of the command (WITH a
* trailing EOL). */ * trailing EOL). */
#define ENGINE_CTRL_GET_NAME_LEN_FROM_CMD 14 #define ENGINE_CTRL_GET_NAME_LEN_FROM_CMD 14
#define ENGINE_CTRL_GET_NAME_FROM_CMD 15 #define ENGINE_CTRL_GET_NAME_FROM_CMD 15
/* The next two are similar but give a "short description" of a command. */ /* The next two are similar but give a "short description" of a command. */
#define ENGINE_CTRL_GET_DESC_LEN_FROM_CMD 16 #define ENGINE_CTRL_GET_DESC_LEN_FROM_CMD 16
#define ENGINE_CTRL_GET_DESC_FROM_CMD 17 #define ENGINE_CTRL_GET_DESC_FROM_CMD 17
/* With this command, the return value is the OR'd combination of /* With this command, the return value is the OR'd combination of
* ENGINE_CMD_FLAG_*** values that indicate what kind of input a given * ENGINE_CMD_FLAG_*** values that indicate what kind of input a given
* engine-specific ctrl command expects. */ * engine-specific ctrl command expects. */
#define ENGINE_CTRL_GET_CMD_FLAGS 18 #define ENGINE_CTRL_GET_CMD_FLAGS 18
/* ENGINE implementations should start the numbering of their own control /* ENGINE implementations should start the numbering of their own control
* commands from this value. (ie. ENGINE_CMD_BASE, ENGINE_CMD_BASE + 1, etc). */ * commands from this value. (ie. ENGINE_CMD_BASE, ENGINE_CMD_BASE + 1, etc). */
#define ENGINE_CMD_BASE 200 #define ENGINE_CMD_BASE 200
/* NB: These 2 nCipher "chil" control commands are deprecated, and their /* NB: These 2 nCipher "chil" control commands are deprecated, and their
* functionality is now available through ENGINE-specific control commands * functionality is now available through ENGINE-specific control commands
@@ -244,14 +246,14 @@ extern "C" {
* are removed. */ * are removed. */
/* Flags specific to the nCipher "chil" engine */ /* Flags specific to the nCipher "chil" engine */
#define ENGINE_CTRL_CHIL_SET_FORKCHECK 100 #define ENGINE_CTRL_CHIL_SET_FORKCHECK 100
/* Depending on the value of the (long)i argument, this sets or /* Depending on the value of the (long)i argument, this sets or
* unsets the SimpleForkCheck flag in the CHIL API to enable or * unsets the SimpleForkCheck flag in the CHIL API to enable or
* disable checking and workarounds for applications that fork(). * disable checking and workarounds for applications that fork().
*/ */
#define ENGINE_CTRL_CHIL_NO_LOCKING 101 #define ENGINE_CTRL_CHIL_NO_LOCKING 101
/* This prevents the initialisation function from providing mutex /* This prevents the initialisation function from providing mutex
* callbacks to the nCipher library. */ * callbacks to the nCipher library. */
/* If an ENGINE supports its own specific control commands and wishes the /* If an ENGINE supports its own specific control commands and wishes the
* framework to handle the above 'ENGINE_CMD_***'-manipulation commands on its * framework to handle the above 'ENGINE_CMD_***'-manipulation commands on its
@@ -262,12 +264,12 @@ extern "C" {
* "null-terminated" means that the last ENGINE_CMD_DEFN element has cmd_num set * "null-terminated" means that the last ENGINE_CMD_DEFN element has cmd_num set
* to zero and/or cmd_name set to NULL. */ * to zero and/or cmd_name set to NULL. */
typedef struct ENGINE_CMD_DEFN_st typedef struct ENGINE_CMD_DEFN_st
{ {
unsigned int cmd_num; /* The command number */ unsigned int cmd_num; /* The command number */
const char *cmd_name; /* The command name itself */ const char *cmd_name; /* The command name itself */
const char *cmd_desc; /* A short description of the command */ const char *cmd_desc; /* A short description of the command */
unsigned int cmd_flags; /* The input the command expects */ unsigned int cmd_flags; /* The input the command expects */
} ENGINE_CMD_DEFN; } ENGINE_CMD_DEFN;
/* Generic function pointer */ /* Generic function pointer */
typedef int (*ENGINE_GEN_FUNC_PTR)(void); typedef int (*ENGINE_GEN_FUNC_PTR)(void);
@@ -277,7 +279,10 @@ typedef int (*ENGINE_GEN_INT_FUNC_PTR)(ENGINE *);
typedef int (*ENGINE_CTRL_FUNC_PTR)(ENGINE *, int, long, void *, void (*f)(void)); typedef int (*ENGINE_CTRL_FUNC_PTR)(ENGINE *, int, long, void *, void (*f)(void));
/* Generic load_key function pointer */ /* Generic load_key function pointer */
typedef EVP_PKEY * (*ENGINE_LOAD_KEY_PTR)(ENGINE *, const char *, typedef EVP_PKEY * (*ENGINE_LOAD_KEY_PTR)(ENGINE *, const char *,
UI_METHOD *ui_method, void *callback_data); UI_METHOD *ui_method, void *callback_data);
typedef int (*ENGINE_SSL_CLIENT_CERT_PTR)(ENGINE *, SSL *ssl,
STACK_OF(X509_NAME) *ca_dn, X509 **pcert, EVP_PKEY **pkey,
STACK_OF(X509) **pother, UI_METHOD *ui_method, void *callback_data);
/* These callback types are for an ENGINE's handler for cipher and digest logic. /* These callback types are for an ENGINE's handler for cipher and digest logic.
* These handlers have these prototypes; * These handlers have these prototypes;
* int foo(ENGINE *e, const EVP_CIPHER **cipher, const int **nids, int nid); * int foo(ENGINE *e, const EVP_CIPHER **cipher, const int **nids, int nid);
@@ -334,6 +339,9 @@ void ENGINE_load_ubsec(void);
void ENGINE_load_cryptodev(void); void ENGINE_load_cryptodev(void);
void ENGINE_load_padlock(void); void ENGINE_load_padlock(void);
void ENGINE_load_builtin_engines(void); void ENGINE_load_builtin_engines(void);
#ifndef OPENSSL_NO_CAPIENG
void ENGINE_load_capi(void);
#endif
/* Get and set global flags (ENGINE_TABLE_FLAG_***) for the implementation /* Get and set global flags (ENGINE_TABLE_FLAG_***) for the implementation
* "registry" handling. */ * "registry" handling. */
@@ -433,7 +441,7 @@ int ENGINE_ctrl_cmd(ENGINE *e, const char *cmd_name,
* compliant ENGINE-based applications can work consistently with the same * compliant ENGINE-based applications can work consistently with the same
* configuration for the same ENGINE-enabled devices, across applications. */ * configuration for the same ENGINE-enabled devices, across applications. */
int ENGINE_ctrl_cmd_string(ENGINE *e, const char *cmd_name, const char *arg, int ENGINE_ctrl_cmd_string(ENGINE *e, const char *cmd_name, const char *arg,
int cmd_optional); int cmd_optional);
/* These functions are useful for manufacturing new ENGINE structures. They /* These functions are useful for manufacturing new ENGINE structures. They
* don't address reference counting at all - one uses them to populate an ENGINE * don't address reference counting at all - one uses them to populate an ENGINE
@@ -459,13 +467,15 @@ int ENGINE_set_finish_function(ENGINE *e, ENGINE_GEN_INT_FUNC_PTR finish_f);
int ENGINE_set_ctrl_function(ENGINE *e, ENGINE_CTRL_FUNC_PTR ctrl_f); int ENGINE_set_ctrl_function(ENGINE *e, ENGINE_CTRL_FUNC_PTR ctrl_f);
int ENGINE_set_load_privkey_function(ENGINE *e, ENGINE_LOAD_KEY_PTR loadpriv_f); int ENGINE_set_load_privkey_function(ENGINE *e, ENGINE_LOAD_KEY_PTR loadpriv_f);
int ENGINE_set_load_pubkey_function(ENGINE *e, ENGINE_LOAD_KEY_PTR loadpub_f); int ENGINE_set_load_pubkey_function(ENGINE *e, ENGINE_LOAD_KEY_PTR loadpub_f);
int ENGINE_set_load_ssl_client_cert_function(ENGINE *e,
ENGINE_SSL_CLIENT_CERT_PTR loadssl_f);
int ENGINE_set_ciphers(ENGINE *e, ENGINE_CIPHERS_PTR f); int ENGINE_set_ciphers(ENGINE *e, ENGINE_CIPHERS_PTR f);
int ENGINE_set_digests(ENGINE *e, ENGINE_DIGESTS_PTR f); int ENGINE_set_digests(ENGINE *e, ENGINE_DIGESTS_PTR f);
int ENGINE_set_flags(ENGINE *e, int flags); int ENGINE_set_flags(ENGINE *e, int flags);
int ENGINE_set_cmd_defns(ENGINE *e, const ENGINE_CMD_DEFN *defns); int ENGINE_set_cmd_defns(ENGINE *e, const ENGINE_CMD_DEFN *defns);
/* These functions allow control over any per-structure ENGINE data. */ /* These functions allow control over any per-structure ENGINE data. */
int ENGINE_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func, int ENGINE_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func,
CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func); CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func);
int ENGINE_set_ex_data(ENGINE *e, int idx, void *arg); int ENGINE_set_ex_data(ENGINE *e, int idx, void *arg);
void *ENGINE_get_ex_data(const ENGINE *e, int idx); void *ENGINE_get_ex_data(const ENGINE *e, int idx);
@@ -494,6 +504,7 @@ ENGINE_GEN_INT_FUNC_PTR ENGINE_get_finish_function(const ENGINE *e);
ENGINE_CTRL_FUNC_PTR ENGINE_get_ctrl_function(const ENGINE *e); ENGINE_CTRL_FUNC_PTR ENGINE_get_ctrl_function(const ENGINE *e);
ENGINE_LOAD_KEY_PTR ENGINE_get_load_privkey_function(const ENGINE *e); ENGINE_LOAD_KEY_PTR ENGINE_get_load_privkey_function(const ENGINE *e);
ENGINE_LOAD_KEY_PTR ENGINE_get_load_pubkey_function(const ENGINE *e); ENGINE_LOAD_KEY_PTR ENGINE_get_load_pubkey_function(const ENGINE *e);
ENGINE_SSL_CLIENT_CERT_PTR ENGINE_get_ssl_client_cert_function(const ENGINE *e);
ENGINE_CIPHERS_PTR ENGINE_get_ciphers(const ENGINE *e); ENGINE_CIPHERS_PTR ENGINE_get_ciphers(const ENGINE *e);
ENGINE_DIGESTS_PTR ENGINE_get_digests(const ENGINE *e); ENGINE_DIGESTS_PTR ENGINE_get_digests(const ENGINE *e);
const EVP_CIPHER *ENGINE_get_cipher(ENGINE *e, int nid); const EVP_CIPHER *ENGINE_get_cipher(ENGINE *e, int nid);
@@ -526,9 +537,13 @@ int ENGINE_finish(ENGINE *e);
* location, handled by the engine. The storage may be on a card or * location, handled by the engine. The storage may be on a card or
* whatever. */ * whatever. */
EVP_PKEY *ENGINE_load_private_key(ENGINE *e, const char *key_id, EVP_PKEY *ENGINE_load_private_key(ENGINE *e, const char *key_id,
UI_METHOD *ui_method, void *callback_data); UI_METHOD *ui_method, void *callback_data);
EVP_PKEY *ENGINE_load_public_key(ENGINE *e, const char *key_id, EVP_PKEY *ENGINE_load_public_key(ENGINE *e, const char *key_id,
UI_METHOD *ui_method, void *callback_data); UI_METHOD *ui_method, void *callback_data);
int ENGINE_load_ssl_client_cert(ENGINE *e, SSL *s,
STACK_OF(X509_NAME) *ca_dn, X509 **pcert, EVP_PKEY **ppkey,
STACK_OF(X509) **pother,
UI_METHOD *ui_method, void *callback_data);
/* This returns a pointer for the current ENGINE structure that /* This returns a pointer for the current ENGINE structure that
* is (by default) performing any RSA operations. The value returned * is (by default) performing any RSA operations. The value returned
@@ -578,10 +593,10 @@ void ENGINE_add_conf_module(void);
/**************************/ /**************************/
/* Binary/behaviour compatibility levels */ /* Binary/behaviour compatibility levels */
#define OSSL_DYNAMIC_VERSION (unsigned long)0x00020000 #define OSSL_DYNAMIC_VERSION (unsigned long)0x00020000
/* Binary versions older than this are too old for us (whether we're a loader or /* Binary versions older than this are too old for us (whether we're a loader or
* a loadee) */ * a loadee) */
#define OSSL_DYNAMIC_OLDEST (unsigned long)0x00020000 #define OSSL_DYNAMIC_OLDEST (unsigned long)0x00020000
/* When compiling an ENGINE entirely as an external shared library, loadable by /* When compiling an ENGINE entirely as an external shared library, loadable by
* the "dynamic" ENGINE, these types are needed. The 'dynamic_fns' structure * the "dynamic" ENGINE, these types are needed. The 'dynamic_fns' structure
@@ -596,35 +611,35 @@ typedef void *(*dyn_MEM_malloc_cb)(size_t);
typedef void *(*dyn_MEM_realloc_cb)(void *, size_t); typedef void *(*dyn_MEM_realloc_cb)(void *, size_t);
typedef void (*dyn_MEM_free_cb)(void *); typedef void (*dyn_MEM_free_cb)(void *);
typedef struct st_dynamic_MEM_fns { typedef struct st_dynamic_MEM_fns {
dyn_MEM_malloc_cb malloc_cb; dyn_MEM_malloc_cb malloc_cb;
dyn_MEM_realloc_cb realloc_cb; dyn_MEM_realloc_cb realloc_cb;
dyn_MEM_free_cb free_cb; dyn_MEM_free_cb free_cb;
} dynamic_MEM_fns; } dynamic_MEM_fns;
/* FIXME: Perhaps the memory and locking code (crypto.h) should declare and use /* FIXME: Perhaps the memory and locking code (crypto.h) should declare and use
* these types so we (and any other dependant code) can simplify a bit?? */ * these types so we (and any other dependant code) can simplify a bit?? */
typedef void (*dyn_lock_locking_cb)(int,int,const char *,int); typedef void (*dyn_lock_locking_cb)(int,int,const char *,int);
typedef int (*dyn_lock_add_lock_cb)(int*,int,int,const char *,int); typedef int (*dyn_lock_add_lock_cb)(int*,int,int,const char *,int);
typedef struct CRYPTO_dynlock_value *(*dyn_dynlock_create_cb)( typedef struct CRYPTO_dynlock_value *(*dyn_dynlock_create_cb)(
const char *,int); const char *,int);
typedef void (*dyn_dynlock_lock_cb)(int,struct CRYPTO_dynlock_value *, typedef void (*dyn_dynlock_lock_cb)(int,struct CRYPTO_dynlock_value *,
const char *,int); const char *,int);
typedef void (*dyn_dynlock_destroy_cb)(struct CRYPTO_dynlock_value *, typedef void (*dyn_dynlock_destroy_cb)(struct CRYPTO_dynlock_value *,
const char *,int); const char *,int);
typedef struct st_dynamic_LOCK_fns { typedef struct st_dynamic_LOCK_fns {
dyn_lock_locking_cb lock_locking_cb; dyn_lock_locking_cb lock_locking_cb;
dyn_lock_add_lock_cb lock_add_lock_cb; dyn_lock_add_lock_cb lock_add_lock_cb;
dyn_dynlock_create_cb dynlock_create_cb; dyn_dynlock_create_cb dynlock_create_cb;
dyn_dynlock_lock_cb dynlock_lock_cb; dyn_dynlock_lock_cb dynlock_lock_cb;
dyn_dynlock_destroy_cb dynlock_destroy_cb; dyn_dynlock_destroy_cb dynlock_destroy_cb;
} dynamic_LOCK_fns; } dynamic_LOCK_fns;
/* The top-level structure */ /* The top-level structure */
typedef struct st_dynamic_fns { typedef struct st_dynamic_fns {
void *static_state; void *static_state;
const ERR_FNS *err_fns; const ERR_FNS *err_fns;
const CRYPTO_EX_DATA_IMPL *ex_data_fns; const CRYPTO_EX_DATA_IMPL *ex_data_fns;
dynamic_MEM_fns mem_fns; dynamic_MEM_fns mem_fns;
dynamic_LOCK_fns lock_fns; dynamic_LOCK_fns lock_fns;
} dynamic_fns; } dynamic_fns;
/* The version checking function should be of this prototype. NB: The /* The version checking function should be of this prototype. NB: The
* ossl_version value passed in is the OSSL_DYNAMIC_VERSION of the loading code. * ossl_version value passed in is the OSSL_DYNAMIC_VERSION of the loading code.
@@ -637,9 +652,9 @@ typedef struct st_dynamic_fns {
* can be fully instantiated with IMPLEMENT_DYNAMIC_CHECK_FN(). */ * can be fully instantiated with IMPLEMENT_DYNAMIC_CHECK_FN(). */
typedef unsigned long (*dynamic_v_check_fn)(unsigned long ossl_version); typedef unsigned long (*dynamic_v_check_fn)(unsigned long ossl_version);
#define IMPLEMENT_DYNAMIC_CHECK_FN() \ #define IMPLEMENT_DYNAMIC_CHECK_FN() \
OPENSSL_EXPORT unsigned long v_check(unsigned long v) { \ OPENSSL_EXPORT unsigned long v_check(unsigned long v) { \
if(v >= OSSL_DYNAMIC_OLDEST) return OSSL_DYNAMIC_VERSION; \ if(v >= OSSL_DYNAMIC_OLDEST) return OSSL_DYNAMIC_VERSION; \
return 0; } return 0; }
/* This function is passed the ENGINE structure to initialise with its own /* This function is passed the ENGINE structure to initialise with its own
* function and command settings. It should not adjust the structural or * function and command settings. It should not adjust the structural or
@@ -657,25 +672,25 @@ typedef unsigned long (*dynamic_v_check_fn)(unsigned long ossl_version);
* and returns an int value (zero for failure). 'fn' should have prototype; * and returns an int value (zero for failure). 'fn' should have prototype;
* [static] int fn(ENGINE *e, const char *id); */ * [static] int fn(ENGINE *e, const char *id); */
typedef int (*dynamic_bind_engine)(ENGINE *e, const char *id, typedef int (*dynamic_bind_engine)(ENGINE *e, const char *id,
const dynamic_fns *fns); const dynamic_fns *fns);
#define IMPLEMENT_DYNAMIC_BIND_FN(fn) \ #define IMPLEMENT_DYNAMIC_BIND_FN(fn) \
OPENSSL_EXPORT \ OPENSSL_EXPORT \
int bind_engine(ENGINE *e, const char *id, const dynamic_fns *fns) { \ int bind_engine(ENGINE *e, const char *id, const dynamic_fns *fns) { \
if(ENGINE_get_static_state() == fns->static_state) goto skip_cbs; \ if(ENGINE_get_static_state() == fns->static_state) goto skip_cbs; \
if(!CRYPTO_set_mem_functions(fns->mem_fns.malloc_cb, \ if(!CRYPTO_set_mem_functions(fns->mem_fns.malloc_cb, \
fns->mem_fns.realloc_cb, fns->mem_fns.free_cb)) \ fns->mem_fns.realloc_cb, fns->mem_fns.free_cb)) \
return 0; \ return 0; \
CRYPTO_set_locking_callback(fns->lock_fns.lock_locking_cb); \ CRYPTO_set_locking_callback(fns->lock_fns.lock_locking_cb); \
CRYPTO_set_add_lock_callback(fns->lock_fns.lock_add_lock_cb); \ CRYPTO_set_add_lock_callback(fns->lock_fns.lock_add_lock_cb); \
CRYPTO_set_dynlock_create_callback(fns->lock_fns.dynlock_create_cb); \ CRYPTO_set_dynlock_create_callback(fns->lock_fns.dynlock_create_cb); \
CRYPTO_set_dynlock_lock_callback(fns->lock_fns.dynlock_lock_cb); \ CRYPTO_set_dynlock_lock_callback(fns->lock_fns.dynlock_lock_cb); \
CRYPTO_set_dynlock_destroy_callback(fns->lock_fns.dynlock_destroy_cb); \ CRYPTO_set_dynlock_destroy_callback(fns->lock_fns.dynlock_destroy_cb); \
if(!CRYPTO_set_ex_data_implementation(fns->ex_data_fns)) \ if(!CRYPTO_set_ex_data_implementation(fns->ex_data_fns)) \
return 0; \ return 0; \
if(!ERR_set_implementation(fns->err_fns)) return 0; \ if(!ERR_set_implementation(fns->err_fns)) return 0; \
skip_cbs: \ skip_cbs: \
if(!fn(e,id)) return 0; \ if(!fn(e,id)) return 0; \
return 1; } return 1; }
/* If the loading application (or library) and the loaded ENGINE library share /* If the loading application (or library) and the loaded ENGINE library share
* the same static data (eg. they're both dynamically linked to the same * the same static data (eg. they're both dynamically linked to the same
@@ -701,86 +716,86 @@ void ERR_load_ENGINE_strings(void);
/* Error codes for the ENGINE functions. */ /* Error codes for the ENGINE functions. */
/* Function codes. */ /* Function codes. */
#define ENGINE_F_DYNAMIC_CTRL 180 #define ENGINE_F_DYNAMIC_CTRL 180
#define ENGINE_F_DYNAMIC_GET_DATA_CTX 181 #define ENGINE_F_DYNAMIC_GET_DATA_CTX 181
#define ENGINE_F_DYNAMIC_LOAD 182 #define ENGINE_F_DYNAMIC_LOAD 182
#define ENGINE_F_DYNAMIC_SET_DATA_CTX 183 #define ENGINE_F_DYNAMIC_SET_DATA_CTX 183
#define ENGINE_F_ENGINE_ADD 105 #define ENGINE_F_ENGINE_ADD 105
#define ENGINE_F_ENGINE_BY_ID 106 #define ENGINE_F_ENGINE_BY_ID 106
#define ENGINE_F_ENGINE_CMD_IS_EXECUTABLE 170 #define ENGINE_F_ENGINE_CMD_IS_EXECUTABLE 170
#define ENGINE_F_ENGINE_CTRL 142 #define ENGINE_F_ENGINE_CTRL 142
#define ENGINE_F_ENGINE_CTRL_CMD 178 #define ENGINE_F_ENGINE_CTRL_CMD 178
#define ENGINE_F_ENGINE_CTRL_CMD_STRING 171 #define ENGINE_F_ENGINE_CTRL_CMD_STRING 171
#define ENGINE_F_ENGINE_FINISH 107 #define ENGINE_F_ENGINE_FINISH 107
#define ENGINE_F_ENGINE_FREE_UTIL 108 #define ENGINE_F_ENGINE_FREE_UTIL 108
#define ENGINE_F_ENGINE_GET_CIPHER 185 #define ENGINE_F_ENGINE_GET_CIPHER 185
#define ENGINE_F_ENGINE_GET_DEFAULT_TYPE 177 #define ENGINE_F_ENGINE_GET_DEFAULT_TYPE 177
#define ENGINE_F_ENGINE_GET_DIGEST 186 #define ENGINE_F_ENGINE_GET_DIGEST 186
#define ENGINE_F_ENGINE_GET_NEXT 115 #define ENGINE_F_ENGINE_GET_NEXT 115
#define ENGINE_F_ENGINE_GET_PREV 116 #define ENGINE_F_ENGINE_GET_PREV 116
#define ENGINE_F_ENGINE_INIT 119 #define ENGINE_F_ENGINE_INIT 119
#define ENGINE_F_ENGINE_LIST_ADD 120 #define ENGINE_F_ENGINE_LIST_ADD 120
#define ENGINE_F_ENGINE_LIST_REMOVE 121 #define ENGINE_F_ENGINE_LIST_REMOVE 121
#define ENGINE_F_ENGINE_LOAD_PRIVATE_KEY 150 #define ENGINE_F_ENGINE_LOAD_PRIVATE_KEY 150
#define ENGINE_F_ENGINE_LOAD_PUBLIC_KEY 151 #define ENGINE_F_ENGINE_LOAD_PUBLIC_KEY 151
#define ENGINE_F_ENGINE_NEW 122 #define ENGINE_F_ENGINE_LOAD_SSL_CLIENT_CERT 192
#define ENGINE_F_ENGINE_REMOVE 123 #define ENGINE_F_ENGINE_NEW 122
#define ENGINE_F_ENGINE_SET_DEFAULT_STRING 189 #define ENGINE_F_ENGINE_REMOVE 123
#define ENGINE_F_ENGINE_SET_DEFAULT_TYPE 126 #define ENGINE_F_ENGINE_SET_DEFAULT_STRING 189
#define ENGINE_F_ENGINE_SET_ID 129 #define ENGINE_F_ENGINE_SET_DEFAULT_TYPE 126
#define ENGINE_F_ENGINE_SET_NAME 130 #define ENGINE_F_ENGINE_SET_ID 129
#define ENGINE_F_ENGINE_TABLE_REGISTER 184 #define ENGINE_F_ENGINE_SET_NAME 130
#define ENGINE_F_ENGINE_UNLOAD_KEY 152 #define ENGINE_F_ENGINE_TABLE_REGISTER 184
#define ENGINE_F_ENGINE_UNLOCKED_FINISH 191 #define ENGINE_F_ENGINE_UNLOAD_KEY 152
#define ENGINE_F_ENGINE_UP_REF 190 #define ENGINE_F_ENGINE_UNLOCKED_FINISH 191
#define ENGINE_F_INT_CTRL_HELPER 172 #define ENGINE_F_ENGINE_UP_REF 190
#define ENGINE_F_INT_ENGINE_CONFIGURE 188 #define ENGINE_F_INT_CTRL_HELPER 172
#define ENGINE_F_INT_ENGINE_MODULE_INIT 187 #define ENGINE_F_INT_ENGINE_CONFIGURE 188
#define ENGINE_F_LOG_MESSAGE 141 #define ENGINE_F_INT_ENGINE_MODULE_INIT 187
#define ENGINE_F_LOG_MESSAGE 141
/* Reason codes. */ /* Reason codes. */
#define ENGINE_R_ALREADY_LOADED 100 #define ENGINE_R_ALREADY_LOADED 100
#define ENGINE_R_ARGUMENT_IS_NOT_A_NUMBER 133 #define ENGINE_R_ARGUMENT_IS_NOT_A_NUMBER 133
#define ENGINE_R_CMD_NOT_EXECUTABLE 134 #define ENGINE_R_CMD_NOT_EXECUTABLE 134
#define ENGINE_R_COMMAND_TAKES_INPUT 135 #define ENGINE_R_COMMAND_TAKES_INPUT 135
#define ENGINE_R_COMMAND_TAKES_NO_INPUT 136 #define ENGINE_R_COMMAND_TAKES_NO_INPUT 136
#define ENGINE_R_CONFLICTING_ENGINE_ID 103 #define ENGINE_R_CONFLICTING_ENGINE_ID 103
#define ENGINE_R_CTRL_COMMAND_NOT_IMPLEMENTED 119 #define ENGINE_R_CTRL_COMMAND_NOT_IMPLEMENTED 119
#define ENGINE_R_DH_NOT_IMPLEMENTED 139 #define ENGINE_R_DH_NOT_IMPLEMENTED 139
#define ENGINE_R_DSA_NOT_IMPLEMENTED 140 #define ENGINE_R_DSA_NOT_IMPLEMENTED 140
#define ENGINE_R_DSO_FAILURE 104 #define ENGINE_R_DSO_FAILURE 104
#define ENGINE_R_DSO_NOT_FOUND 132 #define ENGINE_R_DSO_NOT_FOUND 132
#define ENGINE_R_ENGINES_SECTION_ERROR 148 #define ENGINE_R_ENGINES_SECTION_ERROR 148
#define ENGINE_R_ENGINE_IS_NOT_IN_LIST 105 #define ENGINE_R_ENGINE_IS_NOT_IN_LIST 105
#define ENGINE_R_ENGINE_SECTION_ERROR 149 #define ENGINE_R_ENGINE_SECTION_ERROR 149
#define ENGINE_R_FAILED_LOADING_PRIVATE_KEY 128 #define ENGINE_R_FAILED_LOADING_PRIVATE_KEY 128
#define ENGINE_R_FAILED_LOADING_PUBLIC_KEY 129 #define ENGINE_R_FAILED_LOADING_PUBLIC_KEY 129
#define ENGINE_R_FINISH_FAILED 106 #define ENGINE_R_FINISH_FAILED 106
#define ENGINE_R_GET_HANDLE_FAILED 107 #define ENGINE_R_GET_HANDLE_FAILED 107
#define ENGINE_R_ID_OR_NAME_MISSING 108 #define ENGINE_R_ID_OR_NAME_MISSING 108
#define ENGINE_R_INIT_FAILED 109 #define ENGINE_R_INIT_FAILED 109
#define ENGINE_R_INTERNAL_LIST_ERROR 110 #define ENGINE_R_INTERNAL_LIST_ERROR 110
#define ENGINE_R_INVALID_ARGUMENT 143 #define ENGINE_R_INVALID_ARGUMENT 143
#define ENGINE_R_INVALID_CMD_NAME 137 #define ENGINE_R_INVALID_CMD_NAME 137
#define ENGINE_R_INVALID_CMD_NUMBER 138 #define ENGINE_R_INVALID_CMD_NUMBER 138
#define ENGINE_R_INVALID_INIT_VALUE 151 #define ENGINE_R_INVALID_INIT_VALUE 151
#define ENGINE_R_INVALID_STRING 150 #define ENGINE_R_INVALID_STRING 150
#define ENGINE_R_NOT_INITIALISED 117 #define ENGINE_R_NOT_INITIALISED 117
#define ENGINE_R_NOT_LOADED 112 #define ENGINE_R_NOT_LOADED 112
#define ENGINE_R_NO_CONTROL_FUNCTION 120 #define ENGINE_R_NO_CONTROL_FUNCTION 120
#define ENGINE_R_NO_INDEX 144 #define ENGINE_R_NO_INDEX 144
#define ENGINE_R_NO_LOAD_FUNCTION 125 #define ENGINE_R_NO_LOAD_FUNCTION 125
#define ENGINE_R_NO_REFERENCE 130 #define ENGINE_R_NO_REFERENCE 130
#define ENGINE_R_NO_SUCH_ENGINE 116 #define ENGINE_R_NO_SUCH_ENGINE 116
#define ENGINE_R_NO_UNLOAD_FUNCTION 126 #define ENGINE_R_NO_UNLOAD_FUNCTION 126
#define ENGINE_R_PROVIDE_PARAMETERS 113 #define ENGINE_R_PROVIDE_PARAMETERS 113
#define ENGINE_R_RSA_NOT_IMPLEMENTED 141 #define ENGINE_R_RSA_NOT_IMPLEMENTED 141
#define ENGINE_R_UNIMPLEMENTED_CIPHER 146 #define ENGINE_R_UNIMPLEMENTED_CIPHER 146
#define ENGINE_R_UNIMPLEMENTED_DIGEST 147 #define ENGINE_R_UNIMPLEMENTED_DIGEST 147
#define ENGINE_R_VERSION_INCOMPATIBILITY 145 #define ENGINE_R_VERSION_INCOMPATIBILITY 145
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif #endif
dep/include/openssl/err.h
+115 -104
View File
@@ -74,74 +74,77 @@
#include <openssl/lhash.h> #include <openssl/lhash.h>
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#ifndef OPENSSL_NO_ERR #ifndef OPENSSL_NO_ERR
#define ERR_PUT_error(a,b,c,d,e) ERR_put_error(a,b,c,d,e) #define ERR_PUT_error(a,b,c,d,e) ERR_put_error(a,b,c,d,e)
#else #else
#define ERR_PUT_error(a,b,c,d,e) ERR_put_error(a,b,c,NULL,0) #define ERR_PUT_error(a,b,c,d,e) ERR_put_error(a,b,c,NULL,0)
#endif #endif
#include <errno.h> #include <errno.h>
#define ERR_TXT_MALLOCED 0x01 #define ERR_TXT_MALLOCED 0x01
#define ERR_TXT_STRING 0x02 #define ERR_TXT_STRING 0x02
#define ERR_FLAG_MARK 0x01 #define ERR_FLAG_MARK 0x01
#define ERR_NUM_ERRORS 16 #define ERR_NUM_ERRORS 16
typedef struct err_state_st typedef struct err_state_st
{ {
unsigned long pid; unsigned long pid;
int err_flags[ERR_NUM_ERRORS]; int err_flags[ERR_NUM_ERRORS];
unsigned long err_buffer[ERR_NUM_ERRORS]; unsigned long err_buffer[ERR_NUM_ERRORS];
char *err_data[ERR_NUM_ERRORS]; char *err_data[ERR_NUM_ERRORS];
int err_data_flags[ERR_NUM_ERRORS]; int err_data_flags[ERR_NUM_ERRORS];
const char *err_file[ERR_NUM_ERRORS]; const char *err_file[ERR_NUM_ERRORS];
int err_line[ERR_NUM_ERRORS]; int err_line[ERR_NUM_ERRORS];
int top,bottom; int top,bottom;
} ERR_STATE; } ERR_STATE;
/* library */ /* library */
#define ERR_LIB_NONE 1 #define ERR_LIB_NONE 1
#define ERR_LIB_SYS 2 #define ERR_LIB_SYS 2
#define ERR_LIB_BN 3 #define ERR_LIB_BN 3
#define ERR_LIB_RSA 4 #define ERR_LIB_RSA 4
#define ERR_LIB_DH 5 #define ERR_LIB_DH 5
#define ERR_LIB_EVP 6 #define ERR_LIB_EVP 6
#define ERR_LIB_BUF 7 #define ERR_LIB_BUF 7
#define ERR_LIB_OBJ 8 #define ERR_LIB_OBJ 8
#define ERR_LIB_PEM 9 #define ERR_LIB_PEM 9
#define ERR_LIB_DSA 10 #define ERR_LIB_DSA 10
#define ERR_LIB_X509 11 #define ERR_LIB_X509 11
/* #define ERR_LIB_METH 12 */ /* #define ERR_LIB_METH 12 */
#define ERR_LIB_ASN1 13 #define ERR_LIB_ASN1 13
#define ERR_LIB_CONF 14 #define ERR_LIB_CONF 14
#define ERR_LIB_CRYPTO 15 #define ERR_LIB_CRYPTO 15
#define ERR_LIB_EC 16 #define ERR_LIB_EC 16
#define ERR_LIB_SSL 20 #define ERR_LIB_SSL 20
/* #define ERR_LIB_SSL23 21 */ /* #define ERR_LIB_SSL23 21 */
/* #define ERR_LIB_SSL2 22 */ /* #define ERR_LIB_SSL2 22 */
/* #define ERR_LIB_SSL3 23 */ /* #define ERR_LIB_SSL3 23 */
/* #define ERR_LIB_RSAREF 30 */ /* #define ERR_LIB_RSAREF 30 */
/* #define ERR_LIB_PROXY 31 */ /* #define ERR_LIB_PROXY 31 */
#define ERR_LIB_BIO 32 #define ERR_LIB_BIO 32
#define ERR_LIB_PKCS7 33 #define ERR_LIB_PKCS7 33
#define ERR_LIB_X509V3 34 #define ERR_LIB_X509V3 34
#define ERR_LIB_PKCS12 35 #define ERR_LIB_PKCS12 35
#define ERR_LIB_RAND 36 #define ERR_LIB_RAND 36
#define ERR_LIB_DSO 37 #define ERR_LIB_DSO 37
#define ERR_LIB_ENGINE 38 #define ERR_LIB_ENGINE 38
#define ERR_LIB_OCSP 39 #define ERR_LIB_OCSP 39
#define ERR_LIB_UI 40 #define ERR_LIB_UI 40
#define ERR_LIB_COMP 41 #define ERR_LIB_COMP 41
#define ERR_LIB_ECDSA 42 #define ERR_LIB_ECDSA 42
#define ERR_LIB_ECDH 43 #define ERR_LIB_ECDH 43
#define ERR_LIB_STORE 44 #define ERR_LIB_STORE 44
#define ERR_LIB_FIPS 45
#define ERR_LIB_CMS 46
#define ERR_LIB_JPAKE 47
#define ERR_LIB_USER 128 #define ERR_LIB_USER 128
#define SYSerr(f,r) ERR_PUT_error(ERR_LIB_SYS,(f),(r),__FILE__,__LINE__) #define SYSerr(f,r) ERR_PUT_error(ERR_LIB_SYS,(f),(r),__FILE__,__LINE__)
#define BNerr(f,r) ERR_PUT_error(ERR_LIB_BN,(f),(r),__FILE__,__LINE__) #define BNerr(f,r) ERR_PUT_error(ERR_LIB_BN,(f),(r),__FILE__,__LINE__)
@@ -171,86 +174,89 @@ typedef struct err_state_st
#define ECDSAerr(f,r) ERR_PUT_error(ERR_LIB_ECDSA,(f),(r),__FILE__,__LINE__) #define ECDSAerr(f,r) ERR_PUT_error(ERR_LIB_ECDSA,(f),(r),__FILE__,__LINE__)
#define ECDHerr(f,r) ERR_PUT_error(ERR_LIB_ECDH,(f),(r),__FILE__,__LINE__) #define ECDHerr(f,r) ERR_PUT_error(ERR_LIB_ECDH,(f),(r),__FILE__,__LINE__)
#define STOREerr(f,r) ERR_PUT_error(ERR_LIB_STORE,(f),(r),__FILE__,__LINE__) #define STOREerr(f,r) ERR_PUT_error(ERR_LIB_STORE,(f),(r),__FILE__,__LINE__)
#define FIPSerr(f,r) ERR_PUT_error(ERR_LIB_FIPS,(f),(r),__FILE__,__LINE__)
#define CMSerr(f,r) ERR_PUT_error(ERR_LIB_CMS,(f),(r),__FILE__,__LINE__)
#define JPAKEerr(f,r) ERR_PUT_error(ERR_LIB_JPAKE,(f),(r),__FILE__,__LINE__)
/* Borland C seems too stupid to be able to shift and do longs in /* Borland C seems too stupid to be able to shift and do longs in
* the pre-processor :-( */ * the pre-processor :-( */
#define ERR_PACK(l,f,r) (((((unsigned long)l)&0xffL)*0x1000000)| \ #define ERR_PACK(l,f,r) (((((unsigned long)l)&0xffL)*0x1000000)| \
((((unsigned long)f)&0xfffL)*0x1000)| \ ((((unsigned long)f)&0xfffL)*0x1000)| \
((((unsigned long)r)&0xfffL))) ((((unsigned long)r)&0xfffL)))
#define ERR_GET_LIB(l) (int)((((unsigned long)l)>>24L)&0xffL) #define ERR_GET_LIB(l) (int)((((unsigned long)l)>>24L)&0xffL)
#define ERR_GET_FUNC(l) (int)((((unsigned long)l)>>12L)&0xfffL) #define ERR_GET_FUNC(l) (int)((((unsigned long)l)>>12L)&0xfffL)
#define ERR_GET_REASON(l) (int)((l)&0xfffL) #define ERR_GET_REASON(l) (int)((l)&0xfffL)
#define ERR_FATAL_ERROR(l) (int)((l)&ERR_R_FATAL) #define ERR_FATAL_ERROR(l) (int)((l)&ERR_R_FATAL)
/* OS functions */ /* OS functions */
#define SYS_F_FOPEN 1 #define SYS_F_FOPEN 1
#define SYS_F_CONNECT 2 #define SYS_F_CONNECT 2
#define SYS_F_GETSERVBYNAME 3 #define SYS_F_GETSERVBYNAME 3
#define SYS_F_SOCKET 4 #define SYS_F_SOCKET 4
#define SYS_F_IOCTLSOCKET 5 #define SYS_F_IOCTLSOCKET 5
#define SYS_F_BIND 6 #define SYS_F_BIND 6
#define SYS_F_LISTEN 7 #define SYS_F_LISTEN 7
#define SYS_F_ACCEPT 8 #define SYS_F_ACCEPT 8
#define SYS_F_WSASTARTUP 9 /* Winsock stuff */ #define SYS_F_WSASTARTUP 9 /* Winsock stuff */
#define SYS_F_OPENDIR 10 #define SYS_F_OPENDIR 10
#define SYS_F_FREAD 11 #define SYS_F_FREAD 11
/* reasons */ /* reasons */
#define ERR_R_SYS_LIB ERR_LIB_SYS /* 2 */ #define ERR_R_SYS_LIB ERR_LIB_SYS /* 2 */
#define ERR_R_BN_LIB ERR_LIB_BN /* 3 */ #define ERR_R_BN_LIB ERR_LIB_BN /* 3 */
#define ERR_R_RSA_LIB ERR_LIB_RSA /* 4 */ #define ERR_R_RSA_LIB ERR_LIB_RSA /* 4 */
#define ERR_R_DH_LIB ERR_LIB_DH /* 5 */ #define ERR_R_DH_LIB ERR_LIB_DH /* 5 */
#define ERR_R_EVP_LIB ERR_LIB_EVP /* 6 */ #define ERR_R_EVP_LIB ERR_LIB_EVP /* 6 */
#define ERR_R_BUF_LIB ERR_LIB_BUF /* 7 */ #define ERR_R_BUF_LIB ERR_LIB_BUF /* 7 */
#define ERR_R_OBJ_LIB ERR_LIB_OBJ /* 8 */ #define ERR_R_OBJ_LIB ERR_LIB_OBJ /* 8 */
#define ERR_R_PEM_LIB ERR_LIB_PEM /* 9 */ #define ERR_R_PEM_LIB ERR_LIB_PEM /* 9 */
#define ERR_R_DSA_LIB ERR_LIB_DSA /* 10 */ #define ERR_R_DSA_LIB ERR_LIB_DSA /* 10 */
#define ERR_R_X509_LIB ERR_LIB_X509 /* 11 */ #define ERR_R_X509_LIB ERR_LIB_X509 /* 11 */
#define ERR_R_ASN1_LIB ERR_LIB_ASN1 /* 13 */ #define ERR_R_ASN1_LIB ERR_LIB_ASN1 /* 13 */
#define ERR_R_CONF_LIB ERR_LIB_CONF /* 14 */ #define ERR_R_CONF_LIB ERR_LIB_CONF /* 14 */
#define ERR_R_CRYPTO_LIB ERR_LIB_CRYPTO /* 15 */ #define ERR_R_CRYPTO_LIB ERR_LIB_CRYPTO /* 15 */
#define ERR_R_EC_LIB ERR_LIB_EC /* 16 */ #define ERR_R_EC_LIB ERR_LIB_EC /* 16 */
#define ERR_R_SSL_LIB ERR_LIB_SSL /* 20 */ #define ERR_R_SSL_LIB ERR_LIB_SSL /* 20 */
#define ERR_R_BIO_LIB ERR_LIB_BIO /* 32 */ #define ERR_R_BIO_LIB ERR_LIB_BIO /* 32 */
#define ERR_R_PKCS7_LIB ERR_LIB_PKCS7 /* 33 */ #define ERR_R_PKCS7_LIB ERR_LIB_PKCS7 /* 33 */
#define ERR_R_X509V3_LIB ERR_LIB_X509V3 /* 34 */ #define ERR_R_X509V3_LIB ERR_LIB_X509V3 /* 34 */
#define ERR_R_PKCS12_LIB ERR_LIB_PKCS12 /* 35 */ #define ERR_R_PKCS12_LIB ERR_LIB_PKCS12 /* 35 */
#define ERR_R_RAND_LIB ERR_LIB_RAND /* 36 */ #define ERR_R_RAND_LIB ERR_LIB_RAND /* 36 */
#define ERR_R_DSO_LIB ERR_LIB_DSO /* 37 */ #define ERR_R_DSO_LIB ERR_LIB_DSO /* 37 */
#define ERR_R_ENGINE_LIB ERR_LIB_ENGINE /* 38 */ #define ERR_R_ENGINE_LIB ERR_LIB_ENGINE /* 38 */
#define ERR_R_OCSP_LIB ERR_LIB_OCSP /* 39 */ #define ERR_R_OCSP_LIB ERR_LIB_OCSP /* 39 */
#define ERR_R_UI_LIB ERR_LIB_UI /* 40 */ #define ERR_R_UI_LIB ERR_LIB_UI /* 40 */
#define ERR_R_COMP_LIB ERR_LIB_COMP /* 41 */ #define ERR_R_COMP_LIB ERR_LIB_COMP /* 41 */
#define ERR_R_ECDSA_LIB ERR_LIB_ECDSA /* 42 */ #define ERR_R_ECDSA_LIB ERR_LIB_ECDSA /* 42 */
#define ERR_R_ECDH_LIB ERR_LIB_ECDH /* 43 */ #define ERR_R_ECDH_LIB ERR_LIB_ECDH /* 43 */
#define ERR_R_STORE_LIB ERR_LIB_STORE /* 44 */ #define ERR_R_STORE_LIB ERR_LIB_STORE /* 44 */
#define ERR_R_NESTED_ASN1_ERROR 58 #define ERR_R_NESTED_ASN1_ERROR 58
#define ERR_R_BAD_ASN1_OBJECT_HEADER 59 #define ERR_R_BAD_ASN1_OBJECT_HEADER 59
#define ERR_R_BAD_GET_ASN1_OBJECT_CALL 60 #define ERR_R_BAD_GET_ASN1_OBJECT_CALL 60
#define ERR_R_EXPECTING_AN_ASN1_SEQUENCE 61 #define ERR_R_EXPECTING_AN_ASN1_SEQUENCE 61
#define ERR_R_ASN1_LENGTH_MISMATCH 62 #define ERR_R_ASN1_LENGTH_MISMATCH 62
#define ERR_R_MISSING_ASN1_EOS 63 #define ERR_R_MISSING_ASN1_EOS 63
/* fatal error */ /* fatal error */
#define ERR_R_FATAL 64 #define ERR_R_FATAL 64
#define ERR_R_MALLOC_FAILURE (1|ERR_R_FATAL) #define ERR_R_MALLOC_FAILURE (1|ERR_R_FATAL)
#define ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED (2|ERR_R_FATAL) #define ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED (2|ERR_R_FATAL)
#define ERR_R_PASSED_NULL_PARAMETER (3|ERR_R_FATAL) #define ERR_R_PASSED_NULL_PARAMETER (3|ERR_R_FATAL)
#define ERR_R_INTERNAL_ERROR (4|ERR_R_FATAL) #define ERR_R_INTERNAL_ERROR (4|ERR_R_FATAL)
#define ERR_R_DISABLED (5|ERR_R_FATAL) #define ERR_R_DISABLED (5|ERR_R_FATAL)
/* 99 is the maximum possible ERR_R_... code, higher values /* 99 is the maximum possible ERR_R_... code, higher values
* are reserved for the individual libraries */ * are reserved for the individual libraries */
typedef struct ERR_string_data_st typedef struct ERR_string_data_st
{ {
unsigned long error; unsigned long error;
const char *string; const char *string;
} ERR_STRING_DATA; } ERR_STRING_DATA;
void ERR_put_error(int lib, int func,int reason,const char *file,int line); void ERR_put_error(int lib, int func,int reason,const char *file,int line);
void ERR_set_error_data(char *data,int flags); void ERR_set_error_data(char *data,int flags);
@@ -258,15 +264,15 @@ void ERR_set_error_data(char *data,int flags);
unsigned long ERR_get_error(void); unsigned long ERR_get_error(void);
unsigned long ERR_get_error_line(const char **file,int *line); unsigned long ERR_get_error_line(const char **file,int *line);
unsigned long ERR_get_error_line_data(const char **file,int *line, unsigned long ERR_get_error_line_data(const char **file,int *line,
const char **data, int *flags); const char **data, int *flags);
unsigned long ERR_peek_error(void); unsigned long ERR_peek_error(void);
unsigned long ERR_peek_error_line(const char **file,int *line); unsigned long ERR_peek_error_line(const char **file,int *line);
unsigned long ERR_peek_error_line_data(const char **file,int *line, unsigned long ERR_peek_error_line_data(const char **file,int *line,
const char **data,int *flags); const char **data,int *flags);
unsigned long ERR_peek_last_error(void); unsigned long ERR_peek_last_error(void);
unsigned long ERR_peek_last_error_line(const char **file,int *line); unsigned long ERR_peek_last_error_line(const char **file,int *line);
unsigned long ERR_peek_last_error_line_data(const char **file,int *line, unsigned long ERR_peek_last_error_line_data(const char **file,int *line,
const char **data,int *flags); const char **data,int *flags);
void ERR_clear_error(void ); void ERR_clear_error(void );
char *ERR_error_string(unsigned long e,char *buf); char *ERR_error_string(unsigned long e,char *buf);
void ERR_error_string_n(unsigned long e, char *buf, size_t len); void ERR_error_string_n(unsigned long e, char *buf, size_t len);
@@ -274,7 +280,7 @@ const char *ERR_lib_error_string(unsigned long e);
const char *ERR_func_error_string(unsigned long e); const char *ERR_func_error_string(unsigned long e);
const char *ERR_reason_error_string(unsigned long e); const char *ERR_reason_error_string(unsigned long e);
void ERR_print_errors_cb(int (*cb)(const char *str, size_t len, void *u), void ERR_print_errors_cb(int (*cb)(const char *str, size_t len, void *u),
void *u); void *u);
#ifndef OPENSSL_NO_FP_API #ifndef OPENSSL_NO_FP_API
void ERR_print_errors_fp(FILE *fp); void ERR_print_errors_fp(FILE *fp);
#endif #endif
@@ -302,6 +308,12 @@ int ERR_get_next_error_library(void);
int ERR_set_mark(void); int ERR_set_mark(void);
int ERR_pop_to_mark(void); int ERR_pop_to_mark(void);
#ifdef OPENSSL_FIPS
void int_ERR_set_state_func(ERR_STATE *(*get_func)(void),
void (*remove_func)(unsigned long pid));
void int_ERR_lib_init(void);
#endif
/* Already defined in ossl_typ.h */ /* Already defined in ossl_typ.h */
/* typedef struct st_ERR_FNS ERR_FNS; */ /* typedef struct st_ERR_FNS ERR_FNS; */
/* An application can use this function and provide the return value to loaded /* An application can use this function and provide the return value to loaded
@@ -311,9 +323,8 @@ const ERR_FNS *ERR_get_implementation(void);
* the application's "ERR_FNS". */ * the application's "ERR_FNS". */
int ERR_set_implementation(const ERR_FNS *fns); int ERR_set_implementation(const ERR_FNS *fns);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif #endif
dep/include/openssl/evp.h
+519 -431
View File
File diff suppressed because it is too large Load Diff
dep/include/openssl/hmac.h
+15 -15
View File
@@ -66,23 +66,23 @@
#include <openssl/evp.h> #include <openssl/evp.h>
#define HMAC_MAX_MD_CBLOCK 128 /* largest known is SHA512 */ #define HMAC_MAX_MD_CBLOCK 128 /* largest known is SHA512 */
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
typedef struct hmac_ctx_st typedef struct hmac_ctx_st
{ {
const EVP_MD *md; const EVP_MD *md;
EVP_MD_CTX md_ctx; EVP_MD_CTX md_ctx;
EVP_MD_CTX i_ctx; EVP_MD_CTX i_ctx;
EVP_MD_CTX o_ctx; EVP_MD_CTX o_ctx;
unsigned int key_length; unsigned int key_length;
unsigned char key[HMAC_MAX_MD_CBLOCK]; unsigned char key[HMAC_MAX_MD_CBLOCK];
} HMAC_CTX; } HMAC_CTX;
#define HMAC_size(e) (EVP_MD_size((e)->md)) #define HMAC_size(e) (EVP_MD_size((e)->md))
void HMAC_CTX_init(HMAC_CTX *ctx); void HMAC_CTX_init(HMAC_CTX *ctx);
@@ -91,19 +91,19 @@ void HMAC_CTX_cleanup(HMAC_CTX *ctx);
#define HMAC_cleanup(ctx) HMAC_CTX_cleanup(ctx) /* deprecated */ #define HMAC_cleanup(ctx) HMAC_CTX_cleanup(ctx) /* deprecated */
void HMAC_Init(HMAC_CTX *ctx, const void *key, int len, void HMAC_Init(HMAC_CTX *ctx, const void *key, int len,
const EVP_MD *md); /* deprecated */ const EVP_MD *md); /* deprecated */
void HMAC_Init_ex(HMAC_CTX *ctx, const void *key, int len, void HMAC_Init_ex(HMAC_CTX *ctx, const void *key, int len,
const EVP_MD *md, ENGINE *impl); const EVP_MD *md, ENGINE *impl);
void HMAC_Update(HMAC_CTX *ctx, const unsigned char *data, size_t len); void HMAC_Update(HMAC_CTX *ctx, const unsigned char *data, size_t len);
void HMAC_Final(HMAC_CTX *ctx, unsigned char *md, unsigned int *len); void HMAC_Final(HMAC_CTX *ctx, unsigned char *md, unsigned int *len);
unsigned char *HMAC(const EVP_MD *evp_md, const void *key, int key_len, unsigned char *HMAC(const EVP_MD *evp_md, const void *key, int key_len,
const unsigned char *d, size_t n, unsigned char *md, const unsigned char *d, size_t n, unsigned char *md,
unsigned int *md_len); unsigned int *md_len);
void HMAC_CTX_set_flags(HMAC_CTX *ctx, unsigned long flags);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif #endif
dep/include/openssl/idea.h
+15 -13
View File
@@ -65,37 +65,39 @@
#error IDEA is disabled. #error IDEA is disabled.
#endif #endif
#define IDEA_ENCRYPT 1 #define IDEA_ENCRYPT 1
#define IDEA_DECRYPT 0 #define IDEA_DECRYPT 0
#define IDEA_BLOCK 8 #define IDEA_BLOCK 8
#define IDEA_KEY_LENGTH 16 #define IDEA_KEY_LENGTH 16
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
typedef struct idea_key_st typedef struct idea_key_st
{ {
IDEA_INT data[9][6]; IDEA_INT data[9][6];
} IDEA_KEY_SCHEDULE; } IDEA_KEY_SCHEDULE;
const char *idea_options(void); const char *idea_options(void);
void idea_ecb_encrypt(const unsigned char *in, unsigned char *out, void idea_ecb_encrypt(const unsigned char *in, unsigned char *out,
IDEA_KEY_SCHEDULE *ks); IDEA_KEY_SCHEDULE *ks);
#ifdef OPENSSL_FIPS
void private_idea_set_encrypt_key(const unsigned char *key, IDEA_KEY_SCHEDULE *ks);
#endif
void idea_set_encrypt_key(const unsigned char *key, IDEA_KEY_SCHEDULE *ks); void idea_set_encrypt_key(const unsigned char *key, IDEA_KEY_SCHEDULE *ks);
void idea_set_decrypt_key(const IDEA_KEY_SCHEDULE *ek, IDEA_KEY_SCHEDULE *dk); void idea_set_decrypt_key(const IDEA_KEY_SCHEDULE *ek, IDEA_KEY_SCHEDULE *dk);
void idea_cbc_encrypt(const unsigned char *in, unsigned char *out, void idea_cbc_encrypt(const unsigned char *in, unsigned char *out,
long length, IDEA_KEY_SCHEDULE *ks, unsigned char *iv,int enc); long length, IDEA_KEY_SCHEDULE *ks, unsigned char *iv,int enc);
void idea_cfb64_encrypt(const unsigned char *in, unsigned char *out, void idea_cfb64_encrypt(const unsigned char *in, unsigned char *out,
long length, IDEA_KEY_SCHEDULE *ks, unsigned char *iv, long length, IDEA_KEY_SCHEDULE *ks, unsigned char *iv,
int *num,int enc); int *num,int enc);
void idea_ofb64_encrypt(const unsigned char *in, unsigned char *out, void idea_ofb64_encrypt(const unsigned char *in, unsigned char *out,
long length, IDEA_KEY_SCHEDULE *ks, unsigned char *iv, int *num); long length, IDEA_KEY_SCHEDULE *ks, unsigned char *iv, int *num);
void idea_encrypt(unsigned long *in, IDEA_KEY_SCHEDULE *ks); void idea_encrypt(unsigned long *in, IDEA_KEY_SCHEDULE *ks);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif #endif
dep/include/openssl/md2.h
+11 -9
View File
@@ -65,22 +65,25 @@
#endif #endif
#include <stddef.h> #include <stddef.h>
#define MD2_DIGEST_LENGTH 16 #define MD2_DIGEST_LENGTH 16
#define MD2_BLOCK 16 #define MD2_BLOCK 16
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
typedef struct MD2state_st typedef struct MD2state_st
{ {
unsigned int num; unsigned int num;
unsigned char data[MD2_BLOCK]; unsigned char data[MD2_BLOCK];
MD2_INT cksm[MD2_BLOCK]; MD2_INT cksm[MD2_BLOCK];
MD2_INT state[MD2_BLOCK]; MD2_INT state[MD2_BLOCK];
} MD2_CTX; } MD2_CTX;
const char *MD2_options(void); const char *MD2_options(void);
#ifdef OPENSSL_FIPS
int private_MD2_Init(MD2_CTX *c);
#endif
int MD2_Init(MD2_CTX *c); int MD2_Init(MD2_CTX *c);
int MD2_Update(MD2_CTX *c, const unsigned char *data, size_t len); int MD2_Update(MD2_CTX *c, const unsigned char *data, size_t len);
int MD2_Final(unsigned char *md, MD2_CTX *c); int MD2_Final(unsigned char *md, MD2_CTX *c);
@@ -90,4 +93,3 @@ unsigned char *MD2(const unsigned char *d, size_t n,unsigned char *md);
#endif #endif
#endif #endif
dep/include/openssl/md4.h
+13 -11
View File
@@ -73,7 +73,7 @@ extern "C" {
/* /*
* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
* ! MD4_LONG has to be at least 32 bits wide. If it's wider, then ! * ! MD4_LONG has to be at least 32 bits wide. If it's wider, then !
* ! MD4_LONG_LOG2 has to be defined along. ! * ! MD4_LONG_LOG2 has to be defined along. !
* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
*/ */
@@ -87,24 +87,27 @@ extern "C" {
* does it have on performance on none-T3E machines. I could declare * does it have on performance on none-T3E machines. I could declare
* int, but at least on C90 sizeof(int) can be chosen at compile time. * int, but at least on C90 sizeof(int) can be chosen at compile time.
* So I've chosen long... * So I've chosen long...
* <[email protected]> * <[email protected]>
*/ */
#else #else
#define MD4_LONG unsigned int #define MD4_LONG unsigned int
#endif #endif
#define MD4_CBLOCK 64 #define MD4_CBLOCK 64
#define MD4_LBLOCK (MD4_CBLOCK/4) #define MD4_LBLOCK (MD4_CBLOCK/4)
#define MD4_DIGEST_LENGTH 16 #define MD4_DIGEST_LENGTH 16
typedef struct MD4state_st typedef struct MD4state_st
{ {
MD4_LONG A,B,C,D; MD4_LONG A,B,C,D;
MD4_LONG Nl,Nh; MD4_LONG Nl,Nh;
MD4_LONG data[MD4_LBLOCK]; MD4_LONG data[MD4_LBLOCK];
unsigned int num; unsigned int num;
} MD4_CTX; } MD4_CTX;
#ifdef OPENSSL_FIPS
int private_MD4_Init(MD4_CTX *c);
#endif
int MD4_Init(MD4_CTX *c); int MD4_Init(MD4_CTX *c);
int MD4_Update(MD4_CTX *c, const void *data, size_t len); int MD4_Update(MD4_CTX *c, const void *data, size_t len);
int MD4_Final(unsigned char *md, MD4_CTX *c); int MD4_Final(unsigned char *md, MD4_CTX *c);
@@ -115,4 +118,3 @@ void MD4_Transform(MD4_CTX *c, const unsigned char *b);
#endif #endif
#endif #endif
dep/include/openssl/md5.h
+13 -11
View File
@@ -73,7 +73,7 @@ extern "C" {
/* /*
* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
* ! MD5_LONG has to be at least 32 bits wide. If it's wider, then ! * ! MD5_LONG has to be at least 32 bits wide. If it's wider, then !
* ! MD5_LONG_LOG2 has to be defined along. ! * ! MD5_LONG_LOG2 has to be defined along. !
* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
*/ */
@@ -87,24 +87,27 @@ extern "C" {
* does it have on performance on none-T3E machines. I could declare * does it have on performance on none-T3E machines. I could declare
* int, but at least on C90 sizeof(int) can be chosen at compile time. * int, but at least on C90 sizeof(int) can be chosen at compile time.
* So I've chosen long... * So I've chosen long...
* <[email protected]> * <[email protected]>
*/ */
#else #else
#define MD5_LONG unsigned int #define MD5_LONG unsigned int
#endif #endif
#define MD5_CBLOCK 64 #define MD5_CBLOCK 64
#define MD5_LBLOCK (MD5_CBLOCK/4) #define MD5_LBLOCK (MD5_CBLOCK/4)
#define MD5_DIGEST_LENGTH 16 #define MD5_DIGEST_LENGTH 16
typedef struct MD5state_st typedef struct MD5state_st
{ {
MD5_LONG A,B,C,D; MD5_LONG A,B,C,D;
MD5_LONG Nl,Nh; MD5_LONG Nl,Nh;
MD5_LONG data[MD5_LBLOCK]; MD5_LONG data[MD5_LBLOCK];
unsigned int num; unsigned int num;
} MD5_CTX; } MD5_CTX;
#ifdef OPENSSL_FIPS
int private_MD5_Init(MD5_CTX *c);
#endif
int MD5_Init(MD5_CTX *c); int MD5_Init(MD5_CTX *c);
int MD5_Update(MD5_CTX *c, const void *data, size_t len); int MD5_Update(MD5_CTX *c, const void *data, size_t len);
int MD5_Final(unsigned char *md, MD5_CTX *c); int MD5_Final(unsigned char *md, MD5_CTX *c);
@@ -115,4 +118,3 @@ void MD5_Transform(MD5_CTX *c, const unsigned char *b);
#endif #endif
#endif #endif
dep/include/openssl/mdc2.h
-97
View File
@@ -1,97 +0,0 @@
/* crypto/mdc2/mdc2.h */
/* Copyright (C) 1995-1998 Eric Young ([email protected])
* All rights reserved.
*
* This package is an SSL implementation written
* by Eric Young ([email protected]).
* The implementation was written so as to conform with Netscapes SSL.
*
* This library is free for commercial and non-commercial use as long as
* the following conditions are aheared to. The following conditions
* apply to all code found in this distribution, be it the RC4, RSA,
* lhash, DES, etc., code; not just the SSL code. The SSL documentation
* included with this distribution is covered by the same copyright terms
* except that the holder is Tim Hudson ([email protected]).
*
* Copyright remains Eric Young's, and as such any Copyright notices in
* the code are not to be removed.
* If this package is used in a product, Eric Young should be given attribution
* as the author of the parts of the library used.
* This can be in the form of a textual message at program startup or
* in documentation (online or textual) provided with the package.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* "This product includes cryptographic software written by
* Eric Young ([email protected])"
* The word 'cryptographic' can be left out if the rouines from the library
* being used are not cryptographic related :-).
* 4. If you include any Windows specific code (or a derivative thereof) from
* the apps directory (application code) you must include an acknowledgement:
* "This product includes software written by Tim Hudson ([email protected])"
*
* THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* The licence and distribution terms for any publically available version or
* derivative of this code cannot be changed. i.e. this code cannot simply be
* copied and put under another distribution licence
* [including the GNU Public Licence.]
*/
#ifndef HEADER_MDC2_H
#define HEADER_MDC2_H
#include <openssl/des.h>
#ifdef __cplusplus
extern "C" {
#endif
#ifdef OPENSSL_NO_MDC2
#error MDC2 is disabled.
#endif
#define MDC2_BLOCK 8
#define MDC2_DIGEST_LENGTH 16
typedef struct mdc2_ctx_st
{
int num;
unsigned char data[MDC2_BLOCK];
DES_cblock h,hh;
int pad_type; /* either 1 or 2, default 1 */
} MDC2_CTX;
int MDC2_Init(MDC2_CTX *c);
int MDC2_Update(MDC2_CTX *c, const unsigned char *data, unsigned long len);
int MDC2_Final(unsigned char *md, MDC2_CTX *c);
unsigned char *MDC2(const unsigned char *d, unsigned long n,
unsigned char *md);
#ifdef __cplusplus
}
#endif
#endif
dep/include/openssl/obj_mac.h
+3436 -3070
View File
File diff suppressed because it is too large Load Diff
dep/include/openssl/ocsp.h
+196 -188
View File
@@ -74,20 +74,20 @@ extern "C" {
/* Various flags and values */ /* Various flags and values */
#define OCSP_DEFAULT_NONCE_LENGTH 16 #define OCSP_DEFAULT_NONCE_LENGTH 16
#define OCSP_NOCERTS 0x1 #define OCSP_NOCERTS 0x1
#define OCSP_NOINTERN 0x2 #define OCSP_NOINTERN 0x2
#define OCSP_NOSIGS 0x4 #define OCSP_NOSIGS 0x4
#define OCSP_NOCHAIN 0x8 #define OCSP_NOCHAIN 0x8
#define OCSP_NOVERIFY 0x10 #define OCSP_NOVERIFY 0x10
#define OCSP_NOEXPLICIT 0x20 #define OCSP_NOEXPLICIT 0x20
#define OCSP_NOCASIGN 0x40 #define OCSP_NOCASIGN 0x40
#define OCSP_NODELEGATED 0x80 #define OCSP_NODELEGATED 0x80
#define OCSP_NOCHECKS 0x100 #define OCSP_NOCHECKS 0x100
#define OCSP_TRUSTOTHER 0x200 #define OCSP_TRUSTOTHER 0x200
#define OCSP_RESPID_KEY 0x400 #define OCSP_RESPID_KEY 0x400
#define OCSP_NOTIME 0x800 #define OCSP_NOTIME 0x800
/* CertID ::= SEQUENCE { /* CertID ::= SEQUENCE {
* hashAlgorithm AlgorithmIdentifier, * hashAlgorithm AlgorithmIdentifier,
@@ -96,12 +96,12 @@ extern "C" {
* serialNumber CertificateSerialNumber } * serialNumber CertificateSerialNumber }
*/ */
typedef struct ocsp_cert_id_st typedef struct ocsp_cert_id_st
{ {
X509_ALGOR *hashAlgorithm; X509_ALGOR *hashAlgorithm;
ASN1_OCTET_STRING *issuerNameHash; ASN1_OCTET_STRING *issuerNameHash;
ASN1_OCTET_STRING *issuerKeyHash; ASN1_OCTET_STRING *issuerKeyHash;
ASN1_INTEGER *serialNumber; ASN1_INTEGER *serialNumber;
} OCSP_CERTID; } OCSP_CERTID;
DECLARE_STACK_OF(OCSP_CERTID) DECLARE_STACK_OF(OCSP_CERTID)
@@ -110,10 +110,10 @@ DECLARE_STACK_OF(OCSP_CERTID)
* singleRequestExtensions [0] EXPLICIT Extensions OPTIONAL } * singleRequestExtensions [0] EXPLICIT Extensions OPTIONAL }
*/ */
typedef struct ocsp_one_request_st typedef struct ocsp_one_request_st
{ {
OCSP_CERTID *reqCert; OCSP_CERTID *reqCert;
STACK_OF(X509_EXTENSION) *singleRequestExtensions; STACK_OF(X509_EXTENSION) *singleRequestExtensions;
} OCSP_ONEREQ; } OCSP_ONEREQ;
DECLARE_STACK_OF(OCSP_ONEREQ) DECLARE_STACK_OF(OCSP_ONEREQ)
DECLARE_ASN1_SET_OF(OCSP_ONEREQ) DECLARE_ASN1_SET_OF(OCSP_ONEREQ)
@@ -126,12 +126,12 @@ DECLARE_ASN1_SET_OF(OCSP_ONEREQ)
* requestExtensions [2] EXPLICIT Extensions OPTIONAL } * requestExtensions [2] EXPLICIT Extensions OPTIONAL }
*/ */
typedef struct ocsp_req_info_st typedef struct ocsp_req_info_st
{ {
ASN1_INTEGER *version; ASN1_INTEGER *version;
GENERAL_NAME *requestorName; GENERAL_NAME *requestorName;
STACK_OF(OCSP_ONEREQ) *requestList; STACK_OF(OCSP_ONEREQ) *requestList;
STACK_OF(X509_EXTENSION) *requestExtensions; STACK_OF(X509_EXTENSION) *requestExtensions;
} OCSP_REQINFO; } OCSP_REQINFO;
/* Signature ::= SEQUENCE { /* Signature ::= SEQUENCE {
* signatureAlgorithm AlgorithmIdentifier, * signatureAlgorithm AlgorithmIdentifier,
@@ -139,21 +139,21 @@ typedef struct ocsp_req_info_st
* certs [0] EXPLICIT SEQUENCE OF Certificate OPTIONAL } * certs [0] EXPLICIT SEQUENCE OF Certificate OPTIONAL }
*/ */
typedef struct ocsp_signature_st typedef struct ocsp_signature_st
{ {
X509_ALGOR *signatureAlgorithm; X509_ALGOR *signatureAlgorithm;
ASN1_BIT_STRING *signature; ASN1_BIT_STRING *signature;
STACK_OF(X509) *certs; STACK_OF(X509) *certs;
} OCSP_SIGNATURE; } OCSP_SIGNATURE;
/* OCSPRequest ::= SEQUENCE { /* OCSPRequest ::= SEQUENCE {
* tbsRequest TBSRequest, * tbsRequest TBSRequest,
* optionalSignature [0] EXPLICIT Signature OPTIONAL } * optionalSignature [0] EXPLICIT Signature OPTIONAL }
*/ */
typedef struct ocsp_request_st typedef struct ocsp_request_st
{ {
OCSP_REQINFO *tbsRequest; OCSP_REQINFO *tbsRequest;
OCSP_SIGNATURE *optionalSignature; /* OPTIONAL */ OCSP_SIGNATURE *optionalSignature; /* OPTIONAL */
} OCSP_REQUEST; } OCSP_REQUEST;
/* OCSPResponseStatus ::= ENUMERATED { /* OCSPResponseStatus ::= ENUMERATED {
* successful (0), --Response has valid confirmations * successful (0), --Response has valid confirmations
@@ -177,20 +177,20 @@ typedef struct ocsp_request_st
* response OCTET STRING } * response OCTET STRING }
*/ */
typedef struct ocsp_resp_bytes_st typedef struct ocsp_resp_bytes_st
{ {
ASN1_OBJECT *responseType; ASN1_OBJECT *responseType;
ASN1_OCTET_STRING *response; ASN1_OCTET_STRING *response;
} OCSP_RESPBYTES; } OCSP_RESPBYTES;
/* OCSPResponse ::= SEQUENCE { /* OCSPResponse ::= SEQUENCE {
* responseStatus OCSPResponseStatus, * responseStatus OCSPResponseStatus,
* responseBytes [0] EXPLICIT ResponseBytes OPTIONAL } * responseBytes [0] EXPLICIT ResponseBytes OPTIONAL }
*/ */
typedef struct ocsp_response_st struct ocsp_response_st
{ {
ASN1_ENUMERATED *responseStatus; ASN1_ENUMERATED *responseStatus;
OCSP_RESPBYTES *responseBytes; OCSP_RESPBYTES *responseBytes;
} OCSP_RESPONSE; };
/* ResponderID ::= CHOICE { /* ResponderID ::= CHOICE {
* byName [1] Name, * byName [1] Name,
@@ -198,14 +198,18 @@ typedef struct ocsp_response_st
*/ */
#define V_OCSP_RESPID_NAME 0 #define V_OCSP_RESPID_NAME 0
#define V_OCSP_RESPID_KEY 1 #define V_OCSP_RESPID_KEY 1
typedef struct ocsp_responder_id_st struct ocsp_responder_id_st
{ {
int type; int type;
union { union {
X509_NAME* byName; X509_NAME* byName;
ASN1_OCTET_STRING *byKey; ASN1_OCTET_STRING *byKey;
} value; } value;
} OCSP_RESPID; };
DECLARE_STACK_OF(OCSP_RESPID)
DECLARE_ASN1_FUNCTIONS(OCSP_RESPID)
/* KeyHash ::= OCTET STRING --SHA-1 hash of responder's public key /* KeyHash ::= OCTET STRING --SHA-1 hash of responder's public key
* --(excluding the tag and length fields) * --(excluding the tag and length fields)
*/ */
@@ -215,10 +219,10 @@ typedef struct ocsp_responder_id_st
* revocationReason [0] EXPLICIT CRLReason OPTIONAL } * revocationReason [0] EXPLICIT CRLReason OPTIONAL }
*/ */
typedef struct ocsp_revoked_info_st typedef struct ocsp_revoked_info_st
{ {
ASN1_GENERALIZEDTIME *revocationTime; ASN1_GENERALIZEDTIME *revocationTime;
ASN1_ENUMERATED *revocationReason; ASN1_ENUMERATED *revocationReason;
} OCSP_REVOKEDINFO; } OCSP_REVOKEDINFO;
/* CertStatus ::= CHOICE { /* CertStatus ::= CHOICE {
* good [0] IMPLICIT NULL, * good [0] IMPLICIT NULL,
@@ -229,14 +233,14 @@ typedef struct ocsp_revoked_info_st
#define V_OCSP_CERTSTATUS_REVOKED 1 #define V_OCSP_CERTSTATUS_REVOKED 1
#define V_OCSP_CERTSTATUS_UNKNOWN 2 #define V_OCSP_CERTSTATUS_UNKNOWN 2
typedef struct ocsp_cert_status_st typedef struct ocsp_cert_status_st
{ {
int type; int type;
union { union {
ASN1_NULL *good; ASN1_NULL *good;
OCSP_REVOKEDINFO *revoked; OCSP_REVOKEDINFO *revoked;
ASN1_NULL *unknown; ASN1_NULL *unknown;
} value; } value;
} OCSP_CERTSTATUS; } OCSP_CERTSTATUS;
/* SingleResponse ::= SEQUENCE { /* SingleResponse ::= SEQUENCE {
* certID CertID, * certID CertID,
@@ -246,13 +250,13 @@ typedef struct ocsp_cert_status_st
* singleExtensions [1] EXPLICIT Extensions OPTIONAL } * singleExtensions [1] EXPLICIT Extensions OPTIONAL }
*/ */
typedef struct ocsp_single_response_st typedef struct ocsp_single_response_st
{ {
OCSP_CERTID *certId; OCSP_CERTID *certId;
OCSP_CERTSTATUS *certStatus; OCSP_CERTSTATUS *certStatus;
ASN1_GENERALIZEDTIME *thisUpdate; ASN1_GENERALIZEDTIME *thisUpdate;
ASN1_GENERALIZEDTIME *nextUpdate; ASN1_GENERALIZEDTIME *nextUpdate;
STACK_OF(X509_EXTENSION) *singleExtensions; STACK_OF(X509_EXTENSION) *singleExtensions;
} OCSP_SINGLERESP; } OCSP_SINGLERESP;
DECLARE_STACK_OF(OCSP_SINGLERESP) DECLARE_STACK_OF(OCSP_SINGLERESP)
DECLARE_ASN1_SET_OF(OCSP_SINGLERESP) DECLARE_ASN1_SET_OF(OCSP_SINGLERESP)
@@ -265,13 +269,13 @@ DECLARE_ASN1_SET_OF(OCSP_SINGLERESP)
* responseExtensions [1] EXPLICIT Extensions OPTIONAL } * responseExtensions [1] EXPLICIT Extensions OPTIONAL }
*/ */
typedef struct ocsp_response_data_st typedef struct ocsp_response_data_st
{ {
ASN1_INTEGER *version; ASN1_INTEGER *version;
OCSP_RESPID *responderId; OCSP_RESPID *responderId;
ASN1_GENERALIZEDTIME *producedAt; ASN1_GENERALIZEDTIME *producedAt;
STACK_OF(OCSP_SINGLERESP) *responses; STACK_OF(OCSP_SINGLERESP) *responses;
STACK_OF(X509_EXTENSION) *responseExtensions; STACK_OF(X509_EXTENSION) *responseExtensions;
} OCSP_RESPDATA; } OCSP_RESPDATA;
/* BasicOCSPResponse ::= SEQUENCE { /* BasicOCSPResponse ::= SEQUENCE {
* tbsResponseData ResponseData, * tbsResponseData ResponseData,
@@ -288,20 +292,20 @@ typedef struct ocsp_response_data_st
a bit odd, but that's the spec. Also note that the data structures do not a bit odd, but that's the spec. Also note that the data structures do not
leave anywhere to independently specify the algorithm used for the initial leave anywhere to independently specify the algorithm used for the initial
hash. So, we look at the signature-specification algorithm, and try to do hash. So, we look at the signature-specification algorithm, and try to do
something intelligent. -- Kathy Weinhold, CertCo */ something intelligent. -- Kathy Weinhold, CertCo */
/* Note 2: /* Note 2:
It seems that the mentioned passage from RFC 2560 (section 4.2.1) is open It seems that the mentioned passage from RFC 2560 (section 4.2.1) is open
for interpretation. I've done tests against another responder, and found for interpretation. I've done tests against another responder, and found
that it doesn't do the double hashing that the RFC seems to say one that it doesn't do the double hashing that the RFC seems to say one
should. Therefore, all relevant functions take a flag saying which should. Therefore, all relevant functions take a flag saying which
variant should be used. -- Richard Levitte, OpenSSL team and CeloCom */ variant should be used. -- Richard Levitte, OpenSSL team and CeloCom */
typedef struct ocsp_basic_response_st typedef struct ocsp_basic_response_st
{ {
OCSP_RESPDATA *tbsResponseData; OCSP_RESPDATA *tbsResponseData;
X509_ALGOR *signatureAlgorithm; X509_ALGOR *signatureAlgorithm;
ASN1_BIT_STRING *signature; ASN1_BIT_STRING *signature;
STACK_OF(X509) *certs; STACK_OF(X509) *certs;
} OCSP_BASICRESP; } OCSP_BASICRESP;
/* /*
* CRLReason ::= ENUMERATED { * CRLReason ::= ENUMERATED {
@@ -331,9 +335,9 @@ typedef struct ocsp_basic_response_st
*/ */
typedef struct ocsp_crl_id_st typedef struct ocsp_crl_id_st
{ {
ASN1_IA5STRING *crlUrl; ASN1_IA5STRING *crlUrl;
ASN1_INTEGER *crlNum; ASN1_INTEGER *crlNum;
ASN1_GENERALIZEDTIME *crlTime; ASN1_GENERALIZEDTIME *crlTime;
} OCSP_CRLID; } OCSP_CRLID;
/* ServiceLocator ::= SEQUENCE { /* ServiceLocator ::= SEQUENCE {
@@ -342,68 +346,72 @@ typedef struct ocsp_crl_id_st
*/ */
typedef struct ocsp_service_locator_st typedef struct ocsp_service_locator_st
{ {
X509_NAME* issuer; X509_NAME* issuer;
STACK_OF(ACCESS_DESCRIPTION) *locator; STACK_OF(ACCESS_DESCRIPTION) *locator;
} OCSP_SERVICELOC; } OCSP_SERVICELOC;
#define PEM_STRING_OCSP_REQUEST "OCSP REQUEST" #define PEM_STRING_OCSP_REQUEST "OCSP REQUEST"
#define PEM_STRING_OCSP_RESPONSE "OCSP RESPONSE" #define PEM_STRING_OCSP_RESPONSE "OCSP RESPONSE"
#define d2i_OCSP_REQUEST_bio(bp,p) ASN1_d2i_bio_of(OCSP_REQUEST,OCSP_REQUEST_new,d2i_OCSP_REQUEST,bp,p) #define d2i_OCSP_REQUEST_bio(bp,p) ASN1_d2i_bio_of(OCSP_REQUEST,OCSP_REQUEST_new,d2i_OCSP_REQUEST,bp,p)
#define d2i_OCSP_RESPONSE_bio(bp,p) ASN1_d2i_bio_of(OCSP_RESPONSE,OCSP_RESPONSE_new,d2i_OCSP_RESPONSE,bp,p) #define d2i_OCSP_RESPONSE_bio(bp,p) ASN1_d2i_bio_of(OCSP_RESPONSE,OCSP_RESPONSE_new,d2i_OCSP_RESPONSE,bp,p)
#define PEM_read_bio_OCSP_REQUEST(bp,x,cb) (OCSP_REQUEST *)PEM_ASN1_read_bio( \ #define PEM_read_bio_OCSP_REQUEST(bp,x,cb) (OCSP_REQUEST *)PEM_ASN1_read_bio( \
(char *(*)())d2i_OCSP_REQUEST,PEM_STRING_OCSP_REQUEST,bp,(char **)x,cb,NULL) (char *(*)())d2i_OCSP_REQUEST,PEM_STRING_OCSP_REQUEST,bp,(char **)x,cb,NULL)
#define PEM_read_bio_OCSP_RESPONSE(bp,x,cb)(OCSP_RESPONSE *)PEM_ASN1_read_bio(\ #define PEM_read_bio_OCSP_RESPONSE(bp,x,cb)(OCSP_RESPONSE *)PEM_ASN1_read_bio(\
(char *(*)())d2i_OCSP_RESPONSE,PEM_STRING_OCSP_RESPONSE,bp,(char **)x,cb,NULL) (char *(*)())d2i_OCSP_RESPONSE,PEM_STRING_OCSP_RESPONSE,bp,(char **)x,cb,NULL)
#define PEM_write_bio_OCSP_REQUEST(bp,o) \ #define PEM_write_bio_OCSP_REQUEST(bp,o) \
PEM_ASN1_write_bio((int (*)())i2d_OCSP_REQUEST,PEM_STRING_OCSP_REQUEST,\ PEM_ASN1_write_bio((int (*)())i2d_OCSP_REQUEST,PEM_STRING_OCSP_REQUEST,\
bp,(char *)o, NULL,NULL,0,NULL,NULL) bp,(char *)o, NULL,NULL,0,NULL,NULL)
#define PEM_write_bio_OCSP_RESPONSE(bp,o) \ #define PEM_write_bio_OCSP_RESPONSE(bp,o) \
PEM_ASN1_write_bio((int (*)())i2d_OCSP_RESPONSE,PEM_STRING_OCSP_RESPONSE,\ PEM_ASN1_write_bio((int (*)())i2d_OCSP_RESPONSE,PEM_STRING_OCSP_RESPONSE,\
bp,(char *)o, NULL,NULL,0,NULL,NULL) bp,(char *)o, NULL,NULL,0,NULL,NULL)
#define i2d_OCSP_RESPONSE_bio(bp,o) ASN1_i2d_bio_of(OCSP_RESPONSE,i2d_OCSP_RESPONSE,bp,o) #define i2d_OCSP_RESPONSE_bio(bp,o) ASN1_i2d_bio_of(OCSP_RESPONSE,i2d_OCSP_RESPONSE,bp,o)
#define i2d_OCSP_REQUEST_bio(bp,o) ASN1_i2d_bio_of(OCSP_REQUEST,i2d_OCSP_REQUEST,bp,o) #define i2d_OCSP_REQUEST_bio(bp,o) ASN1_i2d_bio_of(OCSP_REQUEST,i2d_OCSP_REQUEST,bp,o)
#define OCSP_REQUEST_sign(o,pkey,md) \ #define OCSP_REQUEST_sign(o,pkey,md) \
ASN1_item_sign(ASN1_ITEM_rptr(OCSP_REQINFO),\ ASN1_item_sign(ASN1_ITEM_rptr(OCSP_REQINFO),\
o->optionalSignature->signatureAlgorithm,NULL,\ o->optionalSignature->signatureAlgorithm,NULL,\
o->optionalSignature->signature,o->tbsRequest,pkey,md) o->optionalSignature->signature,o->tbsRequest,pkey,md)
#define OCSP_BASICRESP_sign(o,pkey,md,d) \ #define OCSP_BASICRESP_sign(o,pkey,md,d) \
ASN1_item_sign(ASN1_ITEM_rptr(OCSP_RESPDATA),o->signatureAlgorithm,NULL,\ ASN1_item_sign(ASN1_ITEM_rptr(OCSP_RESPDATA),o->signatureAlgorithm,NULL,\
o->signature,o->tbsResponseData,pkey,md) o->signature,o->tbsResponseData,pkey,md)
#define OCSP_REQUEST_verify(a,r) ASN1_item_verify(ASN1_ITEM_rptr(OCSP_REQINFO),\ #define OCSP_REQUEST_verify(a,r) ASN1_item_verify(ASN1_ITEM_rptr(OCSP_REQINFO),\
a->optionalSignature->signatureAlgorithm,\ a->optionalSignature->signatureAlgorithm,\
a->optionalSignature->signature,a->tbsRequest,r) a->optionalSignature->signature,a->tbsRequest,r)
#define OCSP_BASICRESP_verify(a,r,d) ASN1_item_verify(ASN1_ITEM_rptr(OCSP_RESPDATA),\ #define OCSP_BASICRESP_verify(a,r,d) ASN1_item_verify(ASN1_ITEM_rptr(OCSP_RESPDATA),\
a->signatureAlgorithm,a->signature,a->tbsResponseData,r) a->signatureAlgorithm,a->signature,a->tbsResponseData,r)
#define ASN1_BIT_STRING_digest(data,type,md,len) \ #define ASN1_BIT_STRING_digest(data,type,md,len) \
ASN1_item_digest(ASN1_ITEM_rptr(ASN1_BIT_STRING),type,data,md,len) ASN1_item_digest(ASN1_ITEM_rptr(ASN1_BIT_STRING),type,data,md,len)
#define OCSP_CERTID_dup(cid) ASN1_dup_of(OCSP_CERTID,i2d_OCSP_CERTID,d2i_OCSP_CERTID,cid) #define OCSP_CERTID_dup(cid) ASN1_dup_of(OCSP_CERTID,i2d_OCSP_CERTID,d2i_OCSP_CERTID,cid)
#define OCSP_CERTSTATUS_dup(cs)\ #define OCSP_CERTSTATUS_dup(cs)\
(OCSP_CERTSTATUS*)ASN1_dup((int(*)())i2d_OCSP_CERTSTATUS,\ (OCSP_CERTSTATUS*)ASN1_dup((int(*)())i2d_OCSP_CERTSTATUS,\
(char *(*)())d2i_OCSP_CERTSTATUS,(char *)(cs)) (char *(*)())d2i_OCSP_CERTSTATUS,(char *)(cs))
OCSP_RESPONSE *OCSP_sendreq_bio(BIO *b, char *path, OCSP_REQUEST *req); OCSP_RESPONSE *OCSP_sendreq_bio(BIO *b, char *path, OCSP_REQUEST *req);
OCSP_REQ_CTX *OCSP_sendreq_new(BIO *io, char *path, OCSP_REQUEST *req,
int maxline);
int OCSP_sendreq_nbio(OCSP_RESPONSE **presp, OCSP_REQ_CTX *rctx);
void OCSP_REQ_CTX_free(OCSP_REQ_CTX *rctx);
OCSP_CERTID *OCSP_cert_to_id(const EVP_MD *dgst, X509 *subject, X509 *issuer); OCSP_CERTID *OCSP_cert_to_id(const EVP_MD *dgst, X509 *subject, X509 *issuer);
OCSP_CERTID *OCSP_cert_id_new(const EVP_MD *dgst, OCSP_CERTID *OCSP_cert_id_new(const EVP_MD *dgst,
X509_NAME *issuerName, X509_NAME *issuerName,
ASN1_BIT_STRING* issuerKey, ASN1_BIT_STRING* issuerKey,
ASN1_INTEGER *serialNumber); ASN1_INTEGER *serialNumber);
OCSP_ONEREQ *OCSP_request_add0_id(OCSP_REQUEST *req, OCSP_CERTID *cid); OCSP_ONEREQ *OCSP_request_add0_id(OCSP_REQUEST *req, OCSP_CERTID *cid);
@@ -416,11 +424,11 @@ int OCSP_request_set1_name(OCSP_REQUEST *req, X509_NAME *nm);
int OCSP_request_add1_cert(OCSP_REQUEST *req, X509 *cert); int OCSP_request_add1_cert(OCSP_REQUEST *req, X509 *cert);
int OCSP_request_sign(OCSP_REQUEST *req, int OCSP_request_sign(OCSP_REQUEST *req,
X509 *signer, X509 *signer,
EVP_PKEY *key, EVP_PKEY *key,
const EVP_MD *dgst, const EVP_MD *dgst,
STACK_OF(X509) *certs, STACK_OF(X509) *certs,
unsigned long flags); unsigned long flags);
int OCSP_response_status(OCSP_RESPONSE *resp); int OCSP_response_status(OCSP_RESPONSE *resp);
OCSP_BASICRESP *OCSP_response_get1_basic(OCSP_RESPONSE *resp); OCSP_BASICRESP *OCSP_response_get1_basic(OCSP_RESPONSE *resp);
@@ -429,17 +437,17 @@ int OCSP_resp_count(OCSP_BASICRESP *bs);
OCSP_SINGLERESP *OCSP_resp_get0(OCSP_BASICRESP *bs, int idx); OCSP_SINGLERESP *OCSP_resp_get0(OCSP_BASICRESP *bs, int idx);
int OCSP_resp_find(OCSP_BASICRESP *bs, OCSP_CERTID *id, int last); int OCSP_resp_find(OCSP_BASICRESP *bs, OCSP_CERTID *id, int last);
int OCSP_single_get0_status(OCSP_SINGLERESP *single, int *reason, int OCSP_single_get0_status(OCSP_SINGLERESP *single, int *reason,
ASN1_GENERALIZEDTIME **revtime, ASN1_GENERALIZEDTIME **revtime,
ASN1_GENERALIZEDTIME **thisupd, ASN1_GENERALIZEDTIME **thisupd,
ASN1_GENERALIZEDTIME **nextupd); ASN1_GENERALIZEDTIME **nextupd);
int OCSP_resp_find_status(OCSP_BASICRESP *bs, OCSP_CERTID *id, int *status, int OCSP_resp_find_status(OCSP_BASICRESP *bs, OCSP_CERTID *id, int *status,
int *reason, int *reason,
ASN1_GENERALIZEDTIME **revtime, ASN1_GENERALIZEDTIME **revtime,
ASN1_GENERALIZEDTIME **thisupd, ASN1_GENERALIZEDTIME **thisupd,
ASN1_GENERALIZEDTIME **nextupd); ASN1_GENERALIZEDTIME **nextupd);
int OCSP_check_validity(ASN1_GENERALIZEDTIME *thisupd, int OCSP_check_validity(ASN1_GENERALIZEDTIME *thisupd,
ASN1_GENERALIZEDTIME *nextupd, ASN1_GENERALIZEDTIME *nextupd,
long sec, long maxsec); long sec, long maxsec);
int OCSP_request_verify(OCSP_REQUEST *req, STACK_OF(X509) *certs, X509_STORE *store, unsigned long flags); int OCSP_request_verify(OCSP_REQUEST *req, STACK_OF(X509) *certs, X509_STORE *store, unsigned long flags);
@@ -452,24 +460,24 @@ int OCSP_request_onereq_count(OCSP_REQUEST *req);
OCSP_ONEREQ *OCSP_request_onereq_get0(OCSP_REQUEST *req, int i); OCSP_ONEREQ *OCSP_request_onereq_get0(OCSP_REQUEST *req, int i);
OCSP_CERTID *OCSP_onereq_get0_id(OCSP_ONEREQ *one); OCSP_CERTID *OCSP_onereq_get0_id(OCSP_ONEREQ *one);
int OCSP_id_get0_info(ASN1_OCTET_STRING **piNameHash, ASN1_OBJECT **pmd, int OCSP_id_get0_info(ASN1_OCTET_STRING **piNameHash, ASN1_OBJECT **pmd,
ASN1_OCTET_STRING **pikeyHash, ASN1_OCTET_STRING **pikeyHash,
ASN1_INTEGER **pserial, OCSP_CERTID *cid); ASN1_INTEGER **pserial, OCSP_CERTID *cid);
int OCSP_request_is_signed(OCSP_REQUEST *req); int OCSP_request_is_signed(OCSP_REQUEST *req);
OCSP_RESPONSE *OCSP_response_create(int status, OCSP_BASICRESP *bs); OCSP_RESPONSE *OCSP_response_create(int status, OCSP_BASICRESP *bs);
OCSP_SINGLERESP *OCSP_basic_add1_status(OCSP_BASICRESP *rsp, OCSP_SINGLERESP *OCSP_basic_add1_status(OCSP_BASICRESP *rsp,
OCSP_CERTID *cid, OCSP_CERTID *cid,
int status, int reason, int status, int reason,
ASN1_TIME *revtime, ASN1_TIME *revtime,
ASN1_TIME *thisupd, ASN1_TIME *nextupd); ASN1_TIME *thisupd, ASN1_TIME *nextupd);
int OCSP_basic_add1_cert(OCSP_BASICRESP *resp, X509 *cert); int OCSP_basic_add1_cert(OCSP_BASICRESP *resp, X509 *cert);
int OCSP_basic_sign(OCSP_BASICRESP *brsp, int OCSP_basic_sign(OCSP_BASICRESP *brsp,
X509 *signer, EVP_PKEY *key, const EVP_MD *dgst, X509 *signer, EVP_PKEY *key, const EVP_MD *dgst,
STACK_OF(X509) *certs, unsigned long flags); STACK_OF(X509) *certs, unsigned long flags);
ASN1_STRING *ASN1_STRING_encode(ASN1_STRING *s, i2d_of_void *i2d, ASN1_STRING *ASN1_STRING_encode(ASN1_STRING *s, i2d_of_void *i2d,
void *data, STACK_OF(ASN1_OBJECT) *sk); void *data, STACK_OF(ASN1_OBJECT) *sk);
#define ASN1_STRING_encode_of(type,s,i2d,data,sk) \ #define ASN1_STRING_encode_of(type,s,i2d,data,sk) \
((ASN1_STRING *(*)(ASN1_STRING *,I2D_OF(type),type *,STACK_OF(ASN1_OBJECT) *))openssl_fcast(ASN1_STRING_encode))(s,i2d,data,sk) ASN1_STRING_encode(s, CHECKED_I2D_OF(type, i2d), data, sk)
X509_EXTENSION *OCSP_crlID_new(char *url, long *n, char *tim); X509_EXTENSION *OCSP_crlID_new(char *url, long *n, char *tim);
@@ -487,7 +495,7 @@ X509_EXTENSION *OCSP_REQUEST_get_ext(OCSP_REQUEST *x, int loc);
X509_EXTENSION *OCSP_REQUEST_delete_ext(OCSP_REQUEST *x, int loc); X509_EXTENSION *OCSP_REQUEST_delete_ext(OCSP_REQUEST *x, int loc);
void *OCSP_REQUEST_get1_ext_d2i(OCSP_REQUEST *x, int nid, int *crit, int *idx); void *OCSP_REQUEST_get1_ext_d2i(OCSP_REQUEST *x, int nid, int *crit, int *idx);
int OCSP_REQUEST_add1_ext_i2d(OCSP_REQUEST *x, int nid, void *value, int crit, int OCSP_REQUEST_add1_ext_i2d(OCSP_REQUEST *x, int nid, void *value, int crit,
unsigned long flags); unsigned long flags);
int OCSP_REQUEST_add_ext(OCSP_REQUEST *x, X509_EXTENSION *ex, int loc); int OCSP_REQUEST_add_ext(OCSP_REQUEST *x, X509_EXTENSION *ex, int loc);
int OCSP_ONEREQ_get_ext_count(OCSP_ONEREQ *x); int OCSP_ONEREQ_get_ext_count(OCSP_ONEREQ *x);
@@ -498,7 +506,7 @@ X509_EXTENSION *OCSP_ONEREQ_get_ext(OCSP_ONEREQ *x, int loc);
X509_EXTENSION *OCSP_ONEREQ_delete_ext(OCSP_ONEREQ *x, int loc); X509_EXTENSION *OCSP_ONEREQ_delete_ext(OCSP_ONEREQ *x, int loc);
void *OCSP_ONEREQ_get1_ext_d2i(OCSP_ONEREQ *x, int nid, int *crit, int *idx); void *OCSP_ONEREQ_get1_ext_d2i(OCSP_ONEREQ *x, int nid, int *crit, int *idx);
int OCSP_ONEREQ_add1_ext_i2d(OCSP_ONEREQ *x, int nid, void *value, int crit, int OCSP_ONEREQ_add1_ext_i2d(OCSP_ONEREQ *x, int nid, void *value, int crit,
unsigned long flags); unsigned long flags);
int OCSP_ONEREQ_add_ext(OCSP_ONEREQ *x, X509_EXTENSION *ex, int loc); int OCSP_ONEREQ_add_ext(OCSP_ONEREQ *x, X509_EXTENSION *ex, int loc);
int OCSP_BASICRESP_get_ext_count(OCSP_BASICRESP *x); int OCSP_BASICRESP_get_ext_count(OCSP_BASICRESP *x);
@@ -509,7 +517,7 @@ X509_EXTENSION *OCSP_BASICRESP_get_ext(OCSP_BASICRESP *x, int loc);
X509_EXTENSION *OCSP_BASICRESP_delete_ext(OCSP_BASICRESP *x, int loc); X509_EXTENSION *OCSP_BASICRESP_delete_ext(OCSP_BASICRESP *x, int loc);
void *OCSP_BASICRESP_get1_ext_d2i(OCSP_BASICRESP *x, int nid, int *crit, int *idx); void *OCSP_BASICRESP_get1_ext_d2i(OCSP_BASICRESP *x, int nid, int *crit, int *idx);
int OCSP_BASICRESP_add1_ext_i2d(OCSP_BASICRESP *x, int nid, void *value, int crit, int OCSP_BASICRESP_add1_ext_i2d(OCSP_BASICRESP *x, int nid, void *value, int crit,
unsigned long flags); unsigned long flags);
int OCSP_BASICRESP_add_ext(OCSP_BASICRESP *x, X509_EXTENSION *ex, int loc); int OCSP_BASICRESP_add_ext(OCSP_BASICRESP *x, X509_EXTENSION *ex, int loc);
int OCSP_SINGLERESP_get_ext_count(OCSP_SINGLERESP *x); int OCSP_SINGLERESP_get_ext_count(OCSP_SINGLERESP *x);
@@ -520,7 +528,7 @@ X509_EXTENSION *OCSP_SINGLERESP_get_ext(OCSP_SINGLERESP *x, int loc);
X509_EXTENSION *OCSP_SINGLERESP_delete_ext(OCSP_SINGLERESP *x, int loc); X509_EXTENSION *OCSP_SINGLERESP_delete_ext(OCSP_SINGLERESP *x, int loc);
void *OCSP_SINGLERESP_get1_ext_d2i(OCSP_SINGLERESP *x, int nid, int *crit, int *idx); void *OCSP_SINGLERESP_get1_ext_d2i(OCSP_SINGLERESP *x, int nid, int *crit, int *idx);
int OCSP_SINGLERESP_add1_ext_i2d(OCSP_SINGLERESP *x, int nid, void *value, int crit, int OCSP_SINGLERESP_add1_ext_i2d(OCSP_SINGLERESP *x, int nid, void *value, int crit,
unsigned long flags); unsigned long flags);
int OCSP_SINGLERESP_add_ext(OCSP_SINGLERESP *x, X509_EXTENSION *ex, int loc); int OCSP_SINGLERESP_add_ext(OCSP_SINGLERESP *x, X509_EXTENSION *ex, int loc);
DECLARE_ASN1_FUNCTIONS(OCSP_SINGLERESP) DECLARE_ASN1_FUNCTIONS(OCSP_SINGLERESP)
@@ -547,7 +555,7 @@ int OCSP_REQUEST_print(BIO *bp, OCSP_REQUEST* a, unsigned long flags);
int OCSP_RESPONSE_print(BIO *bp, OCSP_RESPONSE* o, unsigned long flags); int OCSP_RESPONSE_print(BIO *bp, OCSP_RESPONSE* o, unsigned long flags);
int OCSP_basic_verify(OCSP_BASICRESP *bs, STACK_OF(X509) *certs, int OCSP_basic_verify(OCSP_BASICRESP *bs, STACK_OF(X509) *certs,
X509_STORE *st, unsigned long flags); X509_STORE *st, unsigned long flags);
/* BEGIN ERROR CODES */ /* BEGIN ERROR CODES */
/* The following lines are auto generated by the script mkerr.pl. Any changes /* The following lines are auto generated by the script mkerr.pl. Any changes
@@ -558,58 +566,58 @@ void ERR_load_OCSP_strings(void);
/* Error codes for the OCSP functions. */ /* Error codes for the OCSP functions. */
/* Function codes. */ /* Function codes. */
#define OCSP_F_ASN1_STRING_ENCODE 100 #define OCSP_F_ASN1_STRING_ENCODE 100
#define OCSP_F_D2I_OCSP_NONCE 102 #define OCSP_F_D2I_OCSP_NONCE 102
#define OCSP_F_OCSP_BASIC_ADD1_STATUS 103 #define OCSP_F_OCSP_BASIC_ADD1_STATUS 103
#define OCSP_F_OCSP_BASIC_SIGN 104 #define OCSP_F_OCSP_BASIC_SIGN 104
#define OCSP_F_OCSP_BASIC_VERIFY 105 #define OCSP_F_OCSP_BASIC_VERIFY 105
#define OCSP_F_OCSP_CERT_ID_NEW 101 #define OCSP_F_OCSP_CERT_ID_NEW 101
#define OCSP_F_OCSP_CHECK_DELEGATED 106 #define OCSP_F_OCSP_CHECK_DELEGATED 106
#define OCSP_F_OCSP_CHECK_IDS 107 #define OCSP_F_OCSP_CHECK_IDS 107
#define OCSP_F_OCSP_CHECK_ISSUER 108 #define OCSP_F_OCSP_CHECK_ISSUER 108
#define OCSP_F_OCSP_CHECK_VALIDITY 115 #define OCSP_F_OCSP_CHECK_VALIDITY 115
#define OCSP_F_OCSP_MATCH_ISSUERID 109 #define OCSP_F_OCSP_MATCH_ISSUERID 109
#define OCSP_F_OCSP_PARSE_URL 114 #define OCSP_F_OCSP_PARSE_URL 114
#define OCSP_F_OCSP_REQUEST_SIGN 110 #define OCSP_F_OCSP_REQUEST_SIGN 110
#define OCSP_F_OCSP_REQUEST_VERIFY 116 #define OCSP_F_OCSP_REQUEST_VERIFY 116
#define OCSP_F_OCSP_RESPONSE_GET1_BASIC 111 #define OCSP_F_OCSP_RESPONSE_GET1_BASIC 111
#define OCSP_F_OCSP_SENDREQ_BIO 112 #define OCSP_F_OCSP_SENDREQ_BIO 112
#define OCSP_F_REQUEST_VERIFY 113 #define OCSP_F_PARSE_HTTP_LINE1 117
#define OCSP_F_REQUEST_VERIFY 113
/* Reason codes. */ /* Reason codes. */
#define OCSP_R_BAD_DATA 100 #define OCSP_R_BAD_DATA 100
#define OCSP_R_CERTIFICATE_VERIFY_ERROR 101 #define OCSP_R_CERTIFICATE_VERIFY_ERROR 101
#define OCSP_R_DIGEST_ERR 102 #define OCSP_R_DIGEST_ERR 102
#define OCSP_R_ERROR_IN_NEXTUPDATE_FIELD 122 #define OCSP_R_ERROR_IN_NEXTUPDATE_FIELD 122
#define OCSP_R_ERROR_IN_THISUPDATE_FIELD 123 #define OCSP_R_ERROR_IN_THISUPDATE_FIELD 123
#define OCSP_R_ERROR_PARSING_URL 121 #define OCSP_R_ERROR_PARSING_URL 121
#define OCSP_R_MISSING_OCSPSIGNING_USAGE 103 #define OCSP_R_MISSING_OCSPSIGNING_USAGE 103
#define OCSP_R_NEXTUPDATE_BEFORE_THISUPDATE 124 #define OCSP_R_NEXTUPDATE_BEFORE_THISUPDATE 124
#define OCSP_R_NOT_BASIC_RESPONSE 104 #define OCSP_R_NOT_BASIC_RESPONSE 104
#define OCSP_R_NO_CERTIFICATES_IN_CHAIN 105 #define OCSP_R_NO_CERTIFICATES_IN_CHAIN 105
#define OCSP_R_NO_CONTENT 106 #define OCSP_R_NO_CONTENT 106
#define OCSP_R_NO_PUBLIC_KEY 107 #define OCSP_R_NO_PUBLIC_KEY 107
#define OCSP_R_NO_RESPONSE_DATA 108 #define OCSP_R_NO_RESPONSE_DATA 108
#define OCSP_R_NO_REVOKED_TIME 109 #define OCSP_R_NO_REVOKED_TIME 109
#define OCSP_R_PRIVATE_KEY_DOES_NOT_MATCH_CERTIFICATE 110 #define OCSP_R_PRIVATE_KEY_DOES_NOT_MATCH_CERTIFICATE 110
#define OCSP_R_REQUEST_NOT_SIGNED 128 #define OCSP_R_REQUEST_NOT_SIGNED 128
#define OCSP_R_RESPONSE_CONTAINS_NO_REVOCATION_DATA 111 #define OCSP_R_RESPONSE_CONTAINS_NO_REVOCATION_DATA 111
#define OCSP_R_ROOT_CA_NOT_TRUSTED 112 #define OCSP_R_ROOT_CA_NOT_TRUSTED 112
#define OCSP_R_SERVER_READ_ERROR 113 #define OCSP_R_SERVER_READ_ERROR 113
#define OCSP_R_SERVER_RESPONSE_ERROR 114 #define OCSP_R_SERVER_RESPONSE_ERROR 114
#define OCSP_R_SERVER_RESPONSE_PARSE_ERROR 115 #define OCSP_R_SERVER_RESPONSE_PARSE_ERROR 115
#define OCSP_R_SERVER_WRITE_ERROR 116 #define OCSP_R_SERVER_WRITE_ERROR 116
#define OCSP_R_SIGNATURE_FAILURE 117 #define OCSP_R_SIGNATURE_FAILURE 117
#define OCSP_R_SIGNER_CERTIFICATE_NOT_FOUND 118 #define OCSP_R_SIGNER_CERTIFICATE_NOT_FOUND 118
#define OCSP_R_STATUS_EXPIRED 125 #define OCSP_R_STATUS_EXPIRED 125
#define OCSP_R_STATUS_NOT_YET_VALID 126 #define OCSP_R_STATUS_NOT_YET_VALID 126
#define OCSP_R_STATUS_TOO_OLD 127 #define OCSP_R_STATUS_TOO_OLD 127
#define OCSP_R_UNKNOWN_MESSAGE_DIGEST 119 #define OCSP_R_UNKNOWN_MESSAGE_DIGEST 119
#define OCSP_R_UNKNOWN_NID 120 #define OCSP_R_UNKNOWN_NID 120
#define OCSP_R_UNSUPPORTED_REQUESTORNAME_TYPE 129 #define OCSP_R_UNSUPPORTED_REQUESTORNAME_TYPE 129
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif #endif
dep/include/openssl/opensslconf.h
+60 -16
View File
@@ -2,14 +2,27 @@
/* WARNING: Generated automatically from opensslconf.h.in by Configure. */ /* WARNING: Generated automatically from opensslconf.h.in by Configure. */
/* OpenSSL was configured with the following options: */ /* OpenSSL was configured with the following options: */
#ifndef OPENSSL_SYSNAME_WIN32
# define OPENSSL_SYSNAME_WIN32
#endif
#ifndef OPENSSL_DOING_MAKEDEPEND #ifndef OPENSSL_DOING_MAKEDEPEND
#ifndef OPENSSL_NO_CAMELLIA #ifndef OPENSSL_NO_CAMELLIA
# define OPENSSL_NO_CAMELLIA # define OPENSSL_NO_CAMELLIA
#endif #endif
#ifndef OPENSSL_NO_CAPIENG
# define OPENSSL_NO_CAPIENG
#endif
#ifndef OPENSSL_NO_CMS
# define OPENSSL_NO_CMS
#endif
#ifndef OPENSSL_NO_GMP #ifndef OPENSSL_NO_GMP
# define OPENSSL_NO_GMP # define OPENSSL_NO_GMP
#endif #endif
#ifndef OPENSSL_NO_JPAKE
# define OPENSSL_NO_JPAKE
#endif
#ifndef OPENSSL_NO_KRB5 #ifndef OPENSSL_NO_KRB5
# define OPENSSL_NO_KRB5 # define OPENSSL_NO_KRB5
#endif #endif
@@ -22,10 +35,14 @@
#ifndef OPENSSL_NO_RFC3779 #ifndef OPENSSL_NO_RFC3779
# define OPENSSL_NO_RFC3779 # define OPENSSL_NO_RFC3779
#endif #endif
#ifndef OPENSSL_NO_SEED
# define OPENSSL_NO_SEED
#endif
#endif /* OPENSSL_DOING_MAKEDEPEND */ #endif /* OPENSSL_DOING_MAKEDEPEND */
#ifndef OPENSSL_NO_DYNAMIC_ENGINE
# define OPENSSL_NO_DYNAMIC_ENGINE #ifndef OPENSSL_THREADS
# define OPENSSL_THREADS
#endif #endif
/* The OPENSSL_NO_* macros are also defined as NO_* if the application /* The OPENSSL_NO_* macros are also defined as NO_* if the application
@@ -36,9 +53,18 @@
# if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA) # if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA)
# define NO_CAMELLIA # define NO_CAMELLIA
# endif # endif
# if defined(OPENSSL_NO_CAPIENG) && !defined(NO_CAPIENG)
# define NO_CAPIENG
# endif
# if defined(OPENSSL_NO_CMS) && !defined(NO_CMS)
# define NO_CMS
# endif
# if defined(OPENSSL_NO_GMP) && !defined(NO_GMP) # if defined(OPENSSL_NO_GMP) && !defined(NO_GMP)
# define NO_GMP # define NO_GMP
# endif # endif
# if defined(OPENSSL_NO_JPAKE) && !defined(NO_JPAKE)
# define NO_JPAKE
# endif
# if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5) # if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5)
# define NO_KRB5 # define NO_KRB5
# endif # endif
@@ -51,17 +77,35 @@
# if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779) # if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779)
# define NO_RFC3779 # define NO_RFC3779
# endif # endif
# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED)
# define NO_SEED
# endif
#endif #endif
/* crypto/opensslconf.h.in */ /* crypto/opensslconf.h.in */
#ifdef OPENSSL_DOING_MAKEDEPEND
/* Include any symbols here that have to be explicitly set to enable a feature
* that should be visible to makedepend.
*
* [Our "make depend" doesn't actually look at this, we use actual build settings
* instead; we want to make it easy to remove subdirectories with disabled algorithms.]
*/
#ifndef OPENSSL_FIPS
#define OPENSSL_FIPS
#endif
#endif
/* Generate 80386 code? */ /* Generate 80386 code? */
#undef I386_ONLY #undef I386_ONLY
#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */ #if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR) #if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
#define ENGINESDIR "/usr/local/ssl/lib/engines" #define ENGINESDIR "G:\openssl_build/lib/engines"
#define OPENSSLDIR "/usr/local/ssl" #define OPENSSLDIR "G:\openssl_build/ssl"
#endif #endif
#endif #endif
@@ -69,6 +113,7 @@
#define OPENSSL_UNISTD <unistd.h> #define OPENSSL_UNISTD <unistd.h>
#undef OPENSSL_EXPORT_VAR_AS_FUNCTION #undef OPENSSL_EXPORT_VAR_AS_FUNCTION
#define OPENSSL_EXPORT_VAR_AS_FUNCTION
#if defined(HEADER_IDEA_H) && !defined(IDEA_INT) #if defined(HEADER_IDEA_H) && !defined(IDEA_INT)
#define IDEA_INT unsigned int #define IDEA_INT unsigned int
@@ -113,7 +158,7 @@
#if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H) #if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H)
#define CONFIG_HEADER_BN_H #define CONFIG_HEADER_BN_H
#undef BN_LLONG #define BN_LLONG
/* Should we define BN_DIV2W here? */ /* Should we define BN_DIV2W here? */
@@ -132,7 +177,7 @@
#define CONFIG_HEADER_RC4_LOCL_H #define CONFIG_HEADER_RC4_LOCL_H
/* if this is defined data[i] is used instead of *data, this is a %20 /* if this is defined data[i] is used instead of *data, this is a %20
* speedup on x86 */ * speedup on x86 */
#undef RC4_INDEX #define RC4_INDEX
#endif #endif
#if defined(HEADER_BF_LOCL_H) && !defined(CONFIG_HEADER_BF_LOCL_H) #if defined(HEADER_BF_LOCL_H) && !defined(CONFIG_HEADER_BF_LOCL_H)
@@ -180,30 +225,30 @@ YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!!
optimization options. Older Sparc's work better with only UNROLL, but optimization options. Older Sparc's work better with only UNROLL, but
there's no way to tell at compile time what it is you're running on */ there's no way to tell at compile time what it is you're running on */
#if defined( sun ) /* Newer Sparc's */ #if defined( sun ) /* Newer Sparc's */
# define DES_PTR # define DES_PTR
# define DES_RISC1 # define DES_RISC1
# define DES_UNROLL # define DES_UNROLL
#elif defined( __ultrix ) /* Older MIPS */ #elif defined( __ultrix ) /* Older MIPS */
# define DES_PTR # define DES_PTR
# define DES_RISC2 # define DES_RISC2
# define DES_UNROLL # define DES_UNROLL
#elif defined( __osf1__ ) /* Alpha */ #elif defined( __osf1__ ) /* Alpha */
# define DES_PTR # define DES_PTR
# define DES_RISC2 # define DES_RISC2
#elif defined ( _AIX ) /* RS6000 */ #elif defined ( _AIX ) /* RS6000 */
/* Unknown */ /* Unknown */
#elif defined( __hpux ) /* HP-PA */ #elif defined( __hpux ) /* HP-PA */
/* Unknown */ /* Unknown */
#elif defined( __aux ) /* 68K */ #elif defined( __aux ) /* 68K */
/* Unknown */ /* Unknown */
#elif defined( __dgux ) /* 88K (but P6 in latest boxes) */ #elif defined( __dgux ) /* 88K (but P6 in latest boxes) */
# define DES_UNROLL # define DES_UNROLL
#elif defined( __sgi ) /* Newer MIPS */ #elif defined( __sgi ) /* Newer MIPS */
# define DES_PTR # define DES_PTR
# define DES_RISC2 # define DES_RISC2
# define DES_UNROLL # define DES_UNROLL
#elif defined(i386) || defined(__i386__) /* x86 boxes, should be gcc */ #elif defined(i386) || defined(__i386__) /* x86 boxes, should be gcc */
# define DES_PTR # define DES_PTR
# define DES_RISC1 # define DES_RISC1
# define DES_UNROLL # define DES_UNROLL
@@ -212,4 +257,3 @@ YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!!
#endif /* DES_DEFAULT_OPTIONS */ #endif /* DES_DEFAULT_OPTIONS */
#endif /* HEADER_DES_LOCL_H */ #endif /* HEADER_DES_LOCL_H */
dep/include/openssl/opensslv.h
+17 -18
View File
@@ -6,14 +6,14 @@
* The status nibble has one of the values 0 for development, 1 to e for betas * The status nibble has one of the values 0 for development, 1 to e for betas
* 1 to 14, and f for release. The patch level is exactly that. * 1 to 14, and f for release. The patch level is exactly that.
* For example: * For example:
* 0.9.3-dev 0x00903000 * 0.9.3-dev 0x00903000
* 0.9.3-beta1 0x00903001 * 0.9.3-beta1 0x00903001
* 0.9.3-beta2-dev 0x00903002 * 0.9.3-beta2-dev 0x00903002
* 0.9.3-beta2 0x00903002 (same as ...beta2-dev) * 0.9.3-beta2 0x00903002 (same as ...beta2-dev)
* 0.9.3 0x0090300f * 0.9.3 0x0090300f
* 0.9.3a 0x0090301f * 0.9.3a 0x0090301f
* 0.9.4 0x0090400f * 0.9.4 0x0090400f
* 1.2.3z 0x102031af * 1.2.3z 0x102031af
* *
* For continuity reasons (because 0.9.5 is already out, and is coded * For continuity reasons (because 0.9.5 is already out, and is coded
* 0x00905100), between 0.9.5 and 0.9.6 the coding of the patch level * 0x00905100), between 0.9.5 and 0.9.6 the coding of the patch level
@@ -25,13 +25,13 @@
* (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for
* major minor fix final patch/beta) * major minor fix final patch/beta)
*/ */
#define OPENSSL_VERSION_NUMBER 0x0090805fL #define OPENSSL_VERSION_NUMBER 0x009080afL
#ifdef OPENSSL_FIPS #ifdef OPENSSL_FIPS
#define OPENSSL_VERSION_TEXT "OpenSSL 0.9.8e-fips 23 Feb 2007" #define OPENSSL_VERSION_TEXT "OpenSSL 0.9.8j-fips 07 Jan 2009"
#else #else
#define OPENSSL_VERSION_TEXT "OpenSSL 0.9.8e 23 Feb 2007" #define OPENSSL_VERSION_TEXT "OpenSSL 0.9.8j 07 Jan 2009"
#endif #endif
#define OPENSSL_VERSION_PTEXT " part of " OPENSSL_VERSION_TEXT #define OPENSSL_VERSION_PTEXT " part of " OPENSSL_VERSION_TEXT
/* The macros below are to be used for shared library (.so, .dll, ...) /* The macros below are to be used for shared library (.so, .dll, ...)
@@ -42,11 +42,11 @@
* be greater or equal to what it was at application link time. With this * be greater or equal to what it was at application link time. With this
* scheme, the version number is usually part of the file name, like this: * scheme, the version number is usually part of the file name, like this:
* *
* libcrypto.so.0.9 * libcrypto.so.0.9
* *
* Some unixen also make a softlink with the major verson number only: * Some unixen also make a softlink with the major verson number only:
* *
* libcrypto.so.0 * libcrypto.so.0
* *
* On Tru64 and IRIX 6.x it works a little bit differently. There, the * On Tru64 and IRIX 6.x it works a little bit differently. There, the
* shared library version is stored in the file, and is actually a series * shared library version is stored in the file, and is actually a series
@@ -61,11 +61,11 @@
* to highest, should be part of the string. Consecutive builds would * to highest, should be part of the string. Consecutive builds would
* give the following versions strings: * give the following versions strings:
* *
* 3.0 * 3.0
* 3.0:3.1 * 3.0:3.1
* 3.0:3.1:3.2 * 3.0:3.1:3.2
* 4.0 * 4.0
* 4.0:4.1 * 4.0:4.1
* *
* Notice how version 4 is completely incompatible with version, and * Notice how version 4 is completely incompatible with version, and
* therefore give the breach you can see. * therefore give the breach you can see.
@@ -87,4 +87,3 @@
#endif /* HEADER_OPENSSLV_H */ #endif /* HEADER_OPENSSLV_H */
dep/include/openssl/ossl_typ.h
+29 -21
View File
@@ -58,23 +58,23 @@
#include <openssl/e_os2.h> #include <openssl/e_os2.h>
#ifdef NO_ASN1_TYPEDEFS #ifdef NO_ASN1_TYPEDEFS
#define ASN1_INTEGER ASN1_STRING #define ASN1_INTEGER ASN1_STRING
#define ASN1_ENUMERATED ASN1_STRING #define ASN1_ENUMERATED ASN1_STRING
#define ASN1_BIT_STRING ASN1_STRING #define ASN1_BIT_STRING ASN1_STRING
#define ASN1_OCTET_STRING ASN1_STRING #define ASN1_OCTET_STRING ASN1_STRING
#define ASN1_PRINTABLESTRING ASN1_STRING #define ASN1_PRINTABLESTRING ASN1_STRING
#define ASN1_T61STRING ASN1_STRING #define ASN1_T61STRING ASN1_STRING
#define ASN1_IA5STRING ASN1_STRING #define ASN1_IA5STRING ASN1_STRING
#define ASN1_UTCTIME ASN1_STRING #define ASN1_UTCTIME ASN1_STRING
#define ASN1_GENERALIZEDTIME ASN1_STRING #define ASN1_GENERALIZEDTIME ASN1_STRING
#define ASN1_TIME ASN1_STRING #define ASN1_TIME ASN1_STRING
#define ASN1_GENERALSTRING ASN1_STRING #define ASN1_GENERALSTRING ASN1_STRING
#define ASN1_UNIVERSALSTRING ASN1_STRING #define ASN1_UNIVERSALSTRING ASN1_STRING
#define ASN1_BMPSTRING ASN1_STRING #define ASN1_BMPSTRING ASN1_STRING
#define ASN1_VISIBLESTRING ASN1_STRING #define ASN1_VISIBLESTRING ASN1_STRING
#define ASN1_UTF8STRING ASN1_STRING #define ASN1_UTF8STRING ASN1_STRING
#define ASN1_BOOLEAN int #define ASN1_BOOLEAN int
#define ASN1_NULL int #define ASN1_NULL int
#else #else
typedef struct asn1_string_st ASN1_INTEGER; typedef struct asn1_string_st ASN1_INTEGER;
typedef struct asn1_string_st ASN1_ENUMERATED; typedef struct asn1_string_st ASN1_ENUMERATED;
@@ -97,8 +97,11 @@ typedef int ASN1_NULL;
#ifdef OPENSSL_SYS_WIN32 #ifdef OPENSSL_SYS_WIN32
#undef X509_NAME #undef X509_NAME
#undef X509_EXTENSIONS
#undef X509_CERT_PAIR #undef X509_CERT_PAIR
#undef PKCS7_ISSUER_AND_SERIAL #undef PKCS7_ISSUER_AND_SERIAL
#undef OCSP_REQUEST
#undef OCSP_RESPONSE
#endif #endif
#ifdef BIGNUM #ifdef BIGNUM
@@ -139,6 +142,8 @@ typedef struct X509_crl_st X509_CRL;
typedef struct X509_name_st X509_NAME; typedef struct X509_name_st X509_NAME;
typedef struct x509_store_st X509_STORE; typedef struct x509_store_st X509_STORE;
typedef struct x509_store_ctx_st X509_STORE_CTX; typedef struct x509_store_ctx_st X509_STORE_CTX;
typedef struct ssl_st SSL;
typedef struct ssl_ctx_st SSL_CTX;
typedef struct v3_ext_ctx X509V3_CTX; typedef struct v3_ext_ctx X509V3_CTX;
typedef struct conf_st CONF; typedef struct conf_st CONF;
@@ -165,11 +170,14 @@ typedef struct X509_POLICY_CACHE_st X509_POLICY_CACHE;
typedef struct crypto_ex_data_st CRYPTO_EX_DATA; typedef struct crypto_ex_data_st CRYPTO_EX_DATA;
/* Callback types for crypto.h */ /* Callback types for crypto.h */
typedef int CRYPTO_EX_new(void *parent, void *ptr, CRYPTO_EX_DATA *ad, typedef int CRYPTO_EX_new(void *parent, void *ptr, CRYPTO_EX_DATA *ad,
int idx, long argl, void *argp); int idx, long argl, void *argp);
typedef void CRYPTO_EX_free(void *parent, void *ptr, CRYPTO_EX_DATA *ad, typedef void CRYPTO_EX_free(void *parent, void *ptr, CRYPTO_EX_DATA *ad,
int idx, long argl, void *argp); int idx, long argl, void *argp);
typedef int CRYPTO_EX_dup(CRYPTO_EX_DATA *to, CRYPTO_EX_DATA *from, void *from_d, typedef int CRYPTO_EX_dup(CRYPTO_EX_DATA *to, CRYPTO_EX_DATA *from, void *from_d,
int idx, long argl, void *argp); int idx, long argl, void *argp);
typedef struct ocsp_req_ctx_st OCSP_REQ_CTX;
typedef struct ocsp_response_st OCSP_RESPONSE;
typedef struct ocsp_responder_id_st OCSP_RESPID;
#endif /* def HEADER_OPENSSL_TYPES_H */ #endif /* def HEADER_OPENSSL_TYPES_H */
dep/include/openssl/pem.h
+387 -347
View File
@@ -74,28 +74,28 @@
extern "C" { extern "C" {
#endif #endif
#define PEM_BUFSIZE 1024 #define PEM_BUFSIZE 1024
#define PEM_OBJ_UNDEF 0 #define PEM_OBJ_UNDEF 0
#define PEM_OBJ_X509 1 #define PEM_OBJ_X509 1
#define PEM_OBJ_X509_REQ 2 #define PEM_OBJ_X509_REQ 2
#define PEM_OBJ_CRL 3 #define PEM_OBJ_CRL 3
#define PEM_OBJ_SSL_SESSION 4 #define PEM_OBJ_SSL_SESSION 4
#define PEM_OBJ_PRIV_KEY 10 #define PEM_OBJ_PRIV_KEY 10
#define PEM_OBJ_PRIV_RSA 11 #define PEM_OBJ_PRIV_RSA 11
#define PEM_OBJ_PRIV_DSA 12 #define PEM_OBJ_PRIV_DSA 12
#define PEM_OBJ_PRIV_DH 13 #define PEM_OBJ_PRIV_DH 13
#define PEM_OBJ_PUB_RSA 14 #define PEM_OBJ_PUB_RSA 14
#define PEM_OBJ_PUB_DSA 15 #define PEM_OBJ_PUB_DSA 15
#define PEM_OBJ_PUB_DH 16 #define PEM_OBJ_PUB_DH 16
#define PEM_OBJ_DHPARAMS 17 #define PEM_OBJ_DHPARAMS 17
#define PEM_OBJ_DSAPARAMS 18 #define PEM_OBJ_DSAPARAMS 18
#define PEM_OBJ_PRIV_RSA_PUBLIC 19 #define PEM_OBJ_PRIV_RSA_PUBLIC 19
#define PEM_OBJ_PRIV_ECDSA 20 #define PEM_OBJ_PRIV_ECDSA 20
#define PEM_OBJ_PUB_ECDSA 21 #define PEM_OBJ_PUB_ECDSA 21
#define PEM_OBJ_ECPARAMETERS 22 #define PEM_OBJ_ECPARAMETERS 22
#define PEM_ERROR 30 #define PEM_ERROR 30
#define PEM_DEK_DES_CBC 40 #define PEM_DEK_DES_CBC 40
#define PEM_DEK_IDEA_CBC 45 #define PEM_DEK_IDEA_CBC 45
#define PEM_DEK_DES_EDE 50 #define PEM_DEK_DES_EDE 50
@@ -104,105 +104,107 @@ extern "C" {
#define PEM_DEK_RSA_MD2 80 #define PEM_DEK_RSA_MD2 80
#define PEM_DEK_RSA_MD5 90 #define PEM_DEK_RSA_MD5 90
#define PEM_MD_MD2 NID_md2 #define PEM_MD_MD2 NID_md2
#define PEM_MD_MD5 NID_md5 #define PEM_MD_MD5 NID_md5
#define PEM_MD_SHA NID_sha #define PEM_MD_SHA NID_sha
#define PEM_MD_MD2_RSA NID_md2WithRSAEncryption #define PEM_MD_MD2_RSA NID_md2WithRSAEncryption
#define PEM_MD_MD5_RSA NID_md5WithRSAEncryption #define PEM_MD_MD5_RSA NID_md5WithRSAEncryption
#define PEM_MD_SHA_RSA NID_sha1WithRSAEncryption #define PEM_MD_SHA_RSA NID_sha1WithRSAEncryption
#define PEM_STRING_X509_OLD "X509 CERTIFICATE" #define PEM_STRING_X509_OLD "X509 CERTIFICATE"
#define PEM_STRING_X509 "CERTIFICATE" #define PEM_STRING_X509 "CERTIFICATE"
#define PEM_STRING_X509_PAIR "CERTIFICATE PAIR" #define PEM_STRING_X509_PAIR "CERTIFICATE PAIR"
#define PEM_STRING_X509_TRUSTED "TRUSTED CERTIFICATE" #define PEM_STRING_X509_TRUSTED "TRUSTED CERTIFICATE"
#define PEM_STRING_X509_REQ_OLD "NEW CERTIFICATE REQUEST" #define PEM_STRING_X509_REQ_OLD "NEW CERTIFICATE REQUEST"
#define PEM_STRING_X509_REQ "CERTIFICATE REQUEST" #define PEM_STRING_X509_REQ "CERTIFICATE REQUEST"
#define PEM_STRING_X509_CRL "X509 CRL" #define PEM_STRING_X509_CRL "X509 CRL"
#define PEM_STRING_EVP_PKEY "ANY PRIVATE KEY" #define PEM_STRING_EVP_PKEY "ANY PRIVATE KEY"
#define PEM_STRING_PUBLIC "PUBLIC KEY" #define PEM_STRING_PUBLIC "PUBLIC KEY"
#define PEM_STRING_RSA "RSA PRIVATE KEY" #define PEM_STRING_RSA "RSA PRIVATE KEY"
#define PEM_STRING_RSA_PUBLIC "RSA PUBLIC KEY" #define PEM_STRING_RSA_PUBLIC "RSA PUBLIC KEY"
#define PEM_STRING_DSA "DSA PRIVATE KEY" #define PEM_STRING_DSA "DSA PRIVATE KEY"
#define PEM_STRING_DSA_PUBLIC "DSA PUBLIC KEY" #define PEM_STRING_DSA_PUBLIC "DSA PUBLIC KEY"
#define PEM_STRING_PKCS7 "PKCS7" #define PEM_STRING_PKCS7 "PKCS7"
#define PEM_STRING_PKCS8 "ENCRYPTED PRIVATE KEY" #define PEM_STRING_PKCS7_SIGNED "PKCS #7 SIGNED DATA"
#define PEM_STRING_PKCS8INF "PRIVATE KEY" #define PEM_STRING_PKCS8 "ENCRYPTED PRIVATE KEY"
#define PEM_STRING_DHPARAMS "DH PARAMETERS" #define PEM_STRING_PKCS8INF "PRIVATE KEY"
#define PEM_STRING_SSL_SESSION "SSL SESSION PARAMETERS" #define PEM_STRING_DHPARAMS "DH PARAMETERS"
#define PEM_STRING_DSAPARAMS "DSA PARAMETERS" #define PEM_STRING_SSL_SESSION "SSL SESSION PARAMETERS"
#define PEM_STRING_DSAPARAMS "DSA PARAMETERS"
#define PEM_STRING_ECDSA_PUBLIC "ECDSA PUBLIC KEY" #define PEM_STRING_ECDSA_PUBLIC "ECDSA PUBLIC KEY"
#define PEM_STRING_ECPARAMETERS "EC PARAMETERS" #define PEM_STRING_ECPARAMETERS "EC PARAMETERS"
#define PEM_STRING_ECPRIVATEKEY "EC PRIVATE KEY" #define PEM_STRING_ECPRIVATEKEY "EC PRIVATE KEY"
#define PEM_STRING_CMS "CMS"
/* Note that this structure is initialised by PEM_SealInit and cleaned up /* Note that this structure is initialised by PEM_SealInit and cleaned up
by PEM_SealFinal (at least for now) */ by PEM_SealFinal (at least for now) */
typedef struct PEM_Encode_Seal_st typedef struct PEM_Encode_Seal_st
{ {
EVP_ENCODE_CTX encode; EVP_ENCODE_CTX encode;
EVP_MD_CTX md; EVP_MD_CTX md;
EVP_CIPHER_CTX cipher; EVP_CIPHER_CTX cipher;
} PEM_ENCODE_SEAL_CTX; } PEM_ENCODE_SEAL_CTX;
/* enc_type is one off */ /* enc_type is one off */
#define PEM_TYPE_ENCRYPTED 10 #define PEM_TYPE_ENCRYPTED 10
#define PEM_TYPE_MIC_ONLY 20 #define PEM_TYPE_MIC_ONLY 20
#define PEM_TYPE_MIC_CLEAR 30 #define PEM_TYPE_MIC_CLEAR 30
#define PEM_TYPE_CLEAR 40 #define PEM_TYPE_CLEAR 40
typedef struct pem_recip_st typedef struct pem_recip_st
{ {
char *name; char *name;
X509_NAME *dn; X509_NAME *dn;
int cipher; int cipher;
int key_enc; int key_enc;
/* char iv[8]; unused and wrong size */ /* char iv[8]; unused and wrong size */
} PEM_USER; } PEM_USER;
typedef struct pem_ctx_st typedef struct pem_ctx_st
{ {
int type; /* what type of object */ int type; /* what type of object */
struct { struct {
int version; int version;
int mode; int mode;
} proc_type; } proc_type;
char *domain; char *domain;
struct { struct {
int cipher; int cipher;
/* unused, and wrong size /* unused, and wrong size
unsigned char iv[8]; */ unsigned char iv[8]; */
} DEK_info; } DEK_info;
PEM_USER *originator; PEM_USER *originator;
int num_recipient; int num_recipient;
PEM_USER **recipient; PEM_USER **recipient;
#ifndef OPENSSL_NO_STACK #ifndef OPENSSL_NO_STACK
STACK *x509_chain; /* certificate chain */ STACK *x509_chain; /* certificate chain */
#else #else
char *x509_chain; /* certificate chain */ char *x509_chain; /* certificate chain */
#endif #endif
EVP_MD *md; /* signature type */ EVP_MD *md; /* signature type */
int md_enc; /* is the md encrypted or not? */ int md_enc; /* is the md encrypted or not? */
int md_len; /* length of md_data */ int md_len; /* length of md_data */
char *md_data; /* message digest, could be pkey encrypted */ char *md_data; /* message digest, could be pkey encrypted */
EVP_CIPHER *dec; /* date encryption cipher */ EVP_CIPHER *dec; /* date encryption cipher */
int key_len; /* key length */ int key_len; /* key length */
unsigned char *key; /* key */ unsigned char *key; /* key */
/* unused, and wrong size /* unused, and wrong size
unsigned char iv[8]; */ unsigned char iv[8]; */
int data_enc; /* is the data encrypted */ int data_enc; /* is the data encrypted */
int data_len; int data_len;
unsigned char *data; unsigned char *data;
} PEM_CTX; } PEM_CTX;
/* These macros make the PEM_read/PEM_write functions easier to maintain and /* These macros make the PEM_read/PEM_write functions easier to maintain and
* write. Now they are all implemented with either: * write. Now they are all implemented with either:
@@ -220,102 +222,132 @@ typedef struct pem_ctx_st
#define IMPLEMENT_PEM_read_fp(name, type, str, asn1) \ #define IMPLEMENT_PEM_read_fp(name, type, str, asn1) \
type *PEM_read_##name(FILE *fp, type **x, pem_password_cb *cb, void *u)\ type *PEM_read_##name(FILE *fp, type **x, pem_password_cb *cb, void *u)\
{ \ { \
return(((type *(*)(D2I_OF(type),char *,FILE *,type **,pem_password_cb *,void *))openssl_fcast(PEM_ASN1_read))(d2i_##asn1, str,fp,x,cb,u)); \ return (type*)PEM_ASN1_read(CHECKED_D2I_OF(type, d2i_##asn1), \
str, fp, \
CHECKED_PPTR_OF(type, x), \
cb, u); \
} }
#define IMPLEMENT_PEM_write_fp(name, type, str, asn1) \ #define IMPLEMENT_PEM_write_fp(name, type, str, asn1) \
int PEM_write_##name(FILE *fp, type *x) \ int PEM_write_##name(FILE *fp, type *x) \
{ \ { \
return(((int (*)(I2D_OF(type),const char *,FILE *,type *, const EVP_CIPHER *,unsigned char *,int, pem_password_cb *,void *))openssl_fcast(PEM_ASN1_write))(i2d_##asn1,str,fp,x,NULL,NULL,0,NULL,NULL)); \ return PEM_ASN1_write(CHECKED_I2D_OF(type, i2d_##asn1), \
str, fp, \
CHECKED_PTR_OF(type, x), \
NULL, NULL, 0, NULL, NULL); \
} }
#define IMPLEMENT_PEM_write_fp_const(name, type, str, asn1) \ #define IMPLEMENT_PEM_write_fp_const(name, type, str, asn1) \
int PEM_write_##name(FILE *fp, const type *x) \ int PEM_write_##name(FILE *fp, const type *x) \
{ \ { \
return(((int (*)(I2D_OF_const(type),const char *,FILE *, const type *, const EVP_CIPHER *,unsigned char *,int, pem_password_cb *,void *))openssl_fcast(PEM_ASN1_write))(i2d_##asn1,str,fp,x,NULL,NULL,0,NULL,NULL)); \ return PEM_ASN1_write(CHECKED_I2D_OF(const type, i2d_##asn1), \
str, fp, \
CHECKED_PTR_OF(const type, x), \
NULL, NULL, 0, NULL, NULL); \
} }
#define IMPLEMENT_PEM_write_cb_fp(name, type, str, asn1) \ #define IMPLEMENT_PEM_write_cb_fp(name, type, str, asn1) \
int PEM_write_##name(FILE *fp, type *x, const EVP_CIPHER *enc, \ int PEM_write_##name(FILE *fp, type *x, const EVP_CIPHER *enc, \
unsigned char *kstr, int klen, pem_password_cb *cb, \ unsigned char *kstr, int klen, pem_password_cb *cb, \
void *u) \ void *u) \
{ \ { \
return(((int (*)(I2D_OF(type),const char *,FILE *,type *, const EVP_CIPHER *,unsigned char *,int, pem_password_cb *,void *))openssl_fcast(PEM_ASN1_write))(i2d_##asn1,str,fp,x,enc,kstr,klen,cb,u)); \ return PEM_ASN1_write(CHECKED_I2D_OF(type, i2d_##asn1), \
} str, fp, \
CHECKED_PTR_OF(type, x), \
enc, kstr, klen, cb, u); \
}
#define IMPLEMENT_PEM_write_cb_fp_const(name, type, str, asn1) \ #define IMPLEMENT_PEM_write_cb_fp_const(name, type, str, asn1) \
int PEM_write_##name(FILE *fp, type *x, const EVP_CIPHER *enc, \ int PEM_write_##name(FILE *fp, type *x, const EVP_CIPHER *enc, \
unsigned char *kstr, int klen, pem_password_cb *cb, \ unsigned char *kstr, int klen, pem_password_cb *cb, \
void *u) \ void *u) \
{ \ { \
return(((int (*)(I2D_OF_const(type),const char *,FILE *,type *, const EVP_CIPHER *,unsigned char *,int, pem_password_cb *,void *))openssl_fcast(PEM_ASN1_write))(i2d_##asn1,str,fp,x,enc,kstr,klen,cb,u)); \ return PEM_ASN1_write(CHECKED_I2D_OF(const type, i2d_##asn1), \
} str, fp, \
CHECKED_PTR_OF(const type, x), \
enc, kstr, klen, cb, u); \
}
#endif #endif
#define IMPLEMENT_PEM_read_bio(name, type, str, asn1) \ #define IMPLEMENT_PEM_read_bio(name, type, str, asn1) \
type *PEM_read_bio_##name(BIO *bp, type **x, pem_password_cb *cb, void *u)\ type *PEM_read_bio_##name(BIO *bp, type **x, pem_password_cb *cb, void *u)\
{ \ { \
return(((type *(*)(D2I_OF(type),const char *,BIO *,type **,pem_password_cb *,void *))openssl_fcast(PEM_ASN1_read_bio))(d2i_##asn1, str,bp,x,cb,u)); \ return (type*)PEM_ASN1_read_bio(CHECKED_D2I_OF(type, d2i_##asn1), \
str, bp, \
CHECKED_PPTR_OF(type, x), \
cb, u); \
} }
#define IMPLEMENT_PEM_write_bio(name, type, str, asn1) \ #define IMPLEMENT_PEM_write_bio(name, type, str, asn1) \
int PEM_write_bio_##name(BIO *bp, type *x) \ int PEM_write_bio_##name(BIO *bp, type *x) \
{ \ { \
return(((int (*)(I2D_OF(type),const char *,BIO *,type *, const EVP_CIPHER *,unsigned char *,int, pem_password_cb *,void *))openssl_fcast(PEM_ASN1_write_bio))(i2d_##asn1,str,bp,x,NULL,NULL,0,NULL,NULL)); \ return PEM_ASN1_write_bio(CHECKED_I2D_OF(type, i2d_##asn1), \
str, bp, \
CHECKED_PTR_OF(type, x), \
NULL, NULL, 0, NULL, NULL); \
} }
#define IMPLEMENT_PEM_write_bio_const(name, type, str, asn1) \ #define IMPLEMENT_PEM_write_bio_const(name, type, str, asn1) \
int PEM_write_bio_##name(BIO *bp, const type *x) \ int PEM_write_bio_##name(BIO *bp, const type *x) \
{ \ { \
return(((int (*)(I2D_OF_const(type),const char *,BIO *,const type *, const EVP_CIPHER *,unsigned char *,int, pem_password_cb *,void *))openssl_fcast(PEM_ASN1_write_bio))(i2d_##asn1,str,bp,x,NULL,NULL,0,NULL,NULL)); \ return PEM_ASN1_write_bio(CHECKED_I2D_OF(const type, i2d_##asn1), \
str, bp, \
CHECKED_PTR_OF(const type, x), \
NULL, NULL, 0, NULL, NULL); \
} }
#define IMPLEMENT_PEM_write_cb_bio(name, type, str, asn1) \ #define IMPLEMENT_PEM_write_cb_bio(name, type, str, asn1) \
int PEM_write_bio_##name(BIO *bp, type *x, const EVP_CIPHER *enc, \ int PEM_write_bio_##name(BIO *bp, type *x, const EVP_CIPHER *enc, \
unsigned char *kstr, int klen, pem_password_cb *cb, void *u) \ unsigned char *kstr, int klen, pem_password_cb *cb, void *u) \
{ \ { \
return(((int (*)(I2D_OF(type),const char *,BIO *,type *,const EVP_CIPHER *,unsigned char *,int,pem_password_cb *,void *))openssl_fcast(PEM_ASN1_write_bio))(i2d_##asn1,str,bp,x,enc,kstr,klen,cb,u)); \ return PEM_ASN1_write_bio(CHECKED_I2D_OF(type, i2d_##asn1), \
} str, bp, \
CHECKED_PTR_OF(type, x), \
enc, kstr, klen, cb, u); \
}
#define IMPLEMENT_PEM_write_cb_bio_const(name, type, str, asn1) \ #define IMPLEMENT_PEM_write_cb_bio_const(name, type, str, asn1) \
int PEM_write_bio_##name(BIO *bp, type *x, const EVP_CIPHER *enc, \ int PEM_write_bio_##name(BIO *bp, type *x, const EVP_CIPHER *enc, \
unsigned char *kstr, int klen, pem_password_cb *cb, void *u) \ unsigned char *kstr, int klen, pem_password_cb *cb, void *u) \
{ \ { \
return(((int (*)(I2D_OF_const(type),const char *,BIO *,type *,const EVP_CIPHER *,unsigned char *,int,pem_password_cb *,void *))openssl_fcast(PEM_ASN1_write_bio))(i2d_##asn1,str,bp,x,enc,kstr,klen,cb,u)); \ return PEM_ASN1_write_bio(CHECKED_I2D_OF(const type, i2d_##asn1), \
} str, bp, \
CHECKED_PTR_OF(const type, x), \
enc, kstr, klen, cb, u); \
}
#define IMPLEMENT_PEM_write(name, type, str, asn1) \ #define IMPLEMENT_PEM_write(name, type, str, asn1) \
IMPLEMENT_PEM_write_bio(name, type, str, asn1) \ IMPLEMENT_PEM_write_bio(name, type, str, asn1) \
IMPLEMENT_PEM_write_fp(name, type, str, asn1) IMPLEMENT_PEM_write_fp(name, type, str, asn1)
#define IMPLEMENT_PEM_write_const(name, type, str, asn1) \ #define IMPLEMENT_PEM_write_const(name, type, str, asn1) \
IMPLEMENT_PEM_write_bio_const(name, type, str, asn1) \ IMPLEMENT_PEM_write_bio_const(name, type, str, asn1) \
IMPLEMENT_PEM_write_fp_const(name, type, str, asn1) IMPLEMENT_PEM_write_fp_const(name, type, str, asn1)
#define IMPLEMENT_PEM_write_cb(name, type, str, asn1) \ #define IMPLEMENT_PEM_write_cb(name, type, str, asn1) \
IMPLEMENT_PEM_write_cb_bio(name, type, str, asn1) \ IMPLEMENT_PEM_write_cb_bio(name, type, str, asn1) \
IMPLEMENT_PEM_write_cb_fp(name, type, str, asn1) IMPLEMENT_PEM_write_cb_fp(name, type, str, asn1)
#define IMPLEMENT_PEM_write_cb_const(name, type, str, asn1) \ #define IMPLEMENT_PEM_write_cb_const(name, type, str, asn1) \
IMPLEMENT_PEM_write_cb_bio_const(name, type, str, asn1) \ IMPLEMENT_PEM_write_cb_bio_const(name, type, str, asn1) \
IMPLEMENT_PEM_write_cb_fp_const(name, type, str, asn1) IMPLEMENT_PEM_write_cb_fp_const(name, type, str, asn1)
#define IMPLEMENT_PEM_read(name, type, str, asn1) \ #define IMPLEMENT_PEM_read(name, type, str, asn1) \
IMPLEMENT_PEM_read_bio(name, type, str, asn1) \ IMPLEMENT_PEM_read_bio(name, type, str, asn1) \
IMPLEMENT_PEM_read_fp(name, type, str, asn1) IMPLEMENT_PEM_read_fp(name, type, str, asn1)
#define IMPLEMENT_PEM_rw(name, type, str, asn1) \ #define IMPLEMENT_PEM_rw(name, type, str, asn1) \
IMPLEMENT_PEM_read(name, type, str, asn1) \ IMPLEMENT_PEM_read(name, type, str, asn1) \
IMPLEMENT_PEM_write(name, type, str, asn1) IMPLEMENT_PEM_write(name, type, str, asn1)
#define IMPLEMENT_PEM_rw_const(name, type, str, asn1) \ #define IMPLEMENT_PEM_rw_const(name, type, str, asn1) \
IMPLEMENT_PEM_read(name, type, str, asn1) \ IMPLEMENT_PEM_read(name, type, str, asn1) \
IMPLEMENT_PEM_write_const(name, type, str, asn1) IMPLEMENT_PEM_write_const(name, type, str, asn1)
#define IMPLEMENT_PEM_rw_cb(name, type, str, asn1) \ #define IMPLEMENT_PEM_rw_cb(name, type, str, asn1) \
IMPLEMENT_PEM_read(name, type, str, asn1) \ IMPLEMENT_PEM_read(name, type, str, asn1) \
IMPLEMENT_PEM_write_cb(name, type, str, asn1) IMPLEMENT_PEM_write_cb(name, type, str, asn1)
/* These are the same except they are for the declarations */ /* These are the same except they are for the declarations */
@@ -328,33 +360,33 @@ int PEM_write_bio_##name(BIO *bp, type *x, const EVP_CIPHER *enc, \
#else #else
#define DECLARE_PEM_read_fp(name, type) \ #define DECLARE_PEM_read_fp(name, type) \
type *PEM_read_##name(FILE *fp, type **x, pem_password_cb *cb, void *u); type *PEM_read_##name(FILE *fp, type **x, pem_password_cb *cb, void *u);
#define DECLARE_PEM_write_fp(name, type) \ #define DECLARE_PEM_write_fp(name, type) \
int PEM_write_##name(FILE *fp, type *x); int PEM_write_##name(FILE *fp, type *x);
#define DECLARE_PEM_write_fp_const(name, type) \ #define DECLARE_PEM_write_fp_const(name, type) \
int PEM_write_##name(FILE *fp, const type *x); int PEM_write_##name(FILE *fp, const type *x);
#define DECLARE_PEM_write_cb_fp(name, type) \ #define DECLARE_PEM_write_cb_fp(name, type) \
int PEM_write_##name(FILE *fp, type *x, const EVP_CIPHER *enc, \ int PEM_write_##name(FILE *fp, type *x, const EVP_CIPHER *enc, \
unsigned char *kstr, int klen, pem_password_cb *cb, void *u); unsigned char *kstr, int klen, pem_password_cb *cb, void *u);
#endif #endif
#ifndef OPENSSL_NO_BIO #ifndef OPENSSL_NO_BIO
#define DECLARE_PEM_read_bio(name, type) \ #define DECLARE_PEM_read_bio(name, type) \
type *PEM_read_bio_##name(BIO *bp, type **x, pem_password_cb *cb, void *u); type *PEM_read_bio_##name(BIO *bp, type **x, pem_password_cb *cb, void *u);
#define DECLARE_PEM_write_bio(name, type) \ #define DECLARE_PEM_write_bio(name, type) \
int PEM_write_bio_##name(BIO *bp, type *x); int PEM_write_bio_##name(BIO *bp, type *x);
#define DECLARE_PEM_write_bio_const(name, type) \ #define DECLARE_PEM_write_bio_const(name, type) \
int PEM_write_bio_##name(BIO *bp, const type *x); int PEM_write_bio_##name(BIO *bp, const type *x);
#define DECLARE_PEM_write_cb_bio(name, type) \ #define DECLARE_PEM_write_cb_bio(name, type) \
int PEM_write_bio_##name(BIO *bp, type *x, const EVP_CIPHER *enc, \ int PEM_write_bio_##name(BIO *bp, type *x, const EVP_CIPHER *enc, \
unsigned char *kstr, int klen, pem_password_cb *cb, void *u); unsigned char *kstr, int klen, pem_password_cb *cb, void *u);
#else #else
@@ -365,162 +397,162 @@ int PEM_write_bio_##name(BIO *bp, type *x, const EVP_CIPHER *enc, \
#endif #endif
#define DECLARE_PEM_write(name, type) \ #define DECLARE_PEM_write(name, type) \
DECLARE_PEM_write_bio(name, type) \ DECLARE_PEM_write_bio(name, type) \
DECLARE_PEM_write_fp(name, type) DECLARE_PEM_write_fp(name, type)
#define DECLARE_PEM_write_const(name, type) \ #define DECLARE_PEM_write_const(name, type) \
DECLARE_PEM_write_bio_const(name, type) \ DECLARE_PEM_write_bio_const(name, type) \
DECLARE_PEM_write_fp_const(name, type) DECLARE_PEM_write_fp_const(name, type)
#define DECLARE_PEM_write_cb(name, type) \ #define DECLARE_PEM_write_cb(name, type) \
DECLARE_PEM_write_cb_bio(name, type) \ DECLARE_PEM_write_cb_bio(name, type) \
DECLARE_PEM_write_cb_fp(name, type) DECLARE_PEM_write_cb_fp(name, type)
#define DECLARE_PEM_read(name, type) \ #define DECLARE_PEM_read(name, type) \
DECLARE_PEM_read_bio(name, type) \ DECLARE_PEM_read_bio(name, type) \
DECLARE_PEM_read_fp(name, type) DECLARE_PEM_read_fp(name, type)
#define DECLARE_PEM_rw(name, type) \ #define DECLARE_PEM_rw(name, type) \
DECLARE_PEM_read(name, type) \ DECLARE_PEM_read(name, type) \
DECLARE_PEM_write(name, type) DECLARE_PEM_write(name, type)
#define DECLARE_PEM_rw_const(name, type) \ #define DECLARE_PEM_rw_const(name, type) \
DECLARE_PEM_read(name, type) \ DECLARE_PEM_read(name, type) \
DECLARE_PEM_write_const(name, type) DECLARE_PEM_write_const(name, type)
#define DECLARE_PEM_rw_cb(name, type) \ #define DECLARE_PEM_rw_cb(name, type) \
DECLARE_PEM_read(name, type) \ DECLARE_PEM_read(name, type) \
DECLARE_PEM_write_cb(name, type) DECLARE_PEM_write_cb(name, type)
#ifdef SSLEAY_MACROS #ifdef SSLEAY_MACROS
#define PEM_write_SSL_SESSION(fp,x) \ #define PEM_write_SSL_SESSION(fp,x) \
PEM_ASN1_write((int (*)())i2d_SSL_SESSION, \ PEM_ASN1_write((int (*)())i2d_SSL_SESSION, \
PEM_STRING_SSL_SESSION,fp, (char *)x, NULL,NULL,0,NULL,NULL) PEM_STRING_SSL_SESSION,fp, (char *)x, NULL,NULL,0,NULL,NULL)
#define PEM_write_X509(fp,x) \ #define PEM_write_X509(fp,x) \
PEM_ASN1_write((int (*)())i2d_X509,PEM_STRING_X509,fp, \ PEM_ASN1_write((int (*)())i2d_X509,PEM_STRING_X509,fp, \
(char *)x, NULL,NULL,0,NULL,NULL) (char *)x, NULL,NULL,0,NULL,NULL)
#define PEM_write_X509_REQ(fp,x) PEM_ASN1_write( \ #define PEM_write_X509_REQ(fp,x) PEM_ASN1_write( \
(int (*)())i2d_X509_REQ,PEM_STRING_X509_REQ,fp,(char *)x, \ (int (*)())i2d_X509_REQ,PEM_STRING_X509_REQ,fp,(char *)x, \
NULL,NULL,0,NULL,NULL) NULL,NULL,0,NULL,NULL)
#define PEM_write_X509_CRL(fp,x) \ #define PEM_write_X509_CRL(fp,x) \
PEM_ASN1_write((int (*)())i2d_X509_CRL,PEM_STRING_X509_CRL, \ PEM_ASN1_write((int (*)())i2d_X509_CRL,PEM_STRING_X509_CRL, \
fp,(char *)x, NULL,NULL,0,NULL,NULL) fp,(char *)x, NULL,NULL,0,NULL,NULL)
#define PEM_write_RSAPrivateKey(fp,x,enc,kstr,klen,cb,u) \ #define PEM_write_RSAPrivateKey(fp,x,enc,kstr,klen,cb,u) \
PEM_ASN1_write((int (*)())i2d_RSAPrivateKey,PEM_STRING_RSA,fp,\ PEM_ASN1_write((int (*)())i2d_RSAPrivateKey,PEM_STRING_RSA,fp,\
(char *)x,enc,kstr,klen,cb,u) (char *)x,enc,kstr,klen,cb,u)
#define PEM_write_RSAPublicKey(fp,x) \ #define PEM_write_RSAPublicKey(fp,x) \
PEM_ASN1_write((int (*)())i2d_RSAPublicKey,\ PEM_ASN1_write((int (*)())i2d_RSAPublicKey,\
PEM_STRING_RSA_PUBLIC,fp,(char *)x,NULL,NULL,0,NULL,NULL) PEM_STRING_RSA_PUBLIC,fp,(char *)x,NULL,NULL,0,NULL,NULL)
#define PEM_write_DSAPrivateKey(fp,x,enc,kstr,klen,cb,u) \ #define PEM_write_DSAPrivateKey(fp,x,enc,kstr,klen,cb,u) \
PEM_ASN1_write((int (*)())i2d_DSAPrivateKey,PEM_STRING_DSA,fp,\ PEM_ASN1_write((int (*)())i2d_DSAPrivateKey,PEM_STRING_DSA,fp,\
(char *)x,enc,kstr,klen,cb,u) (char *)x,enc,kstr,klen,cb,u)
#define PEM_write_PrivateKey(bp,x,enc,kstr,klen,cb,u) \ #define PEM_write_PrivateKey(bp,x,enc,kstr,klen,cb,u) \
PEM_ASN1_write((int (*)())i2d_PrivateKey,\ PEM_ASN1_write((int (*)())i2d_PrivateKey,\
(((x)->type == EVP_PKEY_DSA)?PEM_STRING_DSA:PEM_STRING_RSA),\ (((x)->type == EVP_PKEY_DSA)?PEM_STRING_DSA:PEM_STRING_RSA),\
bp,(char *)x,enc,kstr,klen,cb,u) bp,(char *)x,enc,kstr,klen,cb,u)
#define PEM_write_PKCS7(fp,x) \ #define PEM_write_PKCS7(fp,x) \
PEM_ASN1_write((int (*)())i2d_PKCS7,PEM_STRING_PKCS7,fp, \ PEM_ASN1_write((int (*)())i2d_PKCS7,PEM_STRING_PKCS7,fp, \
(char *)x, NULL,NULL,0,NULL,NULL) (char *)x, NULL,NULL,0,NULL,NULL)
#define PEM_write_DHparams(fp,x) \ #define PEM_write_DHparams(fp,x) \
PEM_ASN1_write((int (*)())i2d_DHparams,PEM_STRING_DHPARAMS,fp,\ PEM_ASN1_write((int (*)())i2d_DHparams,PEM_STRING_DHPARAMS,fp,\
(char *)x,NULL,NULL,0,NULL,NULL) (char *)x,NULL,NULL,0,NULL,NULL)
#define PEM_write_NETSCAPE_CERT_SEQUENCE(fp,x) \ #define PEM_write_NETSCAPE_CERT_SEQUENCE(fp,x) \
PEM_ASN1_write((int (*)())i2d_NETSCAPE_CERT_SEQUENCE, \ PEM_ASN1_write((int (*)())i2d_NETSCAPE_CERT_SEQUENCE, \
PEM_STRING_X509,fp, \ PEM_STRING_X509,fp, \
(char *)x, NULL,NULL,0,NULL,NULL) (char *)x, NULL,NULL,0,NULL,NULL)
#define PEM_read_SSL_SESSION(fp,x,cb,u) (SSL_SESSION *)PEM_ASN1_read( \ #define PEM_read_SSL_SESSION(fp,x,cb,u) (SSL_SESSION *)PEM_ASN1_read( \
(char *(*)())d2i_SSL_SESSION,PEM_STRING_SSL_SESSION,fp,(char **)x,cb,u) (char *(*)())d2i_SSL_SESSION,PEM_STRING_SSL_SESSION,fp,(char **)x,cb,u)
#define PEM_read_X509(fp,x,cb,u) (X509 *)PEM_ASN1_read( \ #define PEM_read_X509(fp,x,cb,u) (X509 *)PEM_ASN1_read( \
(char *(*)())d2i_X509,PEM_STRING_X509,fp,(char **)x,cb,u) (char *(*)())d2i_X509,PEM_STRING_X509,fp,(char **)x,cb,u)
#define PEM_read_X509_REQ(fp,x,cb,u) (X509_REQ *)PEM_ASN1_read( \ #define PEM_read_X509_REQ(fp,x,cb,u) (X509_REQ *)PEM_ASN1_read( \
(char *(*)())d2i_X509_REQ,PEM_STRING_X509_REQ,fp,(char **)x,cb,u) (char *(*)())d2i_X509_REQ,PEM_STRING_X509_REQ,fp,(char **)x,cb,u)
#define PEM_read_X509_CRL(fp,x,cb,u) (X509_CRL *)PEM_ASN1_read( \ #define PEM_read_X509_CRL(fp,x,cb,u) (X509_CRL *)PEM_ASN1_read( \
(char *(*)())d2i_X509_CRL,PEM_STRING_X509_CRL,fp,(char **)x,cb,u) (char *(*)())d2i_X509_CRL,PEM_STRING_X509_CRL,fp,(char **)x,cb,u)
#define PEM_read_RSAPrivateKey(fp,x,cb,u) (RSA *)PEM_ASN1_read( \ #define PEM_read_RSAPrivateKey(fp,x,cb,u) (RSA *)PEM_ASN1_read( \
(char *(*)())d2i_RSAPrivateKey,PEM_STRING_RSA,fp,(char **)x,cb,u) (char *(*)())d2i_RSAPrivateKey,PEM_STRING_RSA,fp,(char **)x,cb,u)
#define PEM_read_RSAPublicKey(fp,x,cb,u) (RSA *)PEM_ASN1_read( \ #define PEM_read_RSAPublicKey(fp,x,cb,u) (RSA *)PEM_ASN1_read( \
(char *(*)())d2i_RSAPublicKey,PEM_STRING_RSA_PUBLIC,fp,(char **)x,cb,u) (char *(*)())d2i_RSAPublicKey,PEM_STRING_RSA_PUBLIC,fp,(char **)x,cb,u)
#define PEM_read_DSAPrivateKey(fp,x,cb,u) (DSA *)PEM_ASN1_read( \ #define PEM_read_DSAPrivateKey(fp,x,cb,u) (DSA *)PEM_ASN1_read( \
(char *(*)())d2i_DSAPrivateKey,PEM_STRING_DSA,fp,(char **)x,cb,u) (char *(*)())d2i_DSAPrivateKey,PEM_STRING_DSA,fp,(char **)x,cb,u)
#define PEM_read_PrivateKey(fp,x,cb,u) (EVP_PKEY *)PEM_ASN1_read( \ #define PEM_read_PrivateKey(fp,x,cb,u) (EVP_PKEY *)PEM_ASN1_read( \
(char *(*)())d2i_PrivateKey,PEM_STRING_EVP_PKEY,fp,(char **)x,cb,u) (char *(*)())d2i_PrivateKey,PEM_STRING_EVP_PKEY,fp,(char **)x,cb,u)
#define PEM_read_PKCS7(fp,x,cb,u) (PKCS7 *)PEM_ASN1_read( \ #define PEM_read_PKCS7(fp,x,cb,u) (PKCS7 *)PEM_ASN1_read( \
(char *(*)())d2i_PKCS7,PEM_STRING_PKCS7,fp,(char **)x,cb,u) (char *(*)())d2i_PKCS7,PEM_STRING_PKCS7,fp,(char **)x,cb,u)
#define PEM_read_DHparams(fp,x,cb,u) (DH *)PEM_ASN1_read( \ #define PEM_read_DHparams(fp,x,cb,u) (DH *)PEM_ASN1_read( \
(char *(*)())d2i_DHparams,PEM_STRING_DHPARAMS,fp,(char **)x,cb,u) (char *(*)())d2i_DHparams,PEM_STRING_DHPARAMS,fp,(char **)x,cb,u)
#define PEM_read_NETSCAPE_CERT_SEQUENCE(fp,x,cb,u) \ #define PEM_read_NETSCAPE_CERT_SEQUENCE(fp,x,cb,u) \
(NETSCAPE_CERT_SEQUENCE *)PEM_ASN1_read( \ (NETSCAPE_CERT_SEQUENCE *)PEM_ASN1_read( \
(char *(*)())d2i_NETSCAPE_CERT_SEQUENCE,PEM_STRING_X509,fp,\ (char *(*)())d2i_NETSCAPE_CERT_SEQUENCE,PEM_STRING_X509,fp,\
(char **)x,cb,u) (char **)x,cb,u)
#define PEM_write_bio_X509(bp,x) \ #define PEM_write_bio_X509(bp,x) \
PEM_ASN1_write_bio((int (*)())i2d_X509,PEM_STRING_X509,bp, \ PEM_ASN1_write_bio((int (*)())i2d_X509,PEM_STRING_X509,bp, \
(char *)x, NULL,NULL,0,NULL,NULL) (char *)x, NULL,NULL,0,NULL,NULL)
#define PEM_write_bio_X509_REQ(bp,x) PEM_ASN1_write_bio( \ #define PEM_write_bio_X509_REQ(bp,x) PEM_ASN1_write_bio( \
(int (*)())i2d_X509_REQ,PEM_STRING_X509_REQ,bp,(char *)x, \ (int (*)())i2d_X509_REQ,PEM_STRING_X509_REQ,bp,(char *)x, \
NULL,NULL,0,NULL,NULL) NULL,NULL,0,NULL,NULL)
#define PEM_write_bio_X509_CRL(bp,x) \ #define PEM_write_bio_X509_CRL(bp,x) \
PEM_ASN1_write_bio((int (*)())i2d_X509_CRL,PEM_STRING_X509_CRL,\ PEM_ASN1_write_bio((int (*)())i2d_X509_CRL,PEM_STRING_X509_CRL,\
bp,(char *)x, NULL,NULL,0,NULL,NULL) bp,(char *)x, NULL,NULL,0,NULL,NULL)
#define PEM_write_bio_RSAPrivateKey(bp,x,enc,kstr,klen,cb,u) \ #define PEM_write_bio_RSAPrivateKey(bp,x,enc,kstr,klen,cb,u) \
PEM_ASN1_write_bio((int (*)())i2d_RSAPrivateKey,PEM_STRING_RSA,\ PEM_ASN1_write_bio((int (*)())i2d_RSAPrivateKey,PEM_STRING_RSA,\
bp,(char *)x,enc,kstr,klen,cb,u) bp,(char *)x,enc,kstr,klen,cb,u)
#define PEM_write_bio_RSAPublicKey(bp,x) \ #define PEM_write_bio_RSAPublicKey(bp,x) \
PEM_ASN1_write_bio((int (*)())i2d_RSAPublicKey, \ PEM_ASN1_write_bio((int (*)())i2d_RSAPublicKey, \
PEM_STRING_RSA_PUBLIC,\ PEM_STRING_RSA_PUBLIC,\
bp,(char *)x,NULL,NULL,0,NULL,NULL) bp,(char *)x,NULL,NULL,0,NULL,NULL)
#define PEM_write_bio_DSAPrivateKey(bp,x,enc,kstr,klen,cb,u) \ #define PEM_write_bio_DSAPrivateKey(bp,x,enc,kstr,klen,cb,u) \
PEM_ASN1_write_bio((int (*)())i2d_DSAPrivateKey,PEM_STRING_DSA,\ PEM_ASN1_write_bio((int (*)())i2d_DSAPrivateKey,PEM_STRING_DSA,\
bp,(char *)x,enc,kstr,klen,cb,u) bp,(char *)x,enc,kstr,klen,cb,u)
#define PEM_write_bio_PrivateKey(bp,x,enc,kstr,klen,cb,u) \ #define PEM_write_bio_PrivateKey(bp,x,enc,kstr,klen,cb,u) \
PEM_ASN1_write_bio((int (*)())i2d_PrivateKey,\ PEM_ASN1_write_bio((int (*)())i2d_PrivateKey,\
(((x)->type == EVP_PKEY_DSA)?PEM_STRING_DSA:PEM_STRING_RSA),\ (((x)->type == EVP_PKEY_DSA)?PEM_STRING_DSA:PEM_STRING_RSA),\
bp,(char *)x,enc,kstr,klen,cb,u) bp,(char *)x,enc,kstr,klen,cb,u)
#define PEM_write_bio_PKCS7(bp,x) \ #define PEM_write_bio_PKCS7(bp,x) \
PEM_ASN1_write_bio((int (*)())i2d_PKCS7,PEM_STRING_PKCS7,bp, \ PEM_ASN1_write_bio((int (*)())i2d_PKCS7,PEM_STRING_PKCS7,bp, \
(char *)x, NULL,NULL,0,NULL,NULL) (char *)x, NULL,NULL,0,NULL,NULL)
#define PEM_write_bio_DHparams(bp,x) \ #define PEM_write_bio_DHparams(bp,x) \
PEM_ASN1_write_bio((int (*)())i2d_DHparams,PEM_STRING_DHPARAMS,\ PEM_ASN1_write_bio((int (*)())i2d_DHparams,PEM_STRING_DHPARAMS,\
bp,(char *)x,NULL,NULL,0,NULL,NULL) bp,(char *)x,NULL,NULL,0,NULL,NULL)
#define PEM_write_bio_DSAparams(bp,x) \ #define PEM_write_bio_DSAparams(bp,x) \
PEM_ASN1_write_bio((int (*)())i2d_DSAparams, \ PEM_ASN1_write_bio((int (*)())i2d_DSAparams, \
PEM_STRING_DSAPARAMS,bp,(char *)x,NULL,NULL,0,NULL,NULL) PEM_STRING_DSAPARAMS,bp,(char *)x,NULL,NULL,0,NULL,NULL)
#define PEM_write_bio_NETSCAPE_CERT_SEQUENCE(bp,x) \ #define PEM_write_bio_NETSCAPE_CERT_SEQUENCE(bp,x) \
PEM_ASN1_write_bio((int (*)())i2d_NETSCAPE_CERT_SEQUENCE, \ PEM_ASN1_write_bio((int (*)())i2d_NETSCAPE_CERT_SEQUENCE, \
PEM_STRING_X509,bp, \ PEM_STRING_X509,bp, \
(char *)x, NULL,NULL,0,NULL,NULL) (char *)x, NULL,NULL,0,NULL,NULL)
#define PEM_read_bio_X509(bp,x,cb,u) (X509 *)PEM_ASN1_read_bio( \ #define PEM_read_bio_X509(bp,x,cb,u) (X509 *)PEM_ASN1_read_bio( \
(char *(*)())d2i_X509,PEM_STRING_X509,bp,(char **)x,cb,u) (char *(*)())d2i_X509,PEM_STRING_X509,bp,(char **)x,cb,u)
#define PEM_read_bio_X509_REQ(bp,x,cb,u) (X509_REQ *)PEM_ASN1_read_bio( \ #define PEM_read_bio_X509_REQ(bp,x,cb,u) (X509_REQ *)PEM_ASN1_read_bio( \
(char *(*)())d2i_X509_REQ,PEM_STRING_X509_REQ,bp,(char **)x,cb,u) (char *(*)())d2i_X509_REQ,PEM_STRING_X509_REQ,bp,(char **)x,cb,u)
#define PEM_read_bio_X509_CRL(bp,x,cb,u) (X509_CRL *)PEM_ASN1_read_bio( \ #define PEM_read_bio_X509_CRL(bp,x,cb,u) (X509_CRL *)PEM_ASN1_read_bio( \
(char *(*)())d2i_X509_CRL,PEM_STRING_X509_CRL,bp,(char **)x,cb,u) (char *(*)())d2i_X509_CRL,PEM_STRING_X509_CRL,bp,(char **)x,cb,u)
#define PEM_read_bio_RSAPrivateKey(bp,x,cb,u) (RSA *)PEM_ASN1_read_bio( \ #define PEM_read_bio_RSAPrivateKey(bp,x,cb,u) (RSA *)PEM_ASN1_read_bio( \
(char *(*)())d2i_RSAPrivateKey,PEM_STRING_RSA,bp,(char **)x,cb,u) (char *(*)())d2i_RSAPrivateKey,PEM_STRING_RSA,bp,(char **)x,cb,u)
#define PEM_read_bio_RSAPublicKey(bp,x,cb,u) (RSA *)PEM_ASN1_read_bio( \ #define PEM_read_bio_RSAPublicKey(bp,x,cb,u) (RSA *)PEM_ASN1_read_bio( \
(char *(*)())d2i_RSAPublicKey,PEM_STRING_RSA_PUBLIC,bp,(char **)x,cb,u) (char *(*)())d2i_RSAPublicKey,PEM_STRING_RSA_PUBLIC,bp,(char **)x,cb,u)
#define PEM_read_bio_DSAPrivateKey(bp,x,cb,u) (DSA *)PEM_ASN1_read_bio( \ #define PEM_read_bio_DSAPrivateKey(bp,x,cb,u) (DSA *)PEM_ASN1_read_bio( \
(char *(*)())d2i_DSAPrivateKey,PEM_STRING_DSA,bp,(char **)x,cb,u) (char *(*)())d2i_DSAPrivateKey,PEM_STRING_DSA,bp,(char **)x,cb,u)
#define PEM_read_bio_PrivateKey(bp,x,cb,u) (EVP_PKEY *)PEM_ASN1_read_bio( \ #define PEM_read_bio_PrivateKey(bp,x,cb,u) (EVP_PKEY *)PEM_ASN1_read_bio( \
(char *(*)())d2i_PrivateKey,PEM_STRING_EVP_PKEY,bp,(char **)x,cb,u) (char *(*)())d2i_PrivateKey,PEM_STRING_EVP_PKEY,bp,(char **)x,cb,u)
#define PEM_read_bio_PKCS7(bp,x,cb,u) (PKCS7 *)PEM_ASN1_read_bio( \ #define PEM_read_bio_PKCS7(bp,x,cb,u) (PKCS7 *)PEM_ASN1_read_bio( \
(char *(*)())d2i_PKCS7,PEM_STRING_PKCS7,bp,(char **)x,cb,u) (char *(*)())d2i_PKCS7,PEM_STRING_PKCS7,bp,(char **)x,cb,u)
#define PEM_read_bio_DHparams(bp,x,cb,u) (DH *)PEM_ASN1_read_bio( \ #define PEM_read_bio_DHparams(bp,x,cb,u) (DH *)PEM_ASN1_read_bio( \
(char *(*)())d2i_DHparams,PEM_STRING_DHPARAMS,bp,(char **)x,cb,u) (char *(*)())d2i_DHparams,PEM_STRING_DHPARAMS,bp,(char **)x,cb,u)
#define PEM_read_bio_DSAparams(bp,x,cb,u) (DSA *)PEM_ASN1_read_bio( \ #define PEM_read_bio_DSAparams(bp,x,cb,u) (DSA *)PEM_ASN1_read_bio( \
(char *(*)())d2i_DSAparams,PEM_STRING_DSAPARAMS,bp,(char **)x,cb,u) (char *(*)())d2i_DSAparams,PEM_STRING_DSAPARAMS,bp,(char **)x,cb,u)
#define PEM_read_bio_NETSCAPE_CERT_SEQUENCE(bp,x,cb,u) \ #define PEM_read_bio_NETSCAPE_CERT_SEQUENCE(bp,x,cb,u) \
(NETSCAPE_CERT_SEQUENCE *)PEM_ASN1_read_bio( \ (NETSCAPE_CERT_SEQUENCE *)PEM_ASN1_read_bio( \
(char *(*)())d2i_NETSCAPE_CERT_SEQUENCE,PEM_STRING_X509,bp,\ (char *(*)())d2i_NETSCAPE_CERT_SEQUENCE,PEM_STRING_X509,bp,\
(char **)x,cb,u) (char **)x,cb,u)
#endif #endif
@@ -532,61 +564,70 @@ typedef int pem_password_cb(char *buf, int size, int rwflag, void *userdata);
typedef int pem_password_cb(char *buf, int size, int rwflag); typedef int pem_password_cb(char *buf, int size, int rwflag);
#endif #endif
int PEM_get_EVP_CIPHER_INFO(char *header, EVP_CIPHER_INFO *cipher); int PEM_get_EVP_CIPHER_INFO(char *header, EVP_CIPHER_INFO *cipher);
int PEM_do_header (EVP_CIPHER_INFO *cipher, unsigned char *data,long *len, int PEM_do_header (EVP_CIPHER_INFO *cipher, unsigned char *data,long *len,
pem_password_cb *callback,void *u); pem_password_cb *callback,void *u);
#ifndef OPENSSL_NO_BIO #ifndef OPENSSL_NO_BIO
int PEM_read_bio(BIO *bp, char **name, char **header, int PEM_read_bio(BIO *bp, char **name, char **header,
unsigned char **data,long *len); unsigned char **data,long *len);
int PEM_write_bio(BIO *bp,const char *name,char *hdr,unsigned char *data, int PEM_write_bio(BIO *bp,const char *name,char *hdr,unsigned char *data,
long len); long len);
int PEM_bytes_read_bio(unsigned char **pdata, long *plen, char **pnm, const char *name, BIO *bp, int PEM_bytes_read_bio(unsigned char **pdata, long *plen, char **pnm, const char *name, BIO *bp,
pem_password_cb *cb, void *u); pem_password_cb *cb, void *u);
void * PEM_ASN1_read_bio(d2i_of_void *d2i, const char *name, BIO *bp, void * PEM_ASN1_read_bio(d2i_of_void *d2i, const char *name, BIO *bp,
void **x, pem_password_cb *cb, void *u); void **x, pem_password_cb *cb, void *u);
#define PEM_ASN1_read_bio_of(type,d2i,name,bp,x,cb,u) \
((type *(*)(D2I_OF(type),const char *,BIO *,type **,pem_password_cb *,void *))openssl_fcast(PEM_ASN1_read_bio))(d2i,name,bp,x,cb,u)
int PEM_ASN1_write_bio(i2d_of_void *i2d,const char *name,BIO *bp,char *x,
const EVP_CIPHER *enc,unsigned char *kstr,int klen,
pem_password_cb *cb, void *u);
#define PEM_ASN1_write_bio_of(type,i2d,name,bp,x,enc,kstr,klen,cb,u) \
((int (*)(I2D_OF(type),const char *,BIO *,type *, const EVP_CIPHER *,unsigned char *,int, pem_password_cb *,void *))openssl_fcast(PEM_ASN1_write_bio))(i2d,name,bp,x,enc,kstr,klen,cb,u)
STACK_OF(X509_INFO) * PEM_X509_INFO_read_bio(BIO *bp, STACK_OF(X509_INFO) *sk, pem_password_cb *cb, void *u); #define PEM_ASN1_read_bio_of(type,d2i,name,bp,x,cb,u) \
int PEM_X509_INFO_write_bio(BIO *bp,X509_INFO *xi, EVP_CIPHER *enc, ((type*)PEM_ASN1_read_bio(CHECKED_D2I_OF(type, d2i), \
unsigned char *kstr, int klen, pem_password_cb *cd, void *u); name, bp, \
CHECKED_PPTR_OF(type, x), \
cb, u))
int PEM_ASN1_write_bio(i2d_of_void *i2d,const char *name,BIO *bp,char *x,
const EVP_CIPHER *enc,unsigned char *kstr,int klen,
pem_password_cb *cb, void *u);
#define PEM_ASN1_write_bio_of(type,i2d,name,bp,x,enc,kstr,klen,cb,u) \
(PEM_ASN1_write_bio(CHECKED_I2D_OF(type, i2d), \
name, bp, \
CHECKED_PTR_OF(type, x), \
enc, kstr, klen, cb, u))
STACK_OF(X509_INFO) * PEM_X509_INFO_read_bio(BIO *bp, STACK_OF(X509_INFO) *sk, pem_password_cb *cb, void *u);
int PEM_X509_INFO_write_bio(BIO *bp,X509_INFO *xi, EVP_CIPHER *enc,
unsigned char *kstr, int klen, pem_password_cb *cd, void *u);
#endif #endif
#ifndef OPENSSL_SYS_WIN16 #ifndef OPENSSL_SYS_WIN16
int PEM_read(FILE *fp, char **name, char **header, int PEM_read(FILE *fp, char **name, char **header,
unsigned char **data,long *len); unsigned char **data,long *len);
int PEM_write(FILE *fp,char *name,char *hdr,unsigned char *data,long len); int PEM_write(FILE *fp,char *name,char *hdr,unsigned char *data,long len);
void * PEM_ASN1_read(d2i_of_void *d2i, const char *name, FILE *fp, void **x, void * PEM_ASN1_read(d2i_of_void *d2i, const char *name, FILE *fp, void **x,
pem_password_cb *cb, void *u); pem_password_cb *cb, void *u);
int PEM_ASN1_write(i2d_of_void *i2d,const char *name,FILE *fp, int PEM_ASN1_write(i2d_of_void *i2d,const char *name,FILE *fp,
char *x,const EVP_CIPHER *enc,unsigned char *kstr, char *x,const EVP_CIPHER *enc,unsigned char *kstr,
int klen,pem_password_cb *callback, void *u); int klen,pem_password_cb *callback, void *u);
STACK_OF(X509_INFO) * PEM_X509_INFO_read(FILE *fp, STACK_OF(X509_INFO) *sk, STACK_OF(X509_INFO) * PEM_X509_INFO_read(FILE *fp, STACK_OF(X509_INFO) *sk,
pem_password_cb *cb, void *u); pem_password_cb *cb, void *u);
#endif #endif
int PEM_SealInit(PEM_ENCODE_SEAL_CTX *ctx, EVP_CIPHER *type, int PEM_SealInit(PEM_ENCODE_SEAL_CTX *ctx, EVP_CIPHER *type,
EVP_MD *md_type, unsigned char **ek, int *ekl, EVP_MD *md_type, unsigned char **ek, int *ekl,
unsigned char *iv, EVP_PKEY **pubk, int npubk); unsigned char *iv, EVP_PKEY **pubk, int npubk);
void PEM_SealUpdate(PEM_ENCODE_SEAL_CTX *ctx, unsigned char *out, int *outl, void PEM_SealUpdate(PEM_ENCODE_SEAL_CTX *ctx, unsigned char *out, int *outl,
unsigned char *in, int inl); unsigned char *in, int inl);
int PEM_SealFinal(PEM_ENCODE_SEAL_CTX *ctx, unsigned char *sig,int *sigl, int PEM_SealFinal(PEM_ENCODE_SEAL_CTX *ctx, unsigned char *sig,int *sigl,
unsigned char *out, int *outl, EVP_PKEY *priv); unsigned char *out, int *outl, EVP_PKEY *priv);
void PEM_SignInit(EVP_MD_CTX *ctx, EVP_MD *type); void PEM_SignInit(EVP_MD_CTX *ctx, EVP_MD *type);
void PEM_SignUpdate(EVP_MD_CTX *ctx,unsigned char *d,unsigned int cnt); void PEM_SignUpdate(EVP_MD_CTX *ctx,unsigned char *d,unsigned int cnt);
int PEM_SignFinal(EVP_MD_CTX *ctx, unsigned char *sigret, int PEM_SignFinal(EVP_MD_CTX *ctx, unsigned char *sigret,
unsigned int *siglen, EVP_PKEY *pkey); unsigned int *siglen, EVP_PKEY *pkey);
int PEM_def_callback(char *buf, int num, int w, void *key); int PEM_def_callback(char *buf, int num, int w, void *key);
void PEM_proc_type(char *buf, int type); void PEM_proc_type(char *buf, int type);
void PEM_dek_info(char *buf, const char *type, int len, char *str); void PEM_dek_info(char *buf, const char *type, int len, char *str);
#ifndef SSLEAY_MACROS #ifndef SSLEAY_MACROS
@@ -647,32 +688,32 @@ DECLARE_PEM_rw_cb(PrivateKey, EVP_PKEY)
DECLARE_PEM_rw(PUBKEY, EVP_PKEY) DECLARE_PEM_rw(PUBKEY, EVP_PKEY)
int PEM_write_bio_PKCS8PrivateKey_nid(BIO *bp, EVP_PKEY *x, int nid, int PEM_write_bio_PKCS8PrivateKey_nid(BIO *bp, EVP_PKEY *x, int nid,
char *kstr, int klen, char *kstr, int klen,
pem_password_cb *cb, void *u); pem_password_cb *cb, void *u);
int PEM_write_bio_PKCS8PrivateKey(BIO *, EVP_PKEY *, const EVP_CIPHER *, int PEM_write_bio_PKCS8PrivateKey(BIO *, EVP_PKEY *, const EVP_CIPHER *,
char *, int, pem_password_cb *, void *); char *, int, pem_password_cb *, void *);
int i2d_PKCS8PrivateKey_bio(BIO *bp, EVP_PKEY *x, const EVP_CIPHER *enc, int i2d_PKCS8PrivateKey_bio(BIO *bp, EVP_PKEY *x, const EVP_CIPHER *enc,
char *kstr, int klen, char *kstr, int klen,
pem_password_cb *cb, void *u); pem_password_cb *cb, void *u);
int i2d_PKCS8PrivateKey_nid_bio(BIO *bp, EVP_PKEY *x, int nid, int i2d_PKCS8PrivateKey_nid_bio(BIO *bp, EVP_PKEY *x, int nid,
char *kstr, int klen, char *kstr, int klen,
pem_password_cb *cb, void *u); pem_password_cb *cb, void *u);
EVP_PKEY *d2i_PKCS8PrivateKey_bio(BIO *bp, EVP_PKEY **x, pem_password_cb *cb, void *u); EVP_PKEY *d2i_PKCS8PrivateKey_bio(BIO *bp, EVP_PKEY **x, pem_password_cb *cb, void *u);
int i2d_PKCS8PrivateKey_fp(FILE *fp, EVP_PKEY *x, const EVP_CIPHER *enc, int i2d_PKCS8PrivateKey_fp(FILE *fp, EVP_PKEY *x, const EVP_CIPHER *enc,
char *kstr, int klen, char *kstr, int klen,
pem_password_cb *cb, void *u); pem_password_cb *cb, void *u);
int i2d_PKCS8PrivateKey_nid_fp(FILE *fp, EVP_PKEY *x, int nid, int i2d_PKCS8PrivateKey_nid_fp(FILE *fp, EVP_PKEY *x, int nid,
char *kstr, int klen, char *kstr, int klen,
pem_password_cb *cb, void *u); pem_password_cb *cb, void *u);
int PEM_write_PKCS8PrivateKey_nid(FILE *fp, EVP_PKEY *x, int nid, int PEM_write_PKCS8PrivateKey_nid(FILE *fp, EVP_PKEY *x, int nid,
char *kstr, int klen, char *kstr, int klen,
pem_password_cb *cb, void *u); pem_password_cb *cb, void *u);
EVP_PKEY *d2i_PKCS8PrivateKey_fp(FILE *fp, EVP_PKEY **x, pem_password_cb *cb, void *u); EVP_PKEY *d2i_PKCS8PrivateKey_fp(FILE *fp, EVP_PKEY **x, pem_password_cb *cb, void *u);
int PEM_write_PKCS8PrivateKey(FILE *fp,EVP_PKEY *x,const EVP_CIPHER *enc, int PEM_write_PKCS8PrivateKey(FILE *fp,EVP_PKEY *x,const EVP_CIPHER *enc,
char *kstr,int klen, pem_password_cb *cd, void *u); char *kstr,int klen, pem_password_cb *cd, void *u);
#endif /* SSLEAY_MACROS */ #endif /* SSLEAY_MACROS */
@@ -686,53 +727,52 @@ void ERR_load_PEM_strings(void);
/* Error codes for the PEM functions. */ /* Error codes for the PEM functions. */
/* Function codes. */ /* Function codes. */
#define PEM_F_D2I_PKCS8PRIVATEKEY_BIO 120 #define PEM_F_D2I_PKCS8PRIVATEKEY_BIO 120
#define PEM_F_D2I_PKCS8PRIVATEKEY_FP 121 #define PEM_F_D2I_PKCS8PRIVATEKEY_FP 121
#define PEM_F_DO_PK8PKEY 126 #define PEM_F_DO_PK8PKEY 126
#define PEM_F_DO_PK8PKEY_FP 125 #define PEM_F_DO_PK8PKEY_FP 125
#define PEM_F_LOAD_IV 101 #define PEM_F_LOAD_IV 101
#define PEM_F_PEM_ASN1_READ 102 #define PEM_F_PEM_ASN1_READ 102
#define PEM_F_PEM_ASN1_READ_BIO 103 #define PEM_F_PEM_ASN1_READ_BIO 103
#define PEM_F_PEM_ASN1_WRITE 104 #define PEM_F_PEM_ASN1_WRITE 104
#define PEM_F_PEM_ASN1_WRITE_BIO 105 #define PEM_F_PEM_ASN1_WRITE_BIO 105
#define PEM_F_PEM_DEF_CALLBACK 100 #define PEM_F_PEM_DEF_CALLBACK 100
#define PEM_F_PEM_DO_HEADER 106 #define PEM_F_PEM_DO_HEADER 106
#define PEM_F_PEM_F_PEM_WRITE_PKCS8PRIVATEKEY 118 #define PEM_F_PEM_F_PEM_WRITE_PKCS8PRIVATEKEY 118
#define PEM_F_PEM_GET_EVP_CIPHER_INFO 107 #define PEM_F_PEM_GET_EVP_CIPHER_INFO 107
#define PEM_F_PEM_PK8PKEY 119 #define PEM_F_PEM_PK8PKEY 119
#define PEM_F_PEM_READ 108 #define PEM_F_PEM_READ 108
#define PEM_F_PEM_READ_BIO 109 #define PEM_F_PEM_READ_BIO 109
#define PEM_F_PEM_READ_BIO_PRIVATEKEY 123 #define PEM_F_PEM_READ_BIO_PRIVATEKEY 123
#define PEM_F_PEM_READ_PRIVATEKEY 124 #define PEM_F_PEM_READ_PRIVATEKEY 124
#define PEM_F_PEM_SEALFINAL 110 #define PEM_F_PEM_SEALFINAL 110
#define PEM_F_PEM_SEALINIT 111 #define PEM_F_PEM_SEALINIT 111
#define PEM_F_PEM_SIGNFINAL 112 #define PEM_F_PEM_SIGNFINAL 112
#define PEM_F_PEM_WRITE 113 #define PEM_F_PEM_WRITE 113
#define PEM_F_PEM_WRITE_BIO 114 #define PEM_F_PEM_WRITE_BIO 114
#define PEM_F_PEM_X509_INFO_READ 115 #define PEM_F_PEM_X509_INFO_READ 115
#define PEM_F_PEM_X509_INFO_READ_BIO 116 #define PEM_F_PEM_X509_INFO_READ_BIO 116
#define PEM_F_PEM_X509_INFO_WRITE_BIO 117 #define PEM_F_PEM_X509_INFO_WRITE_BIO 117
/* Reason codes. */ /* Reason codes. */
#define PEM_R_BAD_BASE64_DECODE 100 #define PEM_R_BAD_BASE64_DECODE 100
#define PEM_R_BAD_DECRYPT 101 #define PEM_R_BAD_DECRYPT 101
#define PEM_R_BAD_END_LINE 102 #define PEM_R_BAD_END_LINE 102
#define PEM_R_BAD_IV_CHARS 103 #define PEM_R_BAD_IV_CHARS 103
#define PEM_R_BAD_PASSWORD_READ 104 #define PEM_R_BAD_PASSWORD_READ 104
#define PEM_R_ERROR_CONVERTING_PRIVATE_KEY 115 #define PEM_R_ERROR_CONVERTING_PRIVATE_KEY 115
#define PEM_R_NOT_DEK_INFO 105 #define PEM_R_NOT_DEK_INFO 105
#define PEM_R_NOT_ENCRYPTED 106 #define PEM_R_NOT_ENCRYPTED 106
#define PEM_R_NOT_PROC_TYPE 107 #define PEM_R_NOT_PROC_TYPE 107
#define PEM_R_NO_START_LINE 108 #define PEM_R_NO_START_LINE 108
#define PEM_R_PROBLEMS_GETTING_PASSWORD 109 #define PEM_R_PROBLEMS_GETTING_PASSWORD 109
#define PEM_R_PUBLIC_KEY_NO_RSA 110 #define PEM_R_PUBLIC_KEY_NO_RSA 110
#define PEM_R_READ_KEY 111 #define PEM_R_READ_KEY 111
#define PEM_R_SHORT_HEADER 112 #define PEM_R_SHORT_HEADER 112
#define PEM_R_UNSUPPORTED_CIPHER 113 #define PEM_R_UNSUPPORTED_CIPHER 113
#define PEM_R_UNSUPPORTED_ENCRYPTION 114 #define PEM_R_UNSUPPORTED_ENCRYPTION 114
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif #endif
dep/include/openssl/pkcs12.h
+105 -106
View File
@@ -1,5 +1,5 @@
/* pkcs12.h */ /* pkcs12.h */
/* Written by Dr Stephen N Henson (s[email protected]) for the OpenSSL /* Written by Dr Stephen N Henson (s[email protected]) for the OpenSSL
* project 1999. * project 1999.
*/ */
/* ==================================================================== /* ====================================================================
@@ -66,18 +66,18 @@
extern "C" { extern "C" {
#endif #endif
#define PKCS12_KEY_ID 1 #define PKCS12_KEY_ID 1
#define PKCS12_IV_ID 2 #define PKCS12_IV_ID 2
#define PKCS12_MAC_ID 3 #define PKCS12_MAC_ID 3
/* Default iteration count */ /* Default iteration count */
#ifndef PKCS12_DEFAULT_ITER #ifndef PKCS12_DEFAULT_ITER
#define PKCS12_DEFAULT_ITER PKCS5_DEFAULT_ITER #define PKCS12_DEFAULT_ITER PKCS5_DEFAULT_ITER
#endif #endif
#define PKCS12_MAC_KEY_LENGTH 20 #define PKCS12_MAC_KEY_LENGTH 20
#define PKCS12_SALT_LEN 8 #define PKCS12_SALT_LEN 8
/* Uncomment out next line for unicode password and names, otherwise ASCII */ /* Uncomment out next line for unicode password and names, otherwise ASCII */
@@ -93,13 +93,13 @@ extern "C" {
/* MS key usage constants */ /* MS key usage constants */
#define KEY_EX 0x10 #define KEY_EX 0x10
#define KEY_SIG 0x80 #define KEY_SIG 0x80
typedef struct { typedef struct {
X509_SIG *dinfo; X509_SIG *dinfo;
ASN1_OCTET_STRING *salt; ASN1_OCTET_STRING *salt;
ASN1_INTEGER *iter; /* defaults to 1 */ ASN1_INTEGER *iter; /* defaults to 1 */
} PKCS12_MAC_DATA; } PKCS12_MAC_DATA;
typedef struct { typedef struct {
@@ -113,11 +113,11 @@ PREDECLARE_STACK_OF(PKCS12_SAFEBAG)
typedef struct { typedef struct {
ASN1_OBJECT *type; ASN1_OBJECT *type;
union { union {
struct pkcs12_bag_st *bag; /* secret, crl and certbag */ struct pkcs12_bag_st *bag; /* secret, crl and certbag */
struct pkcs8_priv_key_info_st *keybag; /* keybag */ struct pkcs8_priv_key_info_st *keybag; /* keybag */
X509_SIG *shkeybag; /* shrouded key bag */ X509_SIG *shkeybag; /* shrouded key bag */
STACK_OF(PKCS12_SAFEBAG) *safes; STACK_OF(PKCS12_SAFEBAG) *safes;
ASN1_TYPE *other; ASN1_TYPE *other;
}value; }value;
STACK_OF(X509_ATTRIBUTE) *attrib; STACK_OF(X509_ATTRIBUTE) *attrib;
} PKCS12_SAFEBAG; } PKCS12_SAFEBAG;
@@ -129,16 +129,16 @@ DECLARE_PKCS12_STACK_OF(PKCS12_SAFEBAG)
typedef struct pkcs12_bag_st { typedef struct pkcs12_bag_st {
ASN1_OBJECT *type; ASN1_OBJECT *type;
union { union {
ASN1_OCTET_STRING *x509cert; ASN1_OCTET_STRING *x509cert;
ASN1_OCTET_STRING *x509crl; ASN1_OCTET_STRING *x509crl;
ASN1_OCTET_STRING *octet; ASN1_OCTET_STRING *octet;
ASN1_IA5STRING *sdsicert; ASN1_IA5STRING *sdsicert;
ASN1_TYPE *other; /* Secret or other bag */ ASN1_TYPE *other; /* Secret or other bag */
}value; }value;
} PKCS12_BAGS; } PKCS12_BAGS;
#define PKCS12_ERROR 0 #define PKCS12_ERROR 0
#define PKCS12_OK 1 #define PKCS12_OK 1
/* Compatibility macros */ /* Compatibility macros */
@@ -161,10 +161,10 @@ union {
#define M_PKCS12_crl_bag_type M_PKCS12_cert_bag_type #define M_PKCS12_crl_bag_type M_PKCS12_cert_bag_type
#define PKCS12_get_attr(bag, attr_nid) \ #define PKCS12_get_attr(bag, attr_nid) \
PKCS12_get_attr_gen(bag->attrib, attr_nid) PKCS12_get_attr_gen(bag->attrib, attr_nid)
#define PKCS8_get_attr(p8, attr_nid) \ #define PKCS8_get_attr(p8, attr_nid) \
PKCS12_get_attr_gen(p8->attributes, attr_nid) PKCS12_get_attr_gen(p8->attributes, attr_nid)
#define PKCS12_mac_present(p12) ((p12)->mac ? 1 : 0) #define PKCS12_mac_present(p12) ((p12)->mac ? 1 : 0)
@@ -175,24 +175,24 @@ X509 *PKCS12_certbag2x509(PKCS12_SAFEBAG *bag);
X509_CRL *PKCS12_certbag2x509crl(PKCS12_SAFEBAG *bag); X509_CRL *PKCS12_certbag2x509crl(PKCS12_SAFEBAG *bag);
PKCS12_SAFEBAG *PKCS12_item_pack_safebag(void *obj, const ASN1_ITEM *it, int nid1, PKCS12_SAFEBAG *PKCS12_item_pack_safebag(void *obj, const ASN1_ITEM *it, int nid1,
int nid2); int nid2);
PKCS12_SAFEBAG *PKCS12_MAKE_KEYBAG(PKCS8_PRIV_KEY_INFO *p8); PKCS12_SAFEBAG *PKCS12_MAKE_KEYBAG(PKCS8_PRIV_KEY_INFO *p8);
PKCS8_PRIV_KEY_INFO *PKCS8_decrypt(X509_SIG *p8, const char *pass, int passlen); PKCS8_PRIV_KEY_INFO *PKCS8_decrypt(X509_SIG *p8, const char *pass, int passlen);
PKCS8_PRIV_KEY_INFO *PKCS12_decrypt_skey(PKCS12_SAFEBAG *bag, const char *pass, PKCS8_PRIV_KEY_INFO *PKCS12_decrypt_skey(PKCS12_SAFEBAG *bag, const char *pass,
int passlen); int passlen);
X509_SIG *PKCS8_encrypt(int pbe_nid, const EVP_CIPHER *cipher, X509_SIG *PKCS8_encrypt(int pbe_nid, const EVP_CIPHER *cipher,
const char *pass, int passlen, const char *pass, int passlen,
unsigned char *salt, int saltlen, int iter, unsigned char *salt, int saltlen, int iter,
PKCS8_PRIV_KEY_INFO *p8); PKCS8_PRIV_KEY_INFO *p8);
PKCS12_SAFEBAG *PKCS12_MAKE_SHKEYBAG(int pbe_nid, const char *pass, PKCS12_SAFEBAG *PKCS12_MAKE_SHKEYBAG(int pbe_nid, const char *pass,
int passlen, unsigned char *salt, int passlen, unsigned char *salt,
int saltlen, int iter, int saltlen, int iter,
PKCS8_PRIV_KEY_INFO *p8); PKCS8_PRIV_KEY_INFO *p8);
PKCS7 *PKCS12_pack_p7data(STACK_OF(PKCS12_SAFEBAG) *sk); PKCS7 *PKCS12_pack_p7data(STACK_OF(PKCS12_SAFEBAG) *sk);
STACK_OF(PKCS12_SAFEBAG) *PKCS12_unpack_p7data(PKCS7 *p7); STACK_OF(PKCS12_SAFEBAG) *PKCS12_unpack_p7data(PKCS7 *p7);
PKCS7 *PKCS12_pack_p7encdata(int pbe_nid, const char *pass, int passlen, PKCS7 *PKCS12_pack_p7encdata(int pbe_nid, const char *pass, int passlen,
unsigned char *salt, int saltlen, int iter, unsigned char *salt, int saltlen, int iter,
STACK_OF(PKCS12_SAFEBAG) *bags); STACK_OF(PKCS12_SAFEBAG) *bags);
STACK_OF(PKCS12_SAFEBAG) *PKCS12_unpack_p7encdata(PKCS7 *p7, const char *pass, int passlen); STACK_OF(PKCS12_SAFEBAG) *PKCS12_unpack_p7encdata(PKCS7 *p7, const char *pass, int passlen);
int PKCS12_pack_authsafes(PKCS12 *p12, STACK_OF(PKCS7) *safes); int PKCS12_pack_authsafes(PKCS12 *p12, STACK_OF(PKCS7) *safes);
@@ -200,38 +200,38 @@ STACK_OF(PKCS7) *PKCS12_unpack_authsafes(PKCS12 *p12);
int PKCS12_add_localkeyid(PKCS12_SAFEBAG *bag, unsigned char *name, int namelen); int PKCS12_add_localkeyid(PKCS12_SAFEBAG *bag, unsigned char *name, int namelen);
int PKCS12_add_friendlyname_asc(PKCS12_SAFEBAG *bag, const char *name, int PKCS12_add_friendlyname_asc(PKCS12_SAFEBAG *bag, const char *name,
int namelen); int namelen);
int PKCS12_add_CSPName_asc(PKCS12_SAFEBAG *bag, const char *name, int PKCS12_add_CSPName_asc(PKCS12_SAFEBAG *bag, const char *name,
int namelen); int namelen);
int PKCS12_add_friendlyname_uni(PKCS12_SAFEBAG *bag, const unsigned char *name, int PKCS12_add_friendlyname_uni(PKCS12_SAFEBAG *bag, const unsigned char *name,
int namelen); int namelen);
int PKCS8_add_keyusage(PKCS8_PRIV_KEY_INFO *p8, int usage); int PKCS8_add_keyusage(PKCS8_PRIV_KEY_INFO *p8, int usage);
ASN1_TYPE *PKCS12_get_attr_gen(STACK_OF(X509_ATTRIBUTE) *attrs, int attr_nid); ASN1_TYPE *PKCS12_get_attr_gen(STACK_OF(X509_ATTRIBUTE) *attrs, int attr_nid);
char *PKCS12_get_friendlyname(PKCS12_SAFEBAG *bag); char *PKCS12_get_friendlyname(PKCS12_SAFEBAG *bag);
unsigned char *PKCS12_pbe_crypt(X509_ALGOR *algor, const char *pass, unsigned char *PKCS12_pbe_crypt(X509_ALGOR *algor, const char *pass,
int passlen, unsigned char *in, int inlen, int passlen, unsigned char *in, int inlen,
unsigned char **data, int *datalen, int en_de); unsigned char **data, int *datalen, int en_de);
void * PKCS12_item_decrypt_d2i(X509_ALGOR *algor, const ASN1_ITEM *it, void * PKCS12_item_decrypt_d2i(X509_ALGOR *algor, const ASN1_ITEM *it,
const char *pass, int passlen, ASN1_OCTET_STRING *oct, int zbuf); const char *pass, int passlen, ASN1_OCTET_STRING *oct, int zbuf);
ASN1_OCTET_STRING *PKCS12_item_i2d_encrypt(X509_ALGOR *algor, const ASN1_ITEM *it, ASN1_OCTET_STRING *PKCS12_item_i2d_encrypt(X509_ALGOR *algor, const ASN1_ITEM *it,
const char *pass, int passlen, const char *pass, int passlen,
void *obj, int zbuf); void *obj, int zbuf);
PKCS12 *PKCS12_init(int mode); PKCS12 *PKCS12_init(int mode);
int PKCS12_key_gen_asc(const char *pass, int passlen, unsigned char *salt, int PKCS12_key_gen_asc(const char *pass, int passlen, unsigned char *salt,
int saltlen, int id, int iter, int n, int saltlen, int id, int iter, int n,
unsigned char *out, const EVP_MD *md_type); unsigned char *out, const EVP_MD *md_type);
int PKCS12_key_gen_uni(unsigned char *pass, int passlen, unsigned char *salt, int saltlen, int id, int iter, int n, unsigned char *out, const EVP_MD *md_type); int PKCS12_key_gen_uni(unsigned char *pass, int passlen, unsigned char *salt, int saltlen, int id, int iter, int n, unsigned char *out, const EVP_MD *md_type);
int PKCS12_PBE_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, int passlen, int PKCS12_PBE_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, int passlen,
ASN1_TYPE *param, const EVP_CIPHER *cipher, const EVP_MD *md_type, ASN1_TYPE *param, const EVP_CIPHER *cipher, const EVP_MD *md_type,
int en_de); int en_de);
int PKCS12_gen_mac(PKCS12 *p12, const char *pass, int passlen, int PKCS12_gen_mac(PKCS12 *p12, const char *pass, int passlen,
unsigned char *mac, unsigned int *maclen); unsigned char *mac, unsigned int *maclen);
int PKCS12_verify_mac(PKCS12 *p12, const char *pass, int passlen); int PKCS12_verify_mac(PKCS12 *p12, const char *pass, int passlen);
int PKCS12_set_mac(PKCS12 *p12, const char *pass, int passlen, int PKCS12_set_mac(PKCS12 *p12, const char *pass, int passlen,
unsigned char *salt, int saltlen, int iter, unsigned char *salt, int saltlen, int iter,
const EVP_MD *md_type); const EVP_MD *md_type);
int PKCS12_setup_mac(PKCS12 *p12, int iter, unsigned char *salt, int PKCS12_setup_mac(PKCS12 *p12, int iter, unsigned char *salt,
int saltlen, const EVP_MD *md_type); int saltlen, const EVP_MD *md_type);
unsigned char *asc2uni(const char *asc, int asclen, unsigned char **uni, int *unilen); unsigned char *asc2uni(const char *asc, int asclen, unsigned char **uni, int *unilen);
char *uni2asc(unsigned char *uni, int unilen); char *uni2asc(unsigned char *uni, int unilen);
@@ -245,17 +245,17 @@ DECLARE_ASN1_ITEM(PKCS12_AUTHSAFES)
void PKCS12_PBE_add(void); void PKCS12_PBE_add(void);
int PKCS12_parse(PKCS12 *p12, const char *pass, EVP_PKEY **pkey, X509 **cert, int PKCS12_parse(PKCS12 *p12, const char *pass, EVP_PKEY **pkey, X509 **cert,
STACK_OF(X509) **ca); STACK_OF(X509) **ca);
PKCS12 *PKCS12_create(char *pass, char *name, EVP_PKEY *pkey, X509 *cert, PKCS12 *PKCS12_create(char *pass, char *name, EVP_PKEY *pkey, X509 *cert,
STACK_OF(X509) *ca, int nid_key, int nid_cert, int iter, STACK_OF(X509) *ca, int nid_key, int nid_cert, int iter,
int mac_iter, int keytype); int mac_iter, int keytype);
PKCS12_SAFEBAG *PKCS12_add_cert(STACK_OF(PKCS12_SAFEBAG) **pbags, X509 *cert); PKCS12_SAFEBAG *PKCS12_add_cert(STACK_OF(PKCS12_SAFEBAG) **pbags, X509 *cert);
PKCS12_SAFEBAG *PKCS12_add_key(STACK_OF(PKCS12_SAFEBAG) **pbags, EVP_PKEY *key, PKCS12_SAFEBAG *PKCS12_add_key(STACK_OF(PKCS12_SAFEBAG) **pbags, EVP_PKEY *key,
int key_usage, int iter, int key_usage, int iter,
int key_nid, char *pass); int key_nid, char *pass);
int PKCS12_add_safe(STACK_OF(PKCS7) **psafes, STACK_OF(PKCS12_SAFEBAG) *bags, int PKCS12_add_safe(STACK_OF(PKCS7) **psafes, STACK_OF(PKCS12_SAFEBAG) *bags,
int safe_nid, int iter, char *pass); int safe_nid, int iter, char *pass);
PKCS12 *PKCS12_add_safes(STACK_OF(PKCS7) *safes, int p7_nid); PKCS12 *PKCS12_add_safes(STACK_OF(PKCS7) *safes, int p7_nid);
int i2d_PKCS12_bio(BIO *bp, PKCS12 *p12); int i2d_PKCS12_bio(BIO *bp, PKCS12 *p12);
@@ -273,62 +273,61 @@ void ERR_load_PKCS12_strings(void);
/* Error codes for the PKCS12 functions. */ /* Error codes for the PKCS12 functions. */
/* Function codes. */ /* Function codes. */
#define PKCS12_F_PARSE_BAG 129 #define PKCS12_F_PARSE_BAG 129
#define PKCS12_F_PARSE_BAGS 103 #define PKCS12_F_PARSE_BAGS 103
#define PKCS12_F_PKCS12_ADD_FRIENDLYNAME 100 #define PKCS12_F_PKCS12_ADD_FRIENDLYNAME 100
#define PKCS12_F_PKCS12_ADD_FRIENDLYNAME_ASC 127 #define PKCS12_F_PKCS12_ADD_FRIENDLYNAME_ASC 127
#define PKCS12_F_PKCS12_ADD_FRIENDLYNAME_UNI 102 #define PKCS12_F_PKCS12_ADD_FRIENDLYNAME_UNI 102
#define PKCS12_F_PKCS12_ADD_LOCALKEYID 104 #define PKCS12_F_PKCS12_ADD_LOCALKEYID 104
#define PKCS12_F_PKCS12_CREATE 105 #define PKCS12_F_PKCS12_CREATE 105
#define PKCS12_F_PKCS12_GEN_MAC 107 #define PKCS12_F_PKCS12_GEN_MAC 107
#define PKCS12_F_PKCS12_INIT 109 #define PKCS12_F_PKCS12_INIT 109
#define PKCS12_F_PKCS12_ITEM_DECRYPT_D2I 106 #define PKCS12_F_PKCS12_ITEM_DECRYPT_D2I 106
#define PKCS12_F_PKCS12_ITEM_I2D_ENCRYPT 108 #define PKCS12_F_PKCS12_ITEM_I2D_ENCRYPT 108
#define PKCS12_F_PKCS12_ITEM_PACK_SAFEBAG 117 #define PKCS12_F_PKCS12_ITEM_PACK_SAFEBAG 117
#define PKCS12_F_PKCS12_KEY_GEN_ASC 110 #define PKCS12_F_PKCS12_KEY_GEN_ASC 110
#define PKCS12_F_PKCS12_KEY_GEN_UNI 111 #define PKCS12_F_PKCS12_KEY_GEN_UNI 111
#define PKCS12_F_PKCS12_MAKE_KEYBAG 112 #define PKCS12_F_PKCS12_MAKE_KEYBAG 112
#define PKCS12_F_PKCS12_MAKE_SHKEYBAG 113 #define PKCS12_F_PKCS12_MAKE_SHKEYBAG 113
#define PKCS12_F_PKCS12_NEWPASS 128 #define PKCS12_F_PKCS12_NEWPASS 128
#define PKCS12_F_PKCS12_PACK_P7DATA 114 #define PKCS12_F_PKCS12_PACK_P7DATA 114
#define PKCS12_F_PKCS12_PACK_P7ENCDATA 115 #define PKCS12_F_PKCS12_PACK_P7ENCDATA 115
#define PKCS12_F_PKCS12_PARSE 118 #define PKCS12_F_PKCS12_PARSE 118
#define PKCS12_F_PKCS12_PBE_CRYPT 119 #define PKCS12_F_PKCS12_PBE_CRYPT 119
#define PKCS12_F_PKCS12_PBE_KEYIVGEN 120 #define PKCS12_F_PKCS12_PBE_KEYIVGEN 120
#define PKCS12_F_PKCS12_SETUP_MAC 122 #define PKCS12_F_PKCS12_SETUP_MAC 122
#define PKCS12_F_PKCS12_SET_MAC 123 #define PKCS12_F_PKCS12_SET_MAC 123
#define PKCS12_F_PKCS12_UNPACK_AUTHSAFES 130 #define PKCS12_F_PKCS12_UNPACK_AUTHSAFES 130
#define PKCS12_F_PKCS12_UNPACK_P7DATA 131 #define PKCS12_F_PKCS12_UNPACK_P7DATA 131
#define PKCS12_F_PKCS12_VERIFY_MAC 126 #define PKCS12_F_PKCS12_VERIFY_MAC 126
#define PKCS12_F_PKCS8_ADD_KEYUSAGE 124 #define PKCS12_F_PKCS8_ADD_KEYUSAGE 124
#define PKCS12_F_PKCS8_ENCRYPT 125 #define PKCS12_F_PKCS8_ENCRYPT 125
/* Reason codes. */ /* Reason codes. */
#define PKCS12_R_CANT_PACK_STRUCTURE 100 #define PKCS12_R_CANT_PACK_STRUCTURE 100
#define PKCS12_R_CONTENT_TYPE_NOT_DATA 121 #define PKCS12_R_CONTENT_TYPE_NOT_DATA 121
#define PKCS12_R_DECODE_ERROR 101 #define PKCS12_R_DECODE_ERROR 101
#define PKCS12_R_ENCODE_ERROR 102 #define PKCS12_R_ENCODE_ERROR 102
#define PKCS12_R_ENCRYPT_ERROR 103 #define PKCS12_R_ENCRYPT_ERROR 103
#define PKCS12_R_ERROR_SETTING_ENCRYPTED_DATA_TYPE 120 #define PKCS12_R_ERROR_SETTING_ENCRYPTED_DATA_TYPE 120
#define PKCS12_R_INVALID_NULL_ARGUMENT 104 #define PKCS12_R_INVALID_NULL_ARGUMENT 104
#define PKCS12_R_INVALID_NULL_PKCS12_POINTER 105 #define PKCS12_R_INVALID_NULL_PKCS12_POINTER 105
#define PKCS12_R_IV_GEN_ERROR 106 #define PKCS12_R_IV_GEN_ERROR 106
#define PKCS12_R_KEY_GEN_ERROR 107 #define PKCS12_R_KEY_GEN_ERROR 107
#define PKCS12_R_MAC_ABSENT 108 #define PKCS12_R_MAC_ABSENT 108
#define PKCS12_R_MAC_GENERATION_ERROR 109 #define PKCS12_R_MAC_GENERATION_ERROR 109
#define PKCS12_R_MAC_SETUP_ERROR 110 #define PKCS12_R_MAC_SETUP_ERROR 110
#define PKCS12_R_MAC_STRING_SET_ERROR 111 #define PKCS12_R_MAC_STRING_SET_ERROR 111
#define PKCS12_R_MAC_VERIFY_ERROR 112 #define PKCS12_R_MAC_VERIFY_ERROR 112
#define PKCS12_R_MAC_VERIFY_FAILURE 113 #define PKCS12_R_MAC_VERIFY_FAILURE 113
#define PKCS12_R_PARSE_ERROR 114 #define PKCS12_R_PARSE_ERROR 114
#define PKCS12_R_PKCS12_ALGOR_CIPHERINIT_ERROR 115 #define PKCS12_R_PKCS12_ALGOR_CIPHERINIT_ERROR 115
#define PKCS12_R_PKCS12_CIPHERFINAL_ERROR 116 #define PKCS12_R_PKCS12_CIPHERFINAL_ERROR 116
#define PKCS12_R_PKCS12_PBE_CRYPT_ERROR 117 #define PKCS12_R_PKCS12_PBE_CRYPT_ERROR 117
#define PKCS12_R_UNKNOWN_DIGEST_ALGORITHM 118 #define PKCS12_R_UNKNOWN_DIGEST_ALGORITHM 118
#define PKCS12_R_UNSUPPORTED_PKCS12_MODE 119 #define PKCS12_R_UNSUPPORTED_PKCS12_MODE 119
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif #endif
dep/include/openssl/pq_compat.h
+6 -2
View File
@@ -57,7 +57,10 @@
* *
*/ */
#include "opensslconf.h" #ifndef HEADER_PQ_COMPAT_H
#define HEADER_PQ_COMPAT_H
#include <openssl/opensslconf.h>
#include <openssl/bn.h> #include <openssl/bn.h>
/* /*
@@ -128,7 +131,7 @@
#define pq_64bit_assign(x, y) (*(x) = *(y)) #define pq_64bit_assign(x, y) (*(x) = *(y))
#define pq_64bit_assign_word(x, y) (*(x) = y) #define pq_64bit_assign_word(x, y) (*(x) = y)
#define pq_64bit_gt(x, y) (*(x) > *(y)) #define pq_64bit_gt(x, y) (*(x) > *(y))
#define pq_64bit_eq(x, y) (*(x) == *(y)) #define pq_64bit_eq(x, y) (*(x) == *(y))
#define pq_64bit_add_word(x, w) (*(x) = (*(x) + (w))) #define pq_64bit_add_word(x, w) (*(x) = (*(x) + (w)))
#define pq_64bit_sub(r, x, y) (*(r) = (*(x) - *(y))) #define pq_64bit_sub(r, x, y) (*(r) = (*(x) - *(y)))
@@ -146,3 +149,4 @@
} while(0) } while(0)
#endif /* OPENSSL_SYS_VMS */ #endif /* OPENSSL_SYS_VMS */
#endif
dep/include/openssl/rand.h
+39 -13
View File
@@ -72,21 +72,21 @@ extern "C" {
#endif #endif
#if defined(OPENSSL_FIPS) #if defined(OPENSSL_FIPS)
#define FIPS_RAND_SIZE_T size_t #define FIPS_RAND_SIZE_T int
#endif #endif
/* Already defined in ossl_typ.h */ /* Already defined in ossl_typ.h */
/* typedef struct rand_meth_st RAND_METHOD; */ /* typedef struct rand_meth_st RAND_METHOD; */
struct rand_meth_st struct rand_meth_st
{ {
void (*seed)(const void *buf, int num); void (*seed)(const void *buf, int num);
int (*bytes)(unsigned char *buf, int num); int (*bytes)(unsigned char *buf, int num);
void (*cleanup)(void); void (*cleanup)(void);
void (*add)(const void *buf, int num, double entropy); void (*add)(const void *buf, int num, double entropy);
int (*pseudorand)(unsigned char *buf, int num); int (*pseudorand)(unsigned char *buf, int num);
int (*status)(void); int (*status)(void);
}; };
#ifdef BN_DEBUG #ifdef BN_DEBUG
extern int rand_predictable; extern int rand_predictable;
@@ -111,6 +111,15 @@ int RAND_query_egd_bytes(const char *path, unsigned char *buf, int bytes);
int RAND_egd(const char *path); int RAND_egd(const char *path);
int RAND_egd_bytes(const char *path,int bytes); int RAND_egd_bytes(const char *path,int bytes);
int RAND_poll(void); int RAND_poll(void);
#ifndef OPENSSL_NO_ENGINE
#ifdef OPENSSL_FIPS
void int_RAND_init_engine_callbacks(void);
void int_RAND_set_callbacks(
int (*set_rand_func)(const RAND_METHOD *meth,
const RAND_METHOD **pmeth),
const RAND_METHOD *(*get_rand_func)(const RAND_METHOD **pmeth));
#endif
#endif
#if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_WIN32) #if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_WIN32)
@@ -128,14 +137,31 @@ void ERR_load_RAND_strings(void);
/* Error codes for the RAND functions. */ /* Error codes for the RAND functions. */
/* Function codes. */ /* Function codes. */
#define RAND_F_RAND_GET_RAND_METHOD 101 #define RAND_F_ENG_RAND_GET_RAND_METHOD 108
#define RAND_F_SSLEAY_RAND_BYTES 100 #define RAND_F_FIPS_RAND 103
#define RAND_F_FIPS_RAND_BYTES 102
#define RAND_F_FIPS_RAND_GET_RAND_METHOD 109
#define RAND_F_FIPS_RAND_SET_DT 106
#define RAND_F_FIPS_SET_DT 104
#define RAND_F_FIPS_SET_PRNG_SEED 107
#define RAND_F_FIPS_SET_TEST_MODE 105
#define RAND_F_RAND_GET_RAND_METHOD 101
#define RAND_F_SSLEAY_RAND_BYTES 100
/* Reason codes. */ /* Reason codes. */
#define RAND_R_PRNG_NOT_SEEDED 100 #define RAND_R_NON_FIPS_METHOD 105
#define RAND_R_NOT_IN_TEST_MODE 106
#define RAND_R_NO_KEY_SET 107
#define RAND_R_PRNG_ASKING_FOR_TOO_MUCH 101
#define RAND_R_PRNG_ERROR 108
#define RAND_R_PRNG_KEYED 109
#define RAND_R_PRNG_NOT_REKEYED 102
#define RAND_R_PRNG_NOT_RESEEDED 103
#define RAND_R_PRNG_NOT_SEEDED 100
#define RAND_R_PRNG_SEED_MUST_NOT_MATCH_KEY 110
#define RAND_R_PRNG_STUCK 104
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif #endif
dep/include/openssl/rc2.h
+16 -15
View File
@@ -64,39 +64,40 @@
#error RC2 is disabled. #error RC2 is disabled.
#endif #endif
#define RC2_ENCRYPT 1 #define RC2_ENCRYPT 1
#define RC2_DECRYPT 0 #define RC2_DECRYPT 0
#define RC2_BLOCK 8 #define RC2_BLOCK 8
#define RC2_KEY_LENGTH 16 #define RC2_KEY_LENGTH 16
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
typedef struct rc2_key_st typedef struct rc2_key_st
{ {
RC2_INT data[64]; RC2_INT data[64];
} RC2_KEY; } RC2_KEY;
#ifdef OPENSSL_FIPS
void private_RC2_set_key(RC2_KEY *key, int len, const unsigned char *data,int bits);
#endif
void RC2_set_key(RC2_KEY *key, int len, const unsigned char *data,int bits); void RC2_set_key(RC2_KEY *key, int len, const unsigned char *data,int bits);
void RC2_ecb_encrypt(const unsigned char *in,unsigned char *out,RC2_KEY *key, void RC2_ecb_encrypt(const unsigned char *in,unsigned char *out,RC2_KEY *key,
int enc); int enc);
void RC2_encrypt(unsigned long *data,RC2_KEY *key); void RC2_encrypt(unsigned long *data,RC2_KEY *key);
void RC2_decrypt(unsigned long *data,RC2_KEY *key); void RC2_decrypt(unsigned long *data,RC2_KEY *key);
void RC2_cbc_encrypt(const unsigned char *in, unsigned char *out, long length, void RC2_cbc_encrypt(const unsigned char *in, unsigned char *out, long length,
RC2_KEY *ks, unsigned char *iv, int enc); RC2_KEY *ks, unsigned char *iv, int enc);
void RC2_cfb64_encrypt(const unsigned char *in, unsigned char *out, void RC2_cfb64_encrypt(const unsigned char *in, unsigned char *out,
long length, RC2_KEY *schedule, unsigned char *ivec, long length, RC2_KEY *schedule, unsigned char *ivec,
int *num, int enc); int *num, int enc);
void RC2_ofb64_encrypt(const unsigned char *in, unsigned char *out, void RC2_ofb64_encrypt(const unsigned char *in, unsigned char *out,
long length, RC2_KEY *schedule, unsigned char *ivec, long length, RC2_KEY *schedule, unsigned char *ivec,
int *num); int *num);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif #endif
dep/include/openssl/rc4.h
+8 -6
View File
@@ -69,20 +69,22 @@ extern "C" {
#endif #endif
typedef struct rc4_key_st typedef struct rc4_key_st
{ {
RC4_INT x,y; RC4_INT x,y;
RC4_INT data[256]; RC4_INT data[256];
} RC4_KEY; } RC4_KEY;
const char *RC4_options(void); const char *RC4_options(void);
#ifdef OPENSSL_FIPS
void private_RC4_set_key(RC4_KEY *key, int len, const unsigned char *data);
#endif
void RC4_set_key(RC4_KEY *key, int len, const unsigned char *data); void RC4_set_key(RC4_KEY *key, int len, const unsigned char *data);
void RC4(RC4_KEY *key, unsigned long len, const unsigned char *indata, void RC4(RC4_KEY *key, unsigned long len, const unsigned char *indata,
unsigned char *outdata); unsigned char *outdata);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif #endif
dep/include/openssl/rc5.h
-118
View File
@@ -1,118 +0,0 @@
/* crypto/rc5/rc5.h */
/* Copyright (C) 1995-1998 Eric Young ([email protected])
* All rights reserved.
*
* This package is an SSL implementation written
* by Eric Young ([email protected]).
* The implementation was written so as to conform with Netscapes SSL.
*
* This library is free for commercial and non-commercial use as long as
* the following conditions are aheared to. The following conditions
* apply to all code found in this distribution, be it the RC4, RSA,
* lhash, DES, etc., code; not just the SSL code. The SSL documentation
* included with this distribution is covered by the same copyright terms
* except that the holder is Tim Hudson ([email protected]).
*
* Copyright remains Eric Young's, and as such any Copyright notices in
* the code are not to be removed.
* If this package is used in a product, Eric Young should be given attribution
* as the author of the parts of the library used.
* This can be in the form of a textual message at program startup or
* in documentation (online or textual) provided with the package.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* "This product includes cryptographic software written by
* Eric Young ([email protected])"
* The word 'cryptographic' can be left out if the rouines from the library
* being used are not cryptographic related :-).
* 4. If you include any Windows specific code (or a derivative thereof) from
* the apps directory (application code) you must include an acknowledgement:
* "This product includes software written by Tim Hudson ([email protected])"
*
* THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* The licence and distribution terms for any publically available version or
* derivative of this code cannot be changed. i.e. this code cannot simply be
* copied and put under another distribution licence
* [including the GNU Public Licence.]
*/
#ifndef HEADER_RC5_H
#define HEADER_RC5_H
#ifdef __cplusplus
extern "C" {
#endif
#ifdef OPENSSL_NO_RC5
#error RC5 is disabled.
#endif
#define RC5_ENCRYPT 1
#define RC5_DECRYPT 0
/* 32 bit. For Alpha, things may get weird */
#define RC5_32_INT unsigned long
#define RC5_32_BLOCK 8
#define RC5_32_KEY_LENGTH 16 /* This is a default, max is 255 */
/* This are the only values supported. Tweak the code if you want more
* The most supported modes will be
* RC5-32/12/16
* RC5-32/16/8
*/
#define RC5_8_ROUNDS 8
#define RC5_12_ROUNDS 12
#define RC5_16_ROUNDS 16
typedef struct rc5_key_st
{
/* Number of rounds */
int rounds;
RC5_32_INT data[2*(RC5_16_ROUNDS+1)];
} RC5_32_KEY;
void RC5_32_set_key(RC5_32_KEY *key, int len, const unsigned char *data,
int rounds);
void RC5_32_ecb_encrypt(const unsigned char *in,unsigned char *out,RC5_32_KEY *key,
int enc);
void RC5_32_encrypt(unsigned long *data,RC5_32_KEY *key);
void RC5_32_decrypt(unsigned long *data,RC5_32_KEY *key);
void RC5_32_cbc_encrypt(const unsigned char *in, unsigned char *out,
long length, RC5_32_KEY *ks, unsigned char *iv,
int enc);
void RC5_32_cfb64_encrypt(const unsigned char *in, unsigned char *out,
long length, RC5_32_KEY *schedule,
unsigned char *ivec, int *num, int enc);
void RC5_32_ofb64_encrypt(const unsigned char *in, unsigned char *out,
long length, RC5_32_KEY *schedule,
unsigned char *ivec, int *num);
#ifdef __cplusplus
}
#endif
#endif
dep/include/openssl/ripemd.h
+13 -12
View File
@@ -79,27 +79,28 @@ extern "C" {
#define RIPEMD160_LONG unsigned int #define RIPEMD160_LONG unsigned int
#endif #endif
#define RIPEMD160_CBLOCK 64 #define RIPEMD160_CBLOCK 64
#define RIPEMD160_LBLOCK (RIPEMD160_CBLOCK/4) #define RIPEMD160_LBLOCK (RIPEMD160_CBLOCK/4)
#define RIPEMD160_DIGEST_LENGTH 20 #define RIPEMD160_DIGEST_LENGTH 20
typedef struct RIPEMD160state_st typedef struct RIPEMD160state_st
{ {
RIPEMD160_LONG A,B,C,D,E; RIPEMD160_LONG A,B,C,D,E;
RIPEMD160_LONG Nl,Nh; RIPEMD160_LONG Nl,Nh;
RIPEMD160_LONG data[RIPEMD160_LBLOCK]; RIPEMD160_LONG data[RIPEMD160_LBLOCK];
unsigned int num; unsigned int num;
} RIPEMD160_CTX; } RIPEMD160_CTX;
#ifdef OPENSSL_FIPS
int private_RIPEMD160_Init(RIPEMD160_CTX *c);
#endif
int RIPEMD160_Init(RIPEMD160_CTX *c); int RIPEMD160_Init(RIPEMD160_CTX *c);
int RIPEMD160_Update(RIPEMD160_CTX *c, const void *data, size_t len); int RIPEMD160_Update(RIPEMD160_CTX *c, const void *data, size_t len);
int RIPEMD160_Final(unsigned char *md, RIPEMD160_CTX *c); int RIPEMD160_Final(unsigned char *md, RIPEMD160_CTX *c);
unsigned char *RIPEMD160(const unsigned char *d, size_t n, unsigned char *RIPEMD160(const unsigned char *d, size_t n,
unsigned char *md); unsigned char *md);
void RIPEMD160_Transform(RIPEMD160_CTX *c, const unsigned char *b); void RIPEMD160_Transform(RIPEMD160_CTX *c, const unsigned char *b);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif #endif
dep/include/openssl/rsa.h
+266 -212
View File
@@ -74,6 +74,25 @@
#error RSA is disabled. #error RSA is disabled.
#endif #endif
/* If this flag is set the RSA method is FIPS compliant and can be used
* in FIPS mode. This is set in the validated module method. If an
* application sets this flag in its own methods it is its reposibility
* to ensure the result is compliant.
*/
#define RSA_FLAG_FIPS_METHOD 0x0400
/* If this flag is set the operations normally disabled in FIPS mode are
* permitted it is then the applications responsibility to ensure that the
* usage is compliant.
*/
#define RSA_FLAG_NON_FIPS_ALLOW 0x0400
#ifdef OPENSSL_FIPS
#define FIPS_RSA_SIZE_T int
#endif
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
@@ -83,28 +102,28 @@ extern "C" {
/* typedef struct rsa_meth_st RSA_METHOD; */ /* typedef struct rsa_meth_st RSA_METHOD; */
struct rsa_meth_st struct rsa_meth_st
{ {
const char *name; const char *name;
int (*rsa_pub_enc)(int flen,const unsigned char *from, int (*rsa_pub_enc)(int flen,const unsigned char *from,
unsigned char *to, unsigned char *to,
RSA *rsa,int padding); RSA *rsa,int padding);
int (*rsa_pub_dec)(int flen,const unsigned char *from, int (*rsa_pub_dec)(int flen,const unsigned char *from,
unsigned char *to, unsigned char *to,
RSA *rsa,int padding); RSA *rsa,int padding);
int (*rsa_priv_enc)(int flen,const unsigned char *from, int (*rsa_priv_enc)(int flen,const unsigned char *from,
unsigned char *to, unsigned char *to,
RSA *rsa,int padding); RSA *rsa,int padding);
int (*rsa_priv_dec)(int flen,const unsigned char *from, int (*rsa_priv_dec)(int flen,const unsigned char *from,
unsigned char *to, unsigned char *to,
RSA *rsa,int padding); RSA *rsa,int padding);
int (*rsa_mod_exp)(BIGNUM *r0,const BIGNUM *I,RSA *rsa,BN_CTX *ctx); /* Can be null */ int (*rsa_mod_exp)(BIGNUM *r0,const BIGNUM *I,RSA *rsa,BN_CTX *ctx); /* Can be null */
int (*bn_mod_exp)(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, int (*bn_mod_exp)(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
const BIGNUM *m, BN_CTX *ctx, const BIGNUM *m, BN_CTX *ctx,
BN_MONT_CTX *m_ctx); /* Can be null */ BN_MONT_CTX *m_ctx); /* Can be null */
int (*init)(RSA *rsa); /* called at new */ int (*init)(RSA *rsa); /* called at new */
int (*finish)(RSA *rsa); /* called at free */ int (*finish)(RSA *rsa); /* called at free */
int flags; /* RSA_METHOD_FLAG_* things */ int flags; /* RSA_METHOD_FLAG_* things */
char *app_data; /* may be needed! */ char *app_data; /* may be needed! */
/* New sign and verify functions: some libraries don't allow arbitrary data /* New sign and verify functions: some libraries don't allow arbitrary data
* to be signed/verified: this allows them to be used. Note: for this to work * to be signed/verified: this allows them to be used. Note: for this to work
* the RSA_public_decrypt() and RSA_private_encrypt() should *NOT* be used * the RSA_public_decrypt() and RSA_private_encrypt() should *NOT* be used
@@ -112,136 +131,162 @@ struct rsa_meth_st
* compatibility this functionality is only enabled if the RSA_FLAG_SIGN_VER * compatibility this functionality is only enabled if the RSA_FLAG_SIGN_VER
* option is set in 'flags'. * option is set in 'flags'.
*/ */
int (*rsa_sign)(int type, int (*rsa_sign)(int type,
const unsigned char *m, unsigned int m_length, const unsigned char *m, unsigned int m_length,
unsigned char *sigret, unsigned int *siglen, const RSA *rsa); unsigned char *sigret, unsigned int *siglen, const RSA *rsa);
int (*rsa_verify)(int dtype, int (*rsa_verify)(int dtype,
const unsigned char *m, unsigned int m_length, const unsigned char *m, unsigned int m_length,
unsigned char *sigbuf, unsigned int siglen, const RSA *rsa); unsigned char *sigbuf, unsigned int siglen, const RSA *rsa);
/* If this callback is NULL, the builtin software RSA key-gen will be used. This /* If this callback is NULL, the builtin software RSA key-gen will be used. This
* is for behavioural compatibility whilst the code gets rewired, but one day * is for behavioural compatibility whilst the code gets rewired, but one day
* it would be nice to assume there are no such things as "builtin software" * it would be nice to assume there are no such things as "builtin software"
* implementations. */ * implementations. */
int (*rsa_keygen)(RSA *rsa, int bits, BIGNUM *e, BN_GENCB *cb); int (*rsa_keygen)(RSA *rsa, int bits, BIGNUM *e, BN_GENCB *cb);
}; };
struct rsa_st struct rsa_st
{ {
/* The first parameter is used to pickup errors where /* The first parameter is used to pickup errors where
* this is passed instead of aEVP_PKEY, it is set to 0 */ * this is passed instead of aEVP_PKEY, it is set to 0 */
int pad; int pad;
long version; long version;
const RSA_METHOD *meth; const RSA_METHOD *meth;
/* functional reference if 'meth' is ENGINE-provided */ /* functional reference if 'meth' is ENGINE-provided */
ENGINE *engine; ENGINE *engine;
BIGNUM *n; BIGNUM *n;
BIGNUM *e; BIGNUM *e;
BIGNUM *d; BIGNUM *d;
BIGNUM *p; BIGNUM *p;
BIGNUM *q; BIGNUM *q;
BIGNUM *dmp1; BIGNUM *dmp1;
BIGNUM *dmq1; BIGNUM *dmq1;
BIGNUM *iqmp; BIGNUM *iqmp;
/* be careful using this if the RSA structure is shared */ /* be careful using this if the RSA structure is shared */
CRYPTO_EX_DATA ex_data; CRYPTO_EX_DATA ex_data;
int references; int references;
int flags; int flags;
/* Used to cache montgomery values */ /* Used to cache montgomery values */
BN_MONT_CTX *_method_mod_n; BN_MONT_CTX *_method_mod_n;
BN_MONT_CTX *_method_mod_p; BN_MONT_CTX *_method_mod_p;
BN_MONT_CTX *_method_mod_q; BN_MONT_CTX *_method_mod_q;
/* all BIGNUM values are actually in the following data, if it is not /* all BIGNUM values are actually in the following data, if it is not
* NULL */ * NULL */
char *bignum_data; char *bignum_data;
BN_BLINDING *blinding; BN_BLINDING *blinding;
BN_BLINDING *mt_blinding; BN_BLINDING *mt_blinding;
}; };
#ifndef OPENSSL_RSA_MAX_MODULUS_BITS #ifndef OPENSSL_RSA_MAX_MODULUS_BITS
# define OPENSSL_RSA_MAX_MODULUS_BITS 16384 # define OPENSSL_RSA_MAX_MODULUS_BITS 16384
#endif #endif
#define OPENSSL_RSA_FIPS_MIN_MODULUS_BITS 1024
#ifndef OPENSSL_RSA_SMALL_MODULUS_BITS #ifndef OPENSSL_RSA_SMALL_MODULUS_BITS
# define OPENSSL_RSA_SMALL_MODULUS_BITS 3072 # define OPENSSL_RSA_SMALL_MODULUS_BITS 3072
#endif #endif
#ifndef OPENSSL_RSA_MAX_PUBEXP_BITS #ifndef OPENSSL_RSA_MAX_PUBEXP_BITS
# define OPENSSL_RSA_MAX_PUBEXP_BITS 64 /* exponent limit enforced for "large" modulus only */ # define OPENSSL_RSA_MAX_PUBEXP_BITS 64 /* exponent limit enforced for "large" modulus only */
#endif #endif
#define RSA_3 0x3L #define RSA_3 0x3L
#define RSA_F4 0x10001L #define RSA_F4 0x10001L
#define RSA_METHOD_FLAG_NO_CHECK 0x0001 /* don't check pub/private match */ #define RSA_METHOD_FLAG_NO_CHECK 0x0001 /* don't check pub/private match */
#define RSA_FLAG_CACHE_PUBLIC 0x0002 #define RSA_FLAG_CACHE_PUBLIC 0x0002
#define RSA_FLAG_CACHE_PRIVATE 0x0004 #define RSA_FLAG_CACHE_PRIVATE 0x0004
#define RSA_FLAG_BLINDING 0x0008 #define RSA_FLAG_BLINDING 0x0008
#define RSA_FLAG_THREAD_SAFE 0x0010 #define RSA_FLAG_THREAD_SAFE 0x0010
/* This flag means the private key operations will be handled by rsa_mod_exp /* This flag means the private key operations will be handled by rsa_mod_exp
* and that they do not depend on the private key components being present: * and that they do not depend on the private key components being present:
* for example a key stored in external hardware. Without this flag bn_mod_exp * for example a key stored in external hardware. Without this flag bn_mod_exp
* gets called when private key components are absent. * gets called when private key components are absent.
*/ */
#define RSA_FLAG_EXT_PKEY 0x0020 #define RSA_FLAG_EXT_PKEY 0x0020
/* This flag in the RSA_METHOD enables the new rsa_sign, rsa_verify functions. /* This flag in the RSA_METHOD enables the new rsa_sign, rsa_verify functions.
*/ */
#define RSA_FLAG_SIGN_VER 0x0040 #define RSA_FLAG_SIGN_VER 0x0040
#define RSA_FLAG_NO_BLINDING 0x0080 /* new with 0.9.6j and 0.9.7b; the built-in #define RSA_FLAG_NO_BLINDING 0x0080 /* new with 0.9.6j and 0.9.7b; the built-in
* RSA implementation now uses blinding by * RSA implementation now uses blinding by
* default (ignoring RSA_FLAG_BLINDING), * default (ignoring RSA_FLAG_BLINDING),
* but other engines might not need it * but other engines might not need it
*/ */
#define RSA_FLAG_NO_EXP_CONSTTIME 0x0100 /* new with 0.9.7h; the built-in RSA #define RSA_FLAG_NO_CONSTTIME 0x0100 /* new with 0.9.8f; the built-in RSA
* implementation now uses constant time
* operations by default in private key operations,
* e.g., constant time modular exponentiation,
* modular inverse without leaking branches,
* division without leaking branches. This
* flag disables these constant time
* operations and results in faster RSA
* private key operations.
*/
#ifndef OPENSSL_NO_DEPRECATED
#define RSA_FLAG_NO_EXP_CONSTTIME RSA_FLAG_NO_CONSTTIME /* deprecated name for the flag*/
/* new with 0.9.7h; the built-in RSA
* implementation now uses constant time * implementation now uses constant time
* modular exponentiation for secret exponents * modular exponentiation for secret exponents
* by default. This flag causes the * by default. This flag causes the
* faster variable sliding window method to * faster variable sliding window method to
* be used for all exponents. * be used for all exponents.
*/ */
#endif
#define RSA_PKCS1_PADDING 1
#define RSA_SSLV23_PADDING 2
#define RSA_NO_PADDING 3
#define RSA_PKCS1_OAEP_PADDING 4
#define RSA_X931_PADDING 5
#define RSA_PKCS1_PADDING_SIZE 11 #define RSA_PKCS1_PADDING 1
#define RSA_SSLV23_PADDING 2
#define RSA_NO_PADDING 3
#define RSA_PKCS1_OAEP_PADDING 4
#define RSA_X931_PADDING 5
#define RSA_PKCS1_PADDING_SIZE 11
#define RSA_set_app_data(s,arg) RSA_set_ex_data(s,0,arg) #define RSA_set_app_data(s,arg) RSA_set_ex_data(s,0,arg)
#define RSA_get_app_data(s) RSA_get_ex_data(s,0) #define RSA_get_app_data(s) RSA_get_ex_data(s,0)
RSA * RSA_new(void); RSA * RSA_new(void);
RSA * RSA_new_method(ENGINE *engine); RSA * RSA_new_method(ENGINE *engine);
int RSA_size(const RSA *); int RSA_size(const RSA *);
/* Deprecated version */ /* Deprecated version */
#ifndef OPENSSL_NO_DEPRECATED #ifndef OPENSSL_NO_DEPRECATED
RSA * RSA_generate_key(int bits, unsigned long e,void RSA * RSA_generate_key(int bits, unsigned long e,void
(*callback)(int,int,void *),void *cb_arg); (*callback)(int,int,void *),void *cb_arg);
#endif /* !defined(OPENSSL_NO_DEPRECATED) */ #endif /* !defined(OPENSSL_NO_DEPRECATED) */
/* New version */ /* New version */
int RSA_generate_key_ex(RSA *rsa, int bits, BIGNUM *e, BN_GENCB *cb); int RSA_generate_key_ex(RSA *rsa, int bits, BIGNUM *e, BN_GENCB *cb);
int RSA_X931_derive_ex(RSA *rsa, BIGNUM *p1, BIGNUM *p2, BIGNUM *q1, BIGNUM *q2,
const BIGNUM *Xp1, const BIGNUM *Xp2, const BIGNUM *Xp,
const BIGNUM *Xq1, const BIGNUM *Xq2, const BIGNUM *Xq,
const BIGNUM *e, BN_GENCB *cb);
int RSA_X931_generate_key_ex(RSA *rsa, int bits, const BIGNUM *e, BN_GENCB *cb);
int RSA_check_key(const RSA *); int RSA_check_key(const RSA *);
/* next 4 return -1 on error */ /* next 4 return -1 on error */
int RSA_public_encrypt(int flen, const unsigned char *from, int RSA_public_encrypt(int flen, const unsigned char *from,
unsigned char *to, RSA *rsa,int padding); unsigned char *to, RSA *rsa,int padding);
int RSA_private_encrypt(int flen, const unsigned char *from, int RSA_private_encrypt(int flen, const unsigned char *from,
unsigned char *to, RSA *rsa,int padding); unsigned char *to, RSA *rsa,int padding);
int RSA_public_decrypt(int flen, const unsigned char *from, int RSA_public_decrypt(int flen, const unsigned char *from,
unsigned char *to, RSA *rsa,int padding); unsigned char *to, RSA *rsa,int padding);
int RSA_private_decrypt(int flen, const unsigned char *from, int RSA_private_decrypt(int flen, const unsigned char *from,
unsigned char *to, RSA *rsa,int padding); unsigned char *to, RSA *rsa,int padding);
void RSA_free (RSA *r); void RSA_free (RSA *r);
/* "up" the RSA object's reference count */ /* "up" the RSA object's reference count */
int RSA_up_ref(RSA *r); int RSA_up_ref(RSA *r);
int RSA_flags(const RSA *r); int RSA_flags(const RSA *r);
#ifdef OPENSSL_FIPS
RSA *FIPS_rsa_new(void);
void FIPS_rsa_free(RSA *r);
#endif
void RSA_set_default_method(const RSA_METHOD *meth); void RSA_set_default_method(const RSA_METHOD *meth);
const RSA_METHOD *RSA_get_default_method(void); const RSA_METHOD *RSA_get_default_method(void);
@@ -260,85 +305,87 @@ DECLARE_ASN1_ENCODE_FUNCTIONS_const(RSA, RSAPublicKey)
DECLARE_ASN1_ENCODE_FUNCTIONS_const(RSA, RSAPrivateKey) DECLARE_ASN1_ENCODE_FUNCTIONS_const(RSA, RSAPrivateKey)
#ifndef OPENSSL_NO_FP_API #ifndef OPENSSL_NO_FP_API
int RSA_print_fp(FILE *fp, const RSA *r,int offset); int RSA_print_fp(FILE *fp, const RSA *r,int offset);
#endif #endif
#ifndef OPENSSL_NO_BIO #ifndef OPENSSL_NO_BIO
int RSA_print(BIO *bp, const RSA *r,int offset); int RSA_print(BIO *bp, const RSA *r,int offset);
#endif #endif
#ifndef OPENSSL_NO_RC4
int i2d_RSA_NET(const RSA *a, unsigned char **pp, int i2d_RSA_NET(const RSA *a, unsigned char **pp,
int (*cb)(char *buf, int len, const char *prompt, int verify), int (*cb)(char *buf, int len, const char *prompt, int verify),
int sgckey); int sgckey);
RSA *d2i_RSA_NET(RSA **a, const unsigned char **pp, long length, RSA *d2i_RSA_NET(RSA **a, const unsigned char **pp, long length,
int (*cb)(char *buf, int len, const char *prompt, int verify), int (*cb)(char *buf, int len, const char *prompt, int verify),
int sgckey); int sgckey);
int i2d_Netscape_RSA(const RSA *a, unsigned char **pp, int i2d_Netscape_RSA(const RSA *a, unsigned char **pp,
int (*cb)(char *buf, int len, const char *prompt, int (*cb)(char *buf, int len, const char *prompt,
int verify)); int verify));
RSA *d2i_Netscape_RSA(RSA **a, const unsigned char **pp, long length, RSA *d2i_Netscape_RSA(RSA **a, const unsigned char **pp, long length,
int (*cb)(char *buf, int len, const char *prompt, int (*cb)(char *buf, int len, const char *prompt,
int verify)); int verify));
#endif
/* The following 2 functions sign and verify a X509_SIG ASN1 object /* The following 2 functions sign and verify a X509_SIG ASN1 object
* inside PKCS#1 padded RSA encryption */ * inside PKCS#1 padded RSA encryption */
int RSA_sign(int type, const unsigned char *m, unsigned int m_length, int RSA_sign(int type, const unsigned char *m, unsigned int m_length,
unsigned char *sigret, unsigned int *siglen, RSA *rsa); unsigned char *sigret, unsigned int *siglen, RSA *rsa);
int RSA_verify(int type, const unsigned char *m, unsigned int m_length, int RSA_verify(int type, const unsigned char *m, unsigned int m_length,
unsigned char *sigbuf, unsigned int siglen, RSA *rsa); unsigned char *sigbuf, unsigned int siglen, RSA *rsa);
/* The following 2 function sign and verify a ASN1_OCTET_STRING /* The following 2 function sign and verify a ASN1_OCTET_STRING
* object inside PKCS#1 padded RSA encryption */ * object inside PKCS#1 padded RSA encryption */
int RSA_sign_ASN1_OCTET_STRING(int type, int RSA_sign_ASN1_OCTET_STRING(int type,
const unsigned char *m, unsigned int m_length, const unsigned char *m, unsigned int m_length,
unsigned char *sigret, unsigned int *siglen, RSA *rsa); unsigned char *sigret, unsigned int *siglen, RSA *rsa);
int RSA_verify_ASN1_OCTET_STRING(int type, int RSA_verify_ASN1_OCTET_STRING(int type,
const unsigned char *m, unsigned int m_length, const unsigned char *m, unsigned int m_length,
unsigned char *sigbuf, unsigned int siglen, RSA *rsa); unsigned char *sigbuf, unsigned int siglen, RSA *rsa);
int RSA_blinding_on(RSA *rsa, BN_CTX *ctx); int RSA_blinding_on(RSA *rsa, BN_CTX *ctx);
void RSA_blinding_off(RSA *rsa); void RSA_blinding_off(RSA *rsa);
BN_BLINDING *RSA_setup_blinding(RSA *rsa, BN_CTX *ctx); BN_BLINDING *RSA_setup_blinding(RSA *rsa, BN_CTX *ctx);
int RSA_padding_add_PKCS1_type_1(unsigned char *to,int tlen, int RSA_padding_add_PKCS1_type_1(unsigned char *to,int tlen,
const unsigned char *f,int fl); const unsigned char *f,int fl);
int RSA_padding_check_PKCS1_type_1(unsigned char *to,int tlen, int RSA_padding_check_PKCS1_type_1(unsigned char *to,int tlen,
const unsigned char *f,int fl,int rsa_len); const unsigned char *f,int fl,int rsa_len);
int RSA_padding_add_PKCS1_type_2(unsigned char *to,int tlen, int RSA_padding_add_PKCS1_type_2(unsigned char *to,int tlen,
const unsigned char *f,int fl); const unsigned char *f,int fl);
int RSA_padding_check_PKCS1_type_2(unsigned char *to,int tlen, int RSA_padding_check_PKCS1_type_2(unsigned char *to,int tlen,
const unsigned char *f,int fl,int rsa_len); const unsigned char *f,int fl,int rsa_len);
int PKCS1_MGF1(unsigned char *mask, long len, int PKCS1_MGF1(unsigned char *mask, long len,
const unsigned char *seed, long seedlen, const EVP_MD *dgst); const unsigned char *seed, long seedlen, const EVP_MD *dgst);
int RSA_padding_add_PKCS1_OAEP(unsigned char *to,int tlen, int RSA_padding_add_PKCS1_OAEP(unsigned char *to,int tlen,
const unsigned char *f,int fl, const unsigned char *f,int fl,
const unsigned char *p,int pl); const unsigned char *p,int pl);
int RSA_padding_check_PKCS1_OAEP(unsigned char *to,int tlen, int RSA_padding_check_PKCS1_OAEP(unsigned char *to,int tlen,
const unsigned char *f,int fl,int rsa_len, const unsigned char *f,int fl,int rsa_len,
const unsigned char *p,int pl); const unsigned char *p,int pl);
int RSA_padding_add_SSLv23(unsigned char *to,int tlen, int RSA_padding_add_SSLv23(unsigned char *to,int tlen,
const unsigned char *f,int fl); const unsigned char *f,int fl);
int RSA_padding_check_SSLv23(unsigned char *to,int tlen, int RSA_padding_check_SSLv23(unsigned char *to,int tlen,
const unsigned char *f,int fl,int rsa_len); const unsigned char *f,int fl,int rsa_len);
int RSA_padding_add_none(unsigned char *to,int tlen, int RSA_padding_add_none(unsigned char *to,int tlen,
const unsigned char *f,int fl); const unsigned char *f,int fl);
int RSA_padding_check_none(unsigned char *to,int tlen, int RSA_padding_check_none(unsigned char *to,int tlen,
const unsigned char *f,int fl,int rsa_len); const unsigned char *f,int fl,int rsa_len);
int RSA_padding_add_X931(unsigned char *to,int tlen, int RSA_padding_add_X931(unsigned char *to,int tlen,
const unsigned char *f,int fl); const unsigned char *f,int fl);
int RSA_padding_check_X931(unsigned char *to,int tlen, int RSA_padding_check_X931(unsigned char *to,int tlen,
const unsigned char *f,int fl,int rsa_len); const unsigned char *f,int fl,int rsa_len);
int RSA_X931_hash_id(int nid); int RSA_X931_hash_id(int nid);
int RSA_verify_PKCS1_PSS(RSA *rsa, const unsigned char *mHash, int RSA_verify_PKCS1_PSS(RSA *rsa, const unsigned char *mHash,
const EVP_MD *Hash, const unsigned char *EM, int sLen); const EVP_MD *Hash, const unsigned char *EM, int sLen);
int RSA_padding_add_PKCS1_PSS(RSA *rsa, unsigned char *EM, int RSA_padding_add_PKCS1_PSS(RSA *rsa, unsigned char *EM,
const unsigned char *mHash, const unsigned char *mHash,
const EVP_MD *Hash, int sLen); const EVP_MD *Hash, int sLen);
int RSA_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func, int RSA_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func,
CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func); CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func);
int RSA_set_ex_data(RSA *r,int idx,void *arg); int RSA_set_ex_data(RSA *r,int idx,void *arg);
void *RSA_get_ex_data(const RSA *r, int idx); void *RSA_get_ex_data(const RSA *r, int idx);
@@ -354,89 +401,96 @@ void ERR_load_RSA_strings(void);
/* Error codes for the RSA functions. */ /* Error codes for the RSA functions. */
/* Function codes. */ /* Function codes. */
#define RSA_F_MEMORY_LOCK 100 #define RSA_F_FIPS_RSA_SIGN 140
#define RSA_F_RSA_BUILTIN_KEYGEN 129 #define RSA_F_FIPS_RSA_VERIFY 141
#define RSA_F_RSA_CHECK_KEY 123 #define RSA_F_MEMORY_LOCK 100
#define RSA_F_RSA_EAY_PRIVATE_DECRYPT 101 #define RSA_F_RSA_BUILTIN_KEYGEN 129
#define RSA_F_RSA_EAY_PRIVATE_ENCRYPT 102 #define RSA_F_RSA_CHECK_KEY 123
#define RSA_F_RSA_EAY_PUBLIC_DECRYPT 103 #define RSA_F_RSA_EAY_PRIVATE_DECRYPT 101
#define RSA_F_RSA_EAY_PUBLIC_ENCRYPT 104 #define RSA_F_RSA_EAY_PRIVATE_ENCRYPT 102
#define RSA_F_RSA_GENERATE_KEY 105 #define RSA_F_RSA_EAY_PUBLIC_DECRYPT 103
#define RSA_F_RSA_MEMORY_LOCK 130 #define RSA_F_RSA_EAY_PUBLIC_ENCRYPT 104
#define RSA_F_RSA_NEW_METHOD 106 #define RSA_F_RSA_GENERATE_KEY 105
#define RSA_F_RSA_NULL 124 #define RSA_F_RSA_MEMORY_LOCK 130
#define RSA_F_RSA_NULL_MOD_EXP 131 #define RSA_F_RSA_NEW_METHOD 106
#define RSA_F_RSA_NULL_PRIVATE_DECRYPT 132 #define RSA_F_RSA_NULL 124
#define RSA_F_RSA_NULL_PRIVATE_ENCRYPT 133 #define RSA_F_RSA_NULL_MOD_EXP 131
#define RSA_F_RSA_NULL_PUBLIC_DECRYPT 134 #define RSA_F_RSA_NULL_PRIVATE_DECRYPT 132
#define RSA_F_RSA_NULL_PUBLIC_ENCRYPT 135 #define RSA_F_RSA_NULL_PRIVATE_ENCRYPT 133
#define RSA_F_RSA_PADDING_ADD_NONE 107 #define RSA_F_RSA_NULL_PUBLIC_DECRYPT 134
#define RSA_F_RSA_PADDING_ADD_PKCS1_OAEP 121 #define RSA_F_RSA_NULL_PUBLIC_ENCRYPT 135
#define RSA_F_RSA_PADDING_ADD_PKCS1_PSS 125 #define RSA_F_RSA_PADDING_ADD_NONE 107
#define RSA_F_RSA_PADDING_ADD_PKCS1_TYPE_1 108 #define RSA_F_RSA_PADDING_ADD_PKCS1_OAEP 121
#define RSA_F_RSA_PADDING_ADD_PKCS1_TYPE_2 109 #define RSA_F_RSA_PADDING_ADD_PKCS1_PSS 125
#define RSA_F_RSA_PADDING_ADD_SSLV23 110 #define RSA_F_RSA_PADDING_ADD_PKCS1_TYPE_1 108
#define RSA_F_RSA_PADDING_ADD_X931 127 #define RSA_F_RSA_PADDING_ADD_PKCS1_TYPE_2 109
#define RSA_F_RSA_PADDING_CHECK_NONE 111 #define RSA_F_RSA_PADDING_ADD_SSLV23 110
#define RSA_F_RSA_PADDING_CHECK_PKCS1_OAEP 122 #define RSA_F_RSA_PADDING_ADD_X931 127
#define RSA_F_RSA_PADDING_CHECK_PKCS1_TYPE_1 112 #define RSA_F_RSA_PADDING_CHECK_NONE 111
#define RSA_F_RSA_PADDING_CHECK_PKCS1_TYPE_2 113 #define RSA_F_RSA_PADDING_CHECK_PKCS1_OAEP 122
#define RSA_F_RSA_PADDING_CHECK_SSLV23 114 #define RSA_F_RSA_PADDING_CHECK_PKCS1_TYPE_1 112
#define RSA_F_RSA_PADDING_CHECK_X931 128 #define RSA_F_RSA_PADDING_CHECK_PKCS1_TYPE_2 113
#define RSA_F_RSA_PRINT 115 #define RSA_F_RSA_PADDING_CHECK_SSLV23 114
#define RSA_F_RSA_PRINT_FP 116 #define RSA_F_RSA_PADDING_CHECK_X931 128
#define RSA_F_RSA_SETUP_BLINDING 136 #define RSA_F_RSA_PRINT 115
#define RSA_F_RSA_SIGN 117 #define RSA_F_RSA_PRINT_FP 116
#define RSA_F_RSA_SIGN_ASN1_OCTET_STRING 118 #define RSA_F_RSA_PRIVATE_ENCRYPT 137
#define RSA_F_RSA_VERIFY 119 #define RSA_F_RSA_PUBLIC_DECRYPT 138
#define RSA_F_RSA_VERIFY_ASN1_OCTET_STRING 120 #define RSA_F_RSA_SETUP_BLINDING 136
#define RSA_F_RSA_VERIFY_PKCS1_PSS 126 #define RSA_F_RSA_SET_DEFAULT_METHOD 139
#define RSA_F_RSA_SET_METHOD 142
#define RSA_F_RSA_SIGN 117
#define RSA_F_RSA_SIGN_ASN1_OCTET_STRING 118
#define RSA_F_RSA_VERIFY 119
#define RSA_F_RSA_VERIFY_ASN1_OCTET_STRING 120
#define RSA_F_RSA_VERIFY_PKCS1_PSS 126
/* Reason codes. */ /* Reason codes. */
#define RSA_R_ALGORITHM_MISMATCH 100 #define RSA_R_ALGORITHM_MISMATCH 100
#define RSA_R_BAD_E_VALUE 101 #define RSA_R_BAD_E_VALUE 101
#define RSA_R_BAD_FIXED_HEADER_DECRYPT 102 #define RSA_R_BAD_FIXED_HEADER_DECRYPT 102
#define RSA_R_BAD_PAD_BYTE_COUNT 103 #define RSA_R_BAD_PAD_BYTE_COUNT 103
#define RSA_R_BAD_SIGNATURE 104 #define RSA_R_BAD_SIGNATURE 104
#define RSA_R_BLOCK_TYPE_IS_NOT_01 106 #define RSA_R_BLOCK_TYPE_IS_NOT_01 106
#define RSA_R_BLOCK_TYPE_IS_NOT_02 107 #define RSA_R_BLOCK_TYPE_IS_NOT_02 107
#define RSA_R_DATA_GREATER_THAN_MOD_LEN 108 #define RSA_R_DATA_GREATER_THAN_MOD_LEN 108
#define RSA_R_DATA_TOO_LARGE 109 #define RSA_R_DATA_TOO_LARGE 109
#define RSA_R_DATA_TOO_LARGE_FOR_KEY_SIZE 110 #define RSA_R_DATA_TOO_LARGE_FOR_KEY_SIZE 110
#define RSA_R_DATA_TOO_LARGE_FOR_MODULUS 132 #define RSA_R_DATA_TOO_LARGE_FOR_MODULUS 132
#define RSA_R_DATA_TOO_SMALL 111 #define RSA_R_DATA_TOO_SMALL 111
#define RSA_R_DATA_TOO_SMALL_FOR_KEY_SIZE 122 #define RSA_R_DATA_TOO_SMALL_FOR_KEY_SIZE 122
#define RSA_R_DIGEST_TOO_BIG_FOR_RSA_KEY 112 #define RSA_R_DIGEST_TOO_BIG_FOR_RSA_KEY 112
#define RSA_R_DMP1_NOT_CONGRUENT_TO_D 124 #define RSA_R_DMP1_NOT_CONGRUENT_TO_D 124
#define RSA_R_DMQ1_NOT_CONGRUENT_TO_D 125 #define RSA_R_DMQ1_NOT_CONGRUENT_TO_D 125
#define RSA_R_D_E_NOT_CONGRUENT_TO_1 123 #define RSA_R_D_E_NOT_CONGRUENT_TO_1 123
#define RSA_R_FIRST_OCTET_INVALID 133 #define RSA_R_FIRST_OCTET_INVALID 133
#define RSA_R_INVALID_HEADER 137 #define RSA_R_INVALID_HEADER 137
#define RSA_R_INVALID_MESSAGE_LENGTH 131 #define RSA_R_INVALID_MESSAGE_LENGTH 131
#define RSA_R_INVALID_PADDING 138 #define RSA_R_INVALID_PADDING 138
#define RSA_R_INVALID_TRAILER 139 #define RSA_R_INVALID_TRAILER 139
#define RSA_R_IQMP_NOT_INVERSE_OF_Q 126 #define RSA_R_IQMP_NOT_INVERSE_OF_Q 126
#define RSA_R_KEY_SIZE_TOO_SMALL 120 #define RSA_R_KEY_SIZE_TOO_SMALL 120
#define RSA_R_LAST_OCTET_INVALID 134 #define RSA_R_LAST_OCTET_INVALID 134
#define RSA_R_MODULUS_TOO_LARGE 105 #define RSA_R_MODULUS_TOO_LARGE 105
#define RSA_R_NO_PUBLIC_EXPONENT 140 #define RSA_R_NON_FIPS_METHOD 141
#define RSA_R_NULL_BEFORE_BLOCK_MISSING 113 #define RSA_R_NO_PUBLIC_EXPONENT 140
#define RSA_R_N_DOES_NOT_EQUAL_P_Q 127 #define RSA_R_NULL_BEFORE_BLOCK_MISSING 113
#define RSA_R_OAEP_DECODING_ERROR 121 #define RSA_R_N_DOES_NOT_EQUAL_P_Q 127
#define RSA_R_PADDING_CHECK_FAILED 114 #define RSA_R_OAEP_DECODING_ERROR 121
#define RSA_R_P_NOT_PRIME 128 #define RSA_R_OPERATION_NOT_ALLOWED_IN_FIPS_MODE 142
#define RSA_R_Q_NOT_PRIME 129 #define RSA_R_PADDING_CHECK_FAILED 114
#define RSA_R_RSA_OPERATIONS_NOT_SUPPORTED 130 #define RSA_R_P_NOT_PRIME 128
#define RSA_R_SLEN_CHECK_FAILED 136 #define RSA_R_Q_NOT_PRIME 129
#define RSA_R_SLEN_RECOVERY_FAILED 135 #define RSA_R_RSA_OPERATIONS_NOT_SUPPORTED 130
#define RSA_R_SSLV3_ROLLBACK_ATTACK 115 #define RSA_R_SLEN_CHECK_FAILED 136
#define RSA_R_SLEN_RECOVERY_FAILED 135
#define RSA_R_SSLV3_ROLLBACK_ATTACK 115
#define RSA_R_THE_ASN1_OBJECT_IDENTIFIER_IS_NOT_KNOWN_FOR_THIS_MD 116 #define RSA_R_THE_ASN1_OBJECT_IDENTIFIER_IS_NOT_KNOWN_FOR_THIS_MD 116
#define RSA_R_UNKNOWN_ALGORITHM_TYPE 117 #define RSA_R_UNKNOWN_ALGORITHM_TYPE 117
#define RSA_R_UNKNOWN_PADDING_TYPE 118 #define RSA_R_UNKNOWN_PADDING_TYPE 118
#define RSA_R_WRONG_SIGNATURE_LENGTH 119 #define RSA_R_WRONG_SIGNATURE_LENGTH 119
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif #endif
dep/include/openssl/safestack.h
+350 -171
View File
@@ -57,11 +57,20 @@
#include <openssl/stack.h> #include <openssl/stack.h>
typedef void (*openssl_fptr)(void);
#define openssl_fcast(f) ((openssl_fptr)f)
#ifdef DEBUG_SAFESTACK #ifdef DEBUG_SAFESTACK
#ifndef CHECKED_PTR_OF
#define CHECKED_PTR_OF(type, p) \
((void*) (1 ? p : (type*)0))
#endif
#define CHECKED_SK_FREE_FUNC(type, p) \
((void (*)(void *)) ((1 ? p : (void (*)(type *))0)))
#define CHECKED_SK_CMP_FUNC(type, p) \
((int (*)(const char * const *, const char * const *)) \
((1 ? p : (int (*)(const type * const *, const type * const *))0)))
#define STACK_OF(type) struct stack_st_##type #define STACK_OF(type) struct stack_st_##type
#define PREDECLARE_STACK_OF(type) STACK_OF(type); #define PREDECLARE_STACK_OF(type) STACK_OF(type);
@@ -76,76 +85,71 @@ STACK_OF(type) \
/* SKM_sk_... stack macros are internal to safestack.h: /* SKM_sk_... stack macros are internal to safestack.h:
* never use them directly, use sk_<type>_... instead */ * never use them directly, use sk_<type>_... instead */
#define SKM_sk_new(type, cmp) \ #define SKM_sk_new(type, cmp) \
((STACK_OF(type) * (*)(int (*)(const type * const *, const type * const *)))openssl_fcast(sk_new))(cmp) ((STACK_OF(type) *)sk_new(CHECKED_SK_CMP_FUNC(type, cmp)))
#define SKM_sk_new_null(type) \ #define SKM_sk_new_null(type) \
((STACK_OF(type) * (*)(void))openssl_fcast(sk_new_null))() ((STACK_OF(type) *)sk_new_null())
#define SKM_sk_free(type, st) \ #define SKM_sk_free(type, st) \
((void (*)(STACK_OF(type) *))openssl_fcast(sk_free))(st) sk_free(CHECKED_PTR_OF(STACK_OF(type), st))
#define SKM_sk_num(type, st) \ #define SKM_sk_num(type, st) \
((int (*)(const STACK_OF(type) *))openssl_fcast(sk_num))(st) sk_num(CHECKED_PTR_OF(STACK_OF(type), st))
#define SKM_sk_value(type, st,i) \ #define SKM_sk_value(type, st,i) \
((type * (*)(const STACK_OF(type) *, int))openssl_fcast(sk_value))(st, i) ((type *)sk_value(CHECKED_PTR_OF(STACK_OF(type), st), i))
#define SKM_sk_set(type, st,i,val) \ #define SKM_sk_set(type, st,i,val) \
((type * (*)(STACK_OF(type) *, int, type *))openssl_fcast(sk_set))(st, i, val) sk_set(CHECKED_PTR_OF(STACK_OF(type), st), i, CHECKED_PTR_OF(type, val))
#define SKM_sk_zero(type, st) \ #define SKM_sk_zero(type, st) \
((void (*)(STACK_OF(type) *))openssl_fcast(sk_zero))(st) sk_zero(CHECKED_PTR_OF(STACK_OF(type), st))
#define SKM_sk_push(type, st,val) \ #define SKM_sk_push(type, st,val) \
((int (*)(STACK_OF(type) *, type *))openssl_fcast(sk_push))(st, val) sk_push(CHECKED_PTR_OF(STACK_OF(type), st), CHECKED_PTR_OF(type, val))
#define SKM_sk_unshift(type, st,val) \ #define SKM_sk_unshift(type, st,val) \
((int (*)(STACK_OF(type) *, type *))openssl_fcast(sk_unshift))(st, val) sk_unshift(CHECKED_PTR_OF(STACK_OF(type), st), CHECKED_PTR_OF(type, val))
#define SKM_sk_find(type, st,val) \ #define SKM_sk_find(type, st,val) \
((int (*)(STACK_OF(type) *, type *))openssl_fcast(sk_find))(st, val) sk_find(CHECKED_PTR_OF(STACK_OF(type), st), CHECKED_PTR_OF(type, val))
#define SKM_sk_delete(type, st,i) \ #define SKM_sk_delete(type, st,i) \
((type * (*)(STACK_OF(type) *, int))openssl_fcast(sk_delete))(st, i) (type *)sk_delete(CHECKED_PTR_OF(STACK_OF(type), st), i)
#define SKM_sk_delete_ptr(type, st,ptr) \ #define SKM_sk_delete_ptr(type, st,ptr) \
((type * (*)(STACK_OF(type) *, type *))openssl_fcast(sk_delete_ptr))(st, ptr) (type *)sk_delete_ptr(CHECKED_PTR_OF(STACK_OF(type), st), CHECKED_PTR_OF(type, ptr))
#define SKM_sk_insert(type, st,val,i) \ #define SKM_sk_insert(type, st,val,i) \
((int (*)(STACK_OF(type) *, type *, int))openssl_fcast(sk_insert))(st, val, i) sk_insert(CHECKED_PTR_OF(STACK_OF(type), st), CHECKED_PTR_OF(type, val), i)
#define SKM_sk_set_cmp_func(type, st,cmp) \ #define SKM_sk_set_cmp_func(type, st,cmp) \
((int (*(*)(STACK_OF(type) *, int (*)(const type * const *, const type * const *))) \ ((int (*)(const type * const *,const type * const *)) \
(const type * const *, const type * const *))openssl_fcast(sk_set_cmp_func))\ sk_set_cmp_func(CHECKED_PTR_OF(STACK_OF(type), st), CHECKED_SK_CMP_FUNC(type, cmp)))
(st, cmp)
#define SKM_sk_dup(type, st) \ #define SKM_sk_dup(type, st) \
((STACK_OF(type) *(*)(STACK_OF(type) *))openssl_fcast(sk_dup))(st) (STACK_OF(type) *)sk_dup(CHECKED_PTR_OF(STACK_OF(type), st))
#define SKM_sk_pop_free(type, st,free_func) \ #define SKM_sk_pop_free(type, st,free_func) \
((void (*)(STACK_OF(type) *, void (*)(type *)))openssl_fcast(sk_pop_free))\ sk_pop_free(CHECKED_PTR_OF(STACK_OF(type), st), CHECKED_SK_FREE_FUNC(type, free_func))
(st, free_func)
#define SKM_sk_shift(type, st) \ #define SKM_sk_shift(type, st) \
((type * (*)(STACK_OF(type) *))openssl_fcast(sk_shift))(st) (type *)sk_shift(CHECKED_PTR_OF(STACK_OF(type), st))
#define SKM_sk_pop(type, st) \ #define SKM_sk_pop(type, st) \
((type * (*)(STACK_OF(type) *))openssl_fcast(sk_pop))(st) (type *)sk_pop(CHECKED_PTR_OF(STACK_OF(type), st))
#define SKM_sk_sort(type, st) \ #define SKM_sk_sort(type, st) \
((void (*)(STACK_OF(type) *))openssl_fcast(sk_sort))(st) sk_sort(CHECKED_PTR_OF(STACK_OF(type), st))
#define SKM_sk_is_sorted(type, st) \ #define SKM_sk_is_sorted(type, st) \
((int (*)(const STACK_OF(type) *))openssl_fcast(sk_is_sorted))(st) sk_is_sorted(CHECKED_PTR_OF(STACK_OF(type), st))
#define SKM_ASN1_SET_OF_d2i(type, st, pp, length, d2i_func, free_func, ex_tag, ex_class) \ #define SKM_ASN1_SET_OF_d2i(type, st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
((STACK_OF(type) * (*) (STACK_OF(type) **,const unsigned char **, long , \ (STACK_OF(type) *)d2i_ASN1_SET(CHECKED_PTR_OF(STACK_OF(type), st), \
type *(*)(type **, const unsigned char **,long), \ pp, length, \
void (*)(type *), int ,int )) openssl_fcast(d2i_ASN1_SET)) \ CHECKED_D2I_OF(type, d2i_func), \
(st,pp,length, d2i_func, free_func, ex_tag,ex_class) CHECKED_SK_FREE_FUNC(type, free_func), \
#define SKM_ASN1_SET_OF_i2d(type, st, pp, i2d_func, ex_tag, ex_class, is_set) \ ex_tag, ex_class)
((int (*)(STACK_OF(type) *,unsigned char **, \
int (*)(type *,unsigned char **), int , int , int)) openssl_fcast(i2d_ASN1_SET)) \
(st,pp,i2d_func,ex_tag,ex_class,is_set)
#define SKM_ASN1_seq_pack(type, st, i2d_func, buf, len) \ #define SKM_ASN1_SET_OF_i2d(type, st, pp, i2d_func, ex_tag, ex_class, is_set) \
((unsigned char *(*)(STACK_OF(type) *, \ i2d_ASN1_SET(CHECKED_PTR_OF(STACK_OF(type), st), pp, \
int (*)(type *,unsigned char **), unsigned char **,int *)) openssl_fcast(ASN1_seq_pack)) \ CHECKED_I2D_OF(type, i2d_func), \
(st, i2d_func, buf, len) ex_tag, ex_class, is_set)
#define SKM_ASN1_seq_unpack(type, buf, len, d2i_func, free_func) \
((STACK_OF(type) * (*)(const unsigned char *,int, \ #define SKM_ASN1_seq_pack(type, st, i2d_func, buf, len) \
type *(*)(type **,const unsigned char **, long), \ ASN1_seq_pack(CHECKED_PTR_OF(STACK_OF(type), st), \
void (*)(type *)))openssl_fcast(ASN1_seq_unpack)) \ CHECKED_I2D_OF(type, i2d_func), buf, len)
(buf,len,d2i_func, free_func)
#define SKM_ASN1_seq_unpack(type, buf, len, d2i_func, free_func) \
(STACK_OF(type) *)ASN1_seq_unpack(buf, len, CHECKED_D2I_OF(type, d2i_func), CHECKED_SK_FREE_FUNC(type, free_func))
#define SKM_PKCS12_decrypt_d2i(type, algor, d2i_func, free_func, pass, passlen, oct, seq) \ #define SKM_PKCS12_decrypt_d2i(type, algor, d2i_func, free_func, pass, passlen, oct, seq) \
((STACK_OF(type) * (*)(X509_ALGOR *, \ (STACK_OF(type) *)PKCS12_decrypt_d2i(algor, \
type *(*)(type **, const unsigned char **, long), \ CHECKED_D2I_OF(type, d2i_func), \
void (*)(type *), \ CHECKED_SK_FREE_FUNC(type, free_func), \
const char *, int, \ pass, passlen, oct, seq)
ASN1_STRING *, int))PKCS12_decrypt_d2i) \
(algor,d2i_func,free_func,pass,passlen,oct,seq)
#else #else
@@ -155,59 +159,59 @@ STACK_OF(type) \
#define IMPLEMENT_STACK_OF(type) /* nada */ #define IMPLEMENT_STACK_OF(type) /* nada */
#define SKM_sk_new(type, cmp) \ #define SKM_sk_new(type, cmp) \
sk_new((int (*)(const char * const *, const char * const *))(cmp)) sk_new((int (*)(const char * const *, const char * const *))(cmp))
#define SKM_sk_new_null(type) \ #define SKM_sk_new_null(type) \
sk_new_null() sk_new_null()
#define SKM_sk_free(type, st) \ #define SKM_sk_free(type, st) \
sk_free(st) sk_free(st)
#define SKM_sk_num(type, st) \ #define SKM_sk_num(type, st) \
sk_num(st) sk_num(st)
#define SKM_sk_value(type, st,i) \ #define SKM_sk_value(type, st,i) \
((type *)sk_value(st, i)) ((type *)sk_value(st, i))
#define SKM_sk_set(type, st,i,val) \ #define SKM_sk_set(type, st,i,val) \
((type *)sk_set(st, i,(char *)val)) ((type *)sk_set(st, i,(char *)val))
#define SKM_sk_zero(type, st) \ #define SKM_sk_zero(type, st) \
sk_zero(st) sk_zero(st)
#define SKM_sk_push(type, st,val) \ #define SKM_sk_push(type, st,val) \
sk_push(st, (char *)val) sk_push(st, (char *)val)
#define SKM_sk_unshift(type, st,val) \ #define SKM_sk_unshift(type, st,val) \
sk_unshift(st, val) sk_unshift(st, (char *)val)
#define SKM_sk_find(type, st,val) \ #define SKM_sk_find(type, st,val) \
sk_find(st, (char *)val) sk_find(st, (char *)val)
#define SKM_sk_delete(type, st,i) \ #define SKM_sk_delete(type, st,i) \
((type *)sk_delete(st, i)) ((type *)sk_delete(st, i))
#define SKM_sk_delete_ptr(type, st,ptr) \ #define SKM_sk_delete_ptr(type, st,ptr) \
((type *)sk_delete_ptr(st,(char *)ptr)) ((type *)sk_delete_ptr(st,(char *)ptr))
#define SKM_sk_insert(type, st,val,i) \ #define SKM_sk_insert(type, st,val,i) \
sk_insert(st, (char *)val, i) sk_insert(st, (char *)val, i)
#define SKM_sk_set_cmp_func(type, st,cmp) \ #define SKM_sk_set_cmp_func(type, st,cmp) \
((int (*)(const type * const *,const type * const *)) \ ((int (*)(const type * const *,const type * const *)) \
sk_set_cmp_func(st, (int (*)(const char * const *, const char * const *))(cmp))) sk_set_cmp_func(st, (int (*)(const char * const *, const char * const *))(cmp)))
#define SKM_sk_dup(type, st) \ #define SKM_sk_dup(type, st) \
sk_dup(st) sk_dup(st)
#define SKM_sk_pop_free(type, st,free_func) \ #define SKM_sk_pop_free(type, st,free_func) \
sk_pop_free(st, (void (*)(void *))free_func) sk_pop_free(st, (void (*)(void *))free_func)
#define SKM_sk_shift(type, st) \ #define SKM_sk_shift(type, st) \
((type *)sk_shift(st)) ((type *)sk_shift(st))
#define SKM_sk_pop(type, st) \ #define SKM_sk_pop(type, st) \
((type *)sk_pop(st)) ((type *)sk_pop(st))
#define SKM_sk_sort(type, st) \ #define SKM_sk_sort(type, st) \
sk_sort(st) sk_sort(st)
#define SKM_sk_is_sorted(type, st) \ #define SKM_sk_is_sorted(type, st) \
sk_is_sorted(st) sk_is_sorted(st)
#define SKM_ASN1_SET_OF_d2i(type, st, pp, length, d2i_func, free_func, ex_tag, ex_class) \ #define SKM_ASN1_SET_OF_d2i(type, st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
d2i_ASN1_SET(st,pp,length, (void *(*)(void ** ,const unsigned char ** ,long))d2i_func, (void (*)(void *))free_func, ex_tag,ex_class) d2i_ASN1_SET(st,pp,length, (void *(*)(void ** ,const unsigned char ** ,long))d2i_func, (void (*)(void *))free_func, ex_tag,ex_class)
#define SKM_ASN1_SET_OF_i2d(type, st, pp, i2d_func, ex_tag, ex_class, is_set) \ #define SKM_ASN1_SET_OF_i2d(type, st, pp, i2d_func, ex_tag, ex_class, is_set) \
i2d_ASN1_SET(st,pp,(int (*)(void *, unsigned char **))i2d_func,ex_tag,ex_class,is_set) i2d_ASN1_SET(st,pp,(int (*)(void *, unsigned char **))i2d_func,ex_tag,ex_class,is_set)
#define SKM_ASN1_seq_pack(type, st, i2d_func, buf, len) \ #define SKM_ASN1_seq_pack(type, st, i2d_func, buf, len) \
ASN1_seq_pack(st, (int (*)(void *, unsigned char **))i2d_func, buf, len) ASN1_seq_pack(st, (int (*)(void *, unsigned char **))i2d_func, buf, len)
#define SKM_ASN1_seq_unpack(type, buf, len, d2i_func, free_func) \ #define SKM_ASN1_seq_unpack(type, buf, len, d2i_func, free_func) \
ASN1_seq_unpack(buf,len,(void *(*)(void **,const unsigned char **,long))d2i_func, (void(*)(void *))free_func) ASN1_seq_unpack(buf,len,(void *(*)(void **,const unsigned char **,long))d2i_func, (void(*)(void *))free_func)
#define SKM_PKCS12_decrypt_d2i(type, algor, d2i_func, free_func, pass, passlen, oct, seq) \ #define SKM_PKCS12_decrypt_d2i(type, algor, d2i_func, free_func, pass, passlen, oct, seq) \
((STACK *)PKCS12_decrypt_d2i(algor,(char *(*)())d2i_func, (void(*)(void *))free_func,pass,passlen,oct,seq)) ((STACK *)PKCS12_decrypt_d2i(algor,(char *(*)())d2i_func, (void(*)(void *))free_func,pass,passlen,oct,seq))
#endif #endif
@@ -410,6 +414,94 @@ STACK_OF(type) \
#define sk_BIO_sort(st) SKM_sk_sort(BIO, (st)) #define sk_BIO_sort(st) SKM_sk_sort(BIO, (st))
#define sk_BIO_is_sorted(st) SKM_sk_is_sorted(BIO, (st)) #define sk_BIO_is_sorted(st) SKM_sk_is_sorted(BIO, (st))
#define sk_CMS_CertificateChoices_new(st) SKM_sk_new(CMS_CertificateChoices, (st))
#define sk_CMS_CertificateChoices_new_null() SKM_sk_new_null(CMS_CertificateChoices)
#define sk_CMS_CertificateChoices_free(st) SKM_sk_free(CMS_CertificateChoices, (st))
#define sk_CMS_CertificateChoices_num(st) SKM_sk_num(CMS_CertificateChoices, (st))
#define sk_CMS_CertificateChoices_value(st, i) SKM_sk_value(CMS_CertificateChoices, (st), (i))
#define sk_CMS_CertificateChoices_set(st, i, val) SKM_sk_set(CMS_CertificateChoices, (st), (i), (val))
#define sk_CMS_CertificateChoices_zero(st) SKM_sk_zero(CMS_CertificateChoices, (st))
#define sk_CMS_CertificateChoices_push(st, val) SKM_sk_push(CMS_CertificateChoices, (st), (val))
#define sk_CMS_CertificateChoices_unshift(st, val) SKM_sk_unshift(CMS_CertificateChoices, (st), (val))
#define sk_CMS_CertificateChoices_find(st, val) SKM_sk_find(CMS_CertificateChoices, (st), (val))
#define sk_CMS_CertificateChoices_find_ex(st, val) SKM_sk_find_ex(CMS_CertificateChoices, (st), (val))
#define sk_CMS_CertificateChoices_delete(st, i) SKM_sk_delete(CMS_CertificateChoices, (st), (i))
#define sk_CMS_CertificateChoices_delete_ptr(st, ptr) SKM_sk_delete_ptr(CMS_CertificateChoices, (st), (ptr))
#define sk_CMS_CertificateChoices_insert(st, val, i) SKM_sk_insert(CMS_CertificateChoices, (st), (val), (i))
#define sk_CMS_CertificateChoices_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(CMS_CertificateChoices, (st), (cmp))
#define sk_CMS_CertificateChoices_dup(st) SKM_sk_dup(CMS_CertificateChoices, st)
#define sk_CMS_CertificateChoices_pop_free(st, free_func) SKM_sk_pop_free(CMS_CertificateChoices, (st), (free_func))
#define sk_CMS_CertificateChoices_shift(st) SKM_sk_shift(CMS_CertificateChoices, (st))
#define sk_CMS_CertificateChoices_pop(st) SKM_sk_pop(CMS_CertificateChoices, (st))
#define sk_CMS_CertificateChoices_sort(st) SKM_sk_sort(CMS_CertificateChoices, (st))
#define sk_CMS_CertificateChoices_is_sorted(st) SKM_sk_is_sorted(CMS_CertificateChoices, (st))
#define sk_CMS_RecipientInfo_new(st) SKM_sk_new(CMS_RecipientInfo, (st))
#define sk_CMS_RecipientInfo_new_null() SKM_sk_new_null(CMS_RecipientInfo)
#define sk_CMS_RecipientInfo_free(st) SKM_sk_free(CMS_RecipientInfo, (st))
#define sk_CMS_RecipientInfo_num(st) SKM_sk_num(CMS_RecipientInfo, (st))
#define sk_CMS_RecipientInfo_value(st, i) SKM_sk_value(CMS_RecipientInfo, (st), (i))
#define sk_CMS_RecipientInfo_set(st, i, val) SKM_sk_set(CMS_RecipientInfo, (st), (i), (val))
#define sk_CMS_RecipientInfo_zero(st) SKM_sk_zero(CMS_RecipientInfo, (st))
#define sk_CMS_RecipientInfo_push(st, val) SKM_sk_push(CMS_RecipientInfo, (st), (val))
#define sk_CMS_RecipientInfo_unshift(st, val) SKM_sk_unshift(CMS_RecipientInfo, (st), (val))
#define sk_CMS_RecipientInfo_find(st, val) SKM_sk_find(CMS_RecipientInfo, (st), (val))
#define sk_CMS_RecipientInfo_find_ex(st, val) SKM_sk_find_ex(CMS_RecipientInfo, (st), (val))
#define sk_CMS_RecipientInfo_delete(st, i) SKM_sk_delete(CMS_RecipientInfo, (st), (i))
#define sk_CMS_RecipientInfo_delete_ptr(st, ptr) SKM_sk_delete_ptr(CMS_RecipientInfo, (st), (ptr))
#define sk_CMS_RecipientInfo_insert(st, val, i) SKM_sk_insert(CMS_RecipientInfo, (st), (val), (i))
#define sk_CMS_RecipientInfo_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(CMS_RecipientInfo, (st), (cmp))
#define sk_CMS_RecipientInfo_dup(st) SKM_sk_dup(CMS_RecipientInfo, st)
#define sk_CMS_RecipientInfo_pop_free(st, free_func) SKM_sk_pop_free(CMS_RecipientInfo, (st), (free_func))
#define sk_CMS_RecipientInfo_shift(st) SKM_sk_shift(CMS_RecipientInfo, (st))
#define sk_CMS_RecipientInfo_pop(st) SKM_sk_pop(CMS_RecipientInfo, (st))
#define sk_CMS_RecipientInfo_sort(st) SKM_sk_sort(CMS_RecipientInfo, (st))
#define sk_CMS_RecipientInfo_is_sorted(st) SKM_sk_is_sorted(CMS_RecipientInfo, (st))
#define sk_CMS_RevocationInfoChoice_new(st) SKM_sk_new(CMS_RevocationInfoChoice, (st))
#define sk_CMS_RevocationInfoChoice_new_null() SKM_sk_new_null(CMS_RevocationInfoChoice)
#define sk_CMS_RevocationInfoChoice_free(st) SKM_sk_free(CMS_RevocationInfoChoice, (st))
#define sk_CMS_RevocationInfoChoice_num(st) SKM_sk_num(CMS_RevocationInfoChoice, (st))
#define sk_CMS_RevocationInfoChoice_value(st, i) SKM_sk_value(CMS_RevocationInfoChoice, (st), (i))
#define sk_CMS_RevocationInfoChoice_set(st, i, val) SKM_sk_set(CMS_RevocationInfoChoice, (st), (i), (val))
#define sk_CMS_RevocationInfoChoice_zero(st) SKM_sk_zero(CMS_RevocationInfoChoice, (st))
#define sk_CMS_RevocationInfoChoice_push(st, val) SKM_sk_push(CMS_RevocationInfoChoice, (st), (val))
#define sk_CMS_RevocationInfoChoice_unshift(st, val) SKM_sk_unshift(CMS_RevocationInfoChoice, (st), (val))
#define sk_CMS_RevocationInfoChoice_find(st, val) SKM_sk_find(CMS_RevocationInfoChoice, (st), (val))
#define sk_CMS_RevocationInfoChoice_find_ex(st, val) SKM_sk_find_ex(CMS_RevocationInfoChoice, (st), (val))
#define sk_CMS_RevocationInfoChoice_delete(st, i) SKM_sk_delete(CMS_RevocationInfoChoice, (st), (i))
#define sk_CMS_RevocationInfoChoice_delete_ptr(st, ptr) SKM_sk_delete_ptr(CMS_RevocationInfoChoice, (st), (ptr))
#define sk_CMS_RevocationInfoChoice_insert(st, val, i) SKM_sk_insert(CMS_RevocationInfoChoice, (st), (val), (i))
#define sk_CMS_RevocationInfoChoice_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(CMS_RevocationInfoChoice, (st), (cmp))
#define sk_CMS_RevocationInfoChoice_dup(st) SKM_sk_dup(CMS_RevocationInfoChoice, st)
#define sk_CMS_RevocationInfoChoice_pop_free(st, free_func) SKM_sk_pop_free(CMS_RevocationInfoChoice, (st), (free_func))
#define sk_CMS_RevocationInfoChoice_shift(st) SKM_sk_shift(CMS_RevocationInfoChoice, (st))
#define sk_CMS_RevocationInfoChoice_pop(st) SKM_sk_pop(CMS_RevocationInfoChoice, (st))
#define sk_CMS_RevocationInfoChoice_sort(st) SKM_sk_sort(CMS_RevocationInfoChoice, (st))
#define sk_CMS_RevocationInfoChoice_is_sorted(st) SKM_sk_is_sorted(CMS_RevocationInfoChoice, (st))
#define sk_CMS_SignerInfo_new(st) SKM_sk_new(CMS_SignerInfo, (st))
#define sk_CMS_SignerInfo_new_null() SKM_sk_new_null(CMS_SignerInfo)
#define sk_CMS_SignerInfo_free(st) SKM_sk_free(CMS_SignerInfo, (st))
#define sk_CMS_SignerInfo_num(st) SKM_sk_num(CMS_SignerInfo, (st))
#define sk_CMS_SignerInfo_value(st, i) SKM_sk_value(CMS_SignerInfo, (st), (i))
#define sk_CMS_SignerInfo_set(st, i, val) SKM_sk_set(CMS_SignerInfo, (st), (i), (val))
#define sk_CMS_SignerInfo_zero(st) SKM_sk_zero(CMS_SignerInfo, (st))
#define sk_CMS_SignerInfo_push(st, val) SKM_sk_push(CMS_SignerInfo, (st), (val))
#define sk_CMS_SignerInfo_unshift(st, val) SKM_sk_unshift(CMS_SignerInfo, (st), (val))
#define sk_CMS_SignerInfo_find(st, val) SKM_sk_find(CMS_SignerInfo, (st), (val))
#define sk_CMS_SignerInfo_find_ex(st, val) SKM_sk_find_ex(CMS_SignerInfo, (st), (val))
#define sk_CMS_SignerInfo_delete(st, i) SKM_sk_delete(CMS_SignerInfo, (st), (i))
#define sk_CMS_SignerInfo_delete_ptr(st, ptr) SKM_sk_delete_ptr(CMS_SignerInfo, (st), (ptr))
#define sk_CMS_SignerInfo_insert(st, val, i) SKM_sk_insert(CMS_SignerInfo, (st), (val), (i))
#define sk_CMS_SignerInfo_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(CMS_SignerInfo, (st), (cmp))
#define sk_CMS_SignerInfo_dup(st) SKM_sk_dup(CMS_SignerInfo, st)
#define sk_CMS_SignerInfo_pop_free(st, free_func) SKM_sk_pop_free(CMS_SignerInfo, (st), (free_func))
#define sk_CMS_SignerInfo_shift(st) SKM_sk_shift(CMS_SignerInfo, (st))
#define sk_CMS_SignerInfo_pop(st) SKM_sk_pop(CMS_SignerInfo, (st))
#define sk_CMS_SignerInfo_sort(st) SKM_sk_sort(CMS_SignerInfo, (st))
#define sk_CMS_SignerInfo_is_sorted(st) SKM_sk_is_sorted(CMS_SignerInfo, (st))
#define sk_CONF_IMODULE_new(st) SKM_sk_new(CONF_IMODULE, (st)) #define sk_CONF_IMODULE_new(st) SKM_sk_new(CONF_IMODULE, (st))
#define sk_CONF_IMODULE_new_null() SKM_sk_new_null(CONF_IMODULE) #define sk_CONF_IMODULE_new_null() SKM_sk_new_null(CONF_IMODULE)
#define sk_CONF_IMODULE_free(st) SKM_sk_free(CONF_IMODULE, (st)) #define sk_CONF_IMODULE_free(st) SKM_sk_free(CONF_IMODULE, (st))
@@ -608,6 +700,28 @@ STACK_OF(type) \
#define sk_GENERAL_NAME_sort(st) SKM_sk_sort(GENERAL_NAME, (st)) #define sk_GENERAL_NAME_sort(st) SKM_sk_sort(GENERAL_NAME, (st))
#define sk_GENERAL_NAME_is_sorted(st) SKM_sk_is_sorted(GENERAL_NAME, (st)) #define sk_GENERAL_NAME_is_sorted(st) SKM_sk_is_sorted(GENERAL_NAME, (st))
#define sk_GENERAL_NAMES_new(st) SKM_sk_new(GENERAL_NAMES, (st))
#define sk_GENERAL_NAMES_new_null() SKM_sk_new_null(GENERAL_NAMES)
#define sk_GENERAL_NAMES_free(st) SKM_sk_free(GENERAL_NAMES, (st))
#define sk_GENERAL_NAMES_num(st) SKM_sk_num(GENERAL_NAMES, (st))
#define sk_GENERAL_NAMES_value(st, i) SKM_sk_value(GENERAL_NAMES, (st), (i))
#define sk_GENERAL_NAMES_set(st, i, val) SKM_sk_set(GENERAL_NAMES, (st), (i), (val))
#define sk_GENERAL_NAMES_zero(st) SKM_sk_zero(GENERAL_NAMES, (st))
#define sk_GENERAL_NAMES_push(st, val) SKM_sk_push(GENERAL_NAMES, (st), (val))
#define sk_GENERAL_NAMES_unshift(st, val) SKM_sk_unshift(GENERAL_NAMES, (st), (val))
#define sk_GENERAL_NAMES_find(st, val) SKM_sk_find(GENERAL_NAMES, (st), (val))
#define sk_GENERAL_NAMES_find_ex(st, val) SKM_sk_find_ex(GENERAL_NAMES, (st), (val))
#define sk_GENERAL_NAMES_delete(st, i) SKM_sk_delete(GENERAL_NAMES, (st), (i))
#define sk_GENERAL_NAMES_delete_ptr(st, ptr) SKM_sk_delete_ptr(GENERAL_NAMES, (st), (ptr))
#define sk_GENERAL_NAMES_insert(st, val, i) SKM_sk_insert(GENERAL_NAMES, (st), (val), (i))
#define sk_GENERAL_NAMES_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(GENERAL_NAMES, (st), (cmp))
#define sk_GENERAL_NAMES_dup(st) SKM_sk_dup(GENERAL_NAMES, st)
#define sk_GENERAL_NAMES_pop_free(st, free_func) SKM_sk_pop_free(GENERAL_NAMES, (st), (free_func))
#define sk_GENERAL_NAMES_shift(st) SKM_sk_shift(GENERAL_NAMES, (st))
#define sk_GENERAL_NAMES_pop(st) SKM_sk_pop(GENERAL_NAMES, (st))
#define sk_GENERAL_NAMES_sort(st) SKM_sk_sort(GENERAL_NAMES, (st))
#define sk_GENERAL_NAMES_is_sorted(st) SKM_sk_is_sorted(GENERAL_NAMES, (st))
#define sk_GENERAL_SUBTREE_new(st) SKM_sk_new(GENERAL_SUBTREE, (st)) #define sk_GENERAL_SUBTREE_new(st) SKM_sk_new(GENERAL_SUBTREE, (st))
#define sk_GENERAL_SUBTREE_new_null() SKM_sk_new_null(GENERAL_SUBTREE) #define sk_GENERAL_SUBTREE_new_null() SKM_sk_new_null(GENERAL_SUBTREE)
#define sk_GENERAL_SUBTREE_free(st) SKM_sk_free(GENERAL_SUBTREE, (st)) #define sk_GENERAL_SUBTREE_free(st) SKM_sk_free(GENERAL_SUBTREE, (st))
@@ -872,6 +986,50 @@ STACK_OF(type) \
#define sk_MIME_HEADER_sort(st) SKM_sk_sort(MIME_HEADER, (st)) #define sk_MIME_HEADER_sort(st) SKM_sk_sort(MIME_HEADER, (st))
#define sk_MIME_HEADER_is_sorted(st) SKM_sk_is_sorted(MIME_HEADER, (st)) #define sk_MIME_HEADER_is_sorted(st) SKM_sk_is_sorted(MIME_HEADER, (st))
#define sk_MIME_HEADER_new(st) SKM_sk_new(MIME_HEADER, (st))
#define sk_MIME_HEADER_new_null() SKM_sk_new_null(MIME_HEADER)
#define sk_MIME_HEADER_free(st) SKM_sk_free(MIME_HEADER, (st))
#define sk_MIME_HEADER_num(st) SKM_sk_num(MIME_HEADER, (st))
#define sk_MIME_HEADER_value(st, i) SKM_sk_value(MIME_HEADER, (st), (i))
#define sk_MIME_HEADER_set(st, i, val) SKM_sk_set(MIME_HEADER, (st), (i), (val))
#define sk_MIME_HEADER_zero(st) SKM_sk_zero(MIME_HEADER, (st))
#define sk_MIME_HEADER_push(st, val) SKM_sk_push(MIME_HEADER, (st), (val))
#define sk_MIME_HEADER_unshift(st, val) SKM_sk_unshift(MIME_HEADER, (st), (val))
#define sk_MIME_HEADER_find(st, val) SKM_sk_find(MIME_HEADER, (st), (val))
#define sk_MIME_HEADER_find_ex(st, val) SKM_sk_find_ex(MIME_HEADER, (st), (val))
#define sk_MIME_HEADER_delete(st, i) SKM_sk_delete(MIME_HEADER, (st), (i))
#define sk_MIME_HEADER_delete_ptr(st, ptr) SKM_sk_delete_ptr(MIME_HEADER, (st), (ptr))
#define sk_MIME_HEADER_insert(st, val, i) SKM_sk_insert(MIME_HEADER, (st), (val), (i))
#define sk_MIME_HEADER_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(MIME_HEADER, (st), (cmp))
#define sk_MIME_HEADER_dup(st) SKM_sk_dup(MIME_HEADER, st)
#define sk_MIME_HEADER_pop_free(st, free_func) SKM_sk_pop_free(MIME_HEADER, (st), (free_func))
#define sk_MIME_HEADER_shift(st) SKM_sk_shift(MIME_HEADER, (st))
#define sk_MIME_HEADER_pop(st) SKM_sk_pop(MIME_HEADER, (st))
#define sk_MIME_HEADER_sort(st) SKM_sk_sort(MIME_HEADER, (st))
#define sk_MIME_HEADER_is_sorted(st) SKM_sk_is_sorted(MIME_HEADER, (st))
#define sk_MIME_PARAM_new(st) SKM_sk_new(MIME_PARAM, (st))
#define sk_MIME_PARAM_new_null() SKM_sk_new_null(MIME_PARAM)
#define sk_MIME_PARAM_free(st) SKM_sk_free(MIME_PARAM, (st))
#define sk_MIME_PARAM_num(st) SKM_sk_num(MIME_PARAM, (st))
#define sk_MIME_PARAM_value(st, i) SKM_sk_value(MIME_PARAM, (st), (i))
#define sk_MIME_PARAM_set(st, i, val) SKM_sk_set(MIME_PARAM, (st), (i), (val))
#define sk_MIME_PARAM_zero(st) SKM_sk_zero(MIME_PARAM, (st))
#define sk_MIME_PARAM_push(st, val) SKM_sk_push(MIME_PARAM, (st), (val))
#define sk_MIME_PARAM_unshift(st, val) SKM_sk_unshift(MIME_PARAM, (st), (val))
#define sk_MIME_PARAM_find(st, val) SKM_sk_find(MIME_PARAM, (st), (val))
#define sk_MIME_PARAM_find_ex(st, val) SKM_sk_find_ex(MIME_PARAM, (st), (val))
#define sk_MIME_PARAM_delete(st, i) SKM_sk_delete(MIME_PARAM, (st), (i))
#define sk_MIME_PARAM_delete_ptr(st, ptr) SKM_sk_delete_ptr(MIME_PARAM, (st), (ptr))
#define sk_MIME_PARAM_insert(st, val, i) SKM_sk_insert(MIME_PARAM, (st), (val), (i))
#define sk_MIME_PARAM_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(MIME_PARAM, (st), (cmp))
#define sk_MIME_PARAM_dup(st) SKM_sk_dup(MIME_PARAM, st)
#define sk_MIME_PARAM_pop_free(st, free_func) SKM_sk_pop_free(MIME_PARAM, (st), (free_func))
#define sk_MIME_PARAM_shift(st) SKM_sk_shift(MIME_PARAM, (st))
#define sk_MIME_PARAM_pop(st) SKM_sk_pop(MIME_PARAM, (st))
#define sk_MIME_PARAM_sort(st) SKM_sk_sort(MIME_PARAM, (st))
#define sk_MIME_PARAM_is_sorted(st) SKM_sk_is_sorted(MIME_PARAM, (st))
#define sk_MIME_PARAM_new(st) SKM_sk_new(MIME_PARAM, (st)) #define sk_MIME_PARAM_new(st) SKM_sk_new(MIME_PARAM, (st))
#define sk_MIME_PARAM_new_null() SKM_sk_new_null(MIME_PARAM) #define sk_MIME_PARAM_new_null() SKM_sk_new_null(MIME_PARAM)
#define sk_MIME_PARAM_free(st) SKM_sk_free(MIME_PARAM, (st)) #define sk_MIME_PARAM_free(st) SKM_sk_free(MIME_PARAM, (st))
@@ -960,6 +1118,28 @@ STACK_OF(type) \
#define sk_OCSP_ONEREQ_sort(st) SKM_sk_sort(OCSP_ONEREQ, (st)) #define sk_OCSP_ONEREQ_sort(st) SKM_sk_sort(OCSP_ONEREQ, (st))
#define sk_OCSP_ONEREQ_is_sorted(st) SKM_sk_is_sorted(OCSP_ONEREQ, (st)) #define sk_OCSP_ONEREQ_is_sorted(st) SKM_sk_is_sorted(OCSP_ONEREQ, (st))
#define sk_OCSP_RESPID_new(st) SKM_sk_new(OCSP_RESPID, (st))
#define sk_OCSP_RESPID_new_null() SKM_sk_new_null(OCSP_RESPID)
#define sk_OCSP_RESPID_free(st) SKM_sk_free(OCSP_RESPID, (st))
#define sk_OCSP_RESPID_num(st) SKM_sk_num(OCSP_RESPID, (st))
#define sk_OCSP_RESPID_value(st, i) SKM_sk_value(OCSP_RESPID, (st), (i))
#define sk_OCSP_RESPID_set(st, i, val) SKM_sk_set(OCSP_RESPID, (st), (i), (val))
#define sk_OCSP_RESPID_zero(st) SKM_sk_zero(OCSP_RESPID, (st))
#define sk_OCSP_RESPID_push(st, val) SKM_sk_push(OCSP_RESPID, (st), (val))
#define sk_OCSP_RESPID_unshift(st, val) SKM_sk_unshift(OCSP_RESPID, (st), (val))
#define sk_OCSP_RESPID_find(st, val) SKM_sk_find(OCSP_RESPID, (st), (val))
#define sk_OCSP_RESPID_find_ex(st, val) SKM_sk_find_ex(OCSP_RESPID, (st), (val))
#define sk_OCSP_RESPID_delete(st, i) SKM_sk_delete(OCSP_RESPID, (st), (i))
#define sk_OCSP_RESPID_delete_ptr(st, ptr) SKM_sk_delete_ptr(OCSP_RESPID, (st), (ptr))
#define sk_OCSP_RESPID_insert(st, val, i) SKM_sk_insert(OCSP_RESPID, (st), (val), (i))
#define sk_OCSP_RESPID_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(OCSP_RESPID, (st), (cmp))
#define sk_OCSP_RESPID_dup(st) SKM_sk_dup(OCSP_RESPID, st)
#define sk_OCSP_RESPID_pop_free(st, free_func) SKM_sk_pop_free(OCSP_RESPID, (st), (free_func))
#define sk_OCSP_RESPID_shift(st) SKM_sk_shift(OCSP_RESPID, (st))
#define sk_OCSP_RESPID_pop(st) SKM_sk_pop(OCSP_RESPID, (st))
#define sk_OCSP_RESPID_sort(st) SKM_sk_sort(OCSP_RESPID, (st))
#define sk_OCSP_RESPID_is_sorted(st) SKM_sk_is_sorted(OCSP_RESPID, (st))
#define sk_OCSP_SINGLERESP_new(st) SKM_sk_new(OCSP_SINGLERESP, (st)) #define sk_OCSP_SINGLERESP_new(st) SKM_sk_new(OCSP_SINGLERESP, (st))
#define sk_OCSP_SINGLERESP_new_null() SKM_sk_new_null(OCSP_SINGLERESP) #define sk_OCSP_SINGLERESP_new_null() SKM_sk_new_null(OCSP_SINGLERESP)
#define sk_OCSP_SINGLERESP_free(st) SKM_sk_free(OCSP_SINGLERESP, (st)) #define sk_OCSP_SINGLERESP_free(st) SKM_sk_free(OCSP_SINGLERESP, (st))
@@ -1643,209 +1823,208 @@ STACK_OF(type) \
#define sk_X509_VERIFY_PARAM_is_sorted(st) SKM_sk_is_sorted(X509_VERIFY_PARAM, (st)) #define sk_X509_VERIFY_PARAM_is_sorted(st) SKM_sk_is_sorted(X509_VERIFY_PARAM, (st))
#define d2i_ASN1_SET_OF_ACCESS_DESCRIPTION(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \ #define d2i_ASN1_SET_OF_ACCESS_DESCRIPTION(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
SKM_ASN1_SET_OF_d2i(ACCESS_DESCRIPTION, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) SKM_ASN1_SET_OF_d2i(ACCESS_DESCRIPTION, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class))
#define i2d_ASN1_SET_OF_ACCESS_DESCRIPTION(st, pp, i2d_func, ex_tag, ex_class, is_set) \ #define i2d_ASN1_SET_OF_ACCESS_DESCRIPTION(st, pp, i2d_func, ex_tag, ex_class, is_set) \
SKM_ASN1_SET_OF_i2d(ACCESS_DESCRIPTION, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set)) SKM_ASN1_SET_OF_i2d(ACCESS_DESCRIPTION, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
#define ASN1_seq_pack_ACCESS_DESCRIPTION(st, i2d_func, buf, len) \ #define ASN1_seq_pack_ACCESS_DESCRIPTION(st, i2d_func, buf, len) \
SKM_ASN1_seq_pack(ACCESS_DESCRIPTION, (st), (i2d_func), (buf), (len)) SKM_ASN1_seq_pack(ACCESS_DESCRIPTION, (st), (i2d_func), (buf), (len))
#define ASN1_seq_unpack_ACCESS_DESCRIPTION(buf, len, d2i_func, free_func) \ #define ASN1_seq_unpack_ACCESS_DESCRIPTION(buf, len, d2i_func, free_func) \
SKM_ASN1_seq_unpack(ACCESS_DESCRIPTION, (buf), (len), (d2i_func), (free_func)) SKM_ASN1_seq_unpack(ACCESS_DESCRIPTION, (buf), (len), (d2i_func), (free_func))
#define d2i_ASN1_SET_OF_ASN1_INTEGER(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \ #define d2i_ASN1_SET_OF_ASN1_INTEGER(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
SKM_ASN1_SET_OF_d2i(ASN1_INTEGER, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) SKM_ASN1_SET_OF_d2i(ASN1_INTEGER, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class))
#define i2d_ASN1_SET_OF_ASN1_INTEGER(st, pp, i2d_func, ex_tag, ex_class, is_set) \ #define i2d_ASN1_SET_OF_ASN1_INTEGER(st, pp, i2d_func, ex_tag, ex_class, is_set) \
SKM_ASN1_SET_OF_i2d(ASN1_INTEGER, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set)) SKM_ASN1_SET_OF_i2d(ASN1_INTEGER, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
#define ASN1_seq_pack_ASN1_INTEGER(st, i2d_func, buf, len) \ #define ASN1_seq_pack_ASN1_INTEGER(st, i2d_func, buf, len) \
SKM_ASN1_seq_pack(ASN1_INTEGER, (st), (i2d_func), (buf), (len)) SKM_ASN1_seq_pack(ASN1_INTEGER, (st), (i2d_func), (buf), (len))
#define ASN1_seq_unpack_ASN1_INTEGER(buf, len, d2i_func, free_func) \ #define ASN1_seq_unpack_ASN1_INTEGER(buf, len, d2i_func, free_func) \
SKM_ASN1_seq_unpack(ASN1_INTEGER, (buf), (len), (d2i_func), (free_func)) SKM_ASN1_seq_unpack(ASN1_INTEGER, (buf), (len), (d2i_func), (free_func))
#define d2i_ASN1_SET_OF_ASN1_OBJECT(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \ #define d2i_ASN1_SET_OF_ASN1_OBJECT(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
SKM_ASN1_SET_OF_d2i(ASN1_OBJECT, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) SKM_ASN1_SET_OF_d2i(ASN1_OBJECT, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class))
#define i2d_ASN1_SET_OF_ASN1_OBJECT(st, pp, i2d_func, ex_tag, ex_class, is_set) \ #define i2d_ASN1_SET_OF_ASN1_OBJECT(st, pp, i2d_func, ex_tag, ex_class, is_set) \
SKM_ASN1_SET_OF_i2d(ASN1_OBJECT, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set)) SKM_ASN1_SET_OF_i2d(ASN1_OBJECT, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
#define ASN1_seq_pack_ASN1_OBJECT(st, i2d_func, buf, len) \ #define ASN1_seq_pack_ASN1_OBJECT(st, i2d_func, buf, len) \
SKM_ASN1_seq_pack(ASN1_OBJECT, (st), (i2d_func), (buf), (len)) SKM_ASN1_seq_pack(ASN1_OBJECT, (st), (i2d_func), (buf), (len))
#define ASN1_seq_unpack_ASN1_OBJECT(buf, len, d2i_func, free_func) \ #define ASN1_seq_unpack_ASN1_OBJECT(buf, len, d2i_func, free_func) \
SKM_ASN1_seq_unpack(ASN1_OBJECT, (buf), (len), (d2i_func), (free_func)) SKM_ASN1_seq_unpack(ASN1_OBJECT, (buf), (len), (d2i_func), (free_func))
#define d2i_ASN1_SET_OF_ASN1_TYPE(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \ #define d2i_ASN1_SET_OF_ASN1_TYPE(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
SKM_ASN1_SET_OF_d2i(ASN1_TYPE, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) SKM_ASN1_SET_OF_d2i(ASN1_TYPE, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class))
#define i2d_ASN1_SET_OF_ASN1_TYPE(st, pp, i2d_func, ex_tag, ex_class, is_set) \ #define i2d_ASN1_SET_OF_ASN1_TYPE(st, pp, i2d_func, ex_tag, ex_class, is_set) \
SKM_ASN1_SET_OF_i2d(ASN1_TYPE, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set)) SKM_ASN1_SET_OF_i2d(ASN1_TYPE, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
#define ASN1_seq_pack_ASN1_TYPE(st, i2d_func, buf, len) \ #define ASN1_seq_pack_ASN1_TYPE(st, i2d_func, buf, len) \
SKM_ASN1_seq_pack(ASN1_TYPE, (st), (i2d_func), (buf), (len)) SKM_ASN1_seq_pack(ASN1_TYPE, (st), (i2d_func), (buf), (len))
#define ASN1_seq_unpack_ASN1_TYPE(buf, len, d2i_func, free_func) \ #define ASN1_seq_unpack_ASN1_TYPE(buf, len, d2i_func, free_func) \
SKM_ASN1_seq_unpack(ASN1_TYPE, (buf), (len), (d2i_func), (free_func)) SKM_ASN1_seq_unpack(ASN1_TYPE, (buf), (len), (d2i_func), (free_func))
#define d2i_ASN1_SET_OF_DIST_POINT(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \ #define d2i_ASN1_SET_OF_DIST_POINT(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
SKM_ASN1_SET_OF_d2i(DIST_POINT, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) SKM_ASN1_SET_OF_d2i(DIST_POINT, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class))
#define i2d_ASN1_SET_OF_DIST_POINT(st, pp, i2d_func, ex_tag, ex_class, is_set) \ #define i2d_ASN1_SET_OF_DIST_POINT(st, pp, i2d_func, ex_tag, ex_class, is_set) \
SKM_ASN1_SET_OF_i2d(DIST_POINT, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set)) SKM_ASN1_SET_OF_i2d(DIST_POINT, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
#define ASN1_seq_pack_DIST_POINT(st, i2d_func, buf, len) \ #define ASN1_seq_pack_DIST_POINT(st, i2d_func, buf, len) \
SKM_ASN1_seq_pack(DIST_POINT, (st), (i2d_func), (buf), (len)) SKM_ASN1_seq_pack(DIST_POINT, (st), (i2d_func), (buf), (len))
#define ASN1_seq_unpack_DIST_POINT(buf, len, d2i_func, free_func) \ #define ASN1_seq_unpack_DIST_POINT(buf, len, d2i_func, free_func) \
SKM_ASN1_seq_unpack(DIST_POINT, (buf), (len), (d2i_func), (free_func)) SKM_ASN1_seq_unpack(DIST_POINT, (buf), (len), (d2i_func), (free_func))
#define d2i_ASN1_SET_OF_GENERAL_NAME(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \ #define d2i_ASN1_SET_OF_GENERAL_NAME(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
SKM_ASN1_SET_OF_d2i(GENERAL_NAME, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) SKM_ASN1_SET_OF_d2i(GENERAL_NAME, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class))
#define i2d_ASN1_SET_OF_GENERAL_NAME(st, pp, i2d_func, ex_tag, ex_class, is_set) \ #define i2d_ASN1_SET_OF_GENERAL_NAME(st, pp, i2d_func, ex_tag, ex_class, is_set) \
SKM_ASN1_SET_OF_i2d(GENERAL_NAME, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set)) SKM_ASN1_SET_OF_i2d(GENERAL_NAME, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
#define ASN1_seq_pack_GENERAL_NAME(st, i2d_func, buf, len) \ #define ASN1_seq_pack_GENERAL_NAME(st, i2d_func, buf, len) \
SKM_ASN1_seq_pack(GENERAL_NAME, (st), (i2d_func), (buf), (len)) SKM_ASN1_seq_pack(GENERAL_NAME, (st), (i2d_func), (buf), (len))
#define ASN1_seq_unpack_GENERAL_NAME(buf, len, d2i_func, free_func) \ #define ASN1_seq_unpack_GENERAL_NAME(buf, len, d2i_func, free_func) \
SKM_ASN1_seq_unpack(GENERAL_NAME, (buf), (len), (d2i_func), (free_func)) SKM_ASN1_seq_unpack(GENERAL_NAME, (buf), (len), (d2i_func), (free_func))
#define d2i_ASN1_SET_OF_OCSP_ONEREQ(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \ #define d2i_ASN1_SET_OF_OCSP_ONEREQ(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
SKM_ASN1_SET_OF_d2i(OCSP_ONEREQ, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) SKM_ASN1_SET_OF_d2i(OCSP_ONEREQ, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class))
#define i2d_ASN1_SET_OF_OCSP_ONEREQ(st, pp, i2d_func, ex_tag, ex_class, is_set) \ #define i2d_ASN1_SET_OF_OCSP_ONEREQ(st, pp, i2d_func, ex_tag, ex_class, is_set) \
SKM_ASN1_SET_OF_i2d(OCSP_ONEREQ, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set)) SKM_ASN1_SET_OF_i2d(OCSP_ONEREQ, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
#define ASN1_seq_pack_OCSP_ONEREQ(st, i2d_func, buf, len) \ #define ASN1_seq_pack_OCSP_ONEREQ(st, i2d_func, buf, len) \
SKM_ASN1_seq_pack(OCSP_ONEREQ, (st), (i2d_func), (buf), (len)) SKM_ASN1_seq_pack(OCSP_ONEREQ, (st), (i2d_func), (buf), (len))
#define ASN1_seq_unpack_OCSP_ONEREQ(buf, len, d2i_func, free_func) \ #define ASN1_seq_unpack_OCSP_ONEREQ(buf, len, d2i_func, free_func) \
SKM_ASN1_seq_unpack(OCSP_ONEREQ, (buf), (len), (d2i_func), (free_func)) SKM_ASN1_seq_unpack(OCSP_ONEREQ, (buf), (len), (d2i_func), (free_func))
#define d2i_ASN1_SET_OF_OCSP_SINGLERESP(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \ #define d2i_ASN1_SET_OF_OCSP_SINGLERESP(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
SKM_ASN1_SET_OF_d2i(OCSP_SINGLERESP, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) SKM_ASN1_SET_OF_d2i(OCSP_SINGLERESP, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class))
#define i2d_ASN1_SET_OF_OCSP_SINGLERESP(st, pp, i2d_func, ex_tag, ex_class, is_set) \ #define i2d_ASN1_SET_OF_OCSP_SINGLERESP(st, pp, i2d_func, ex_tag, ex_class, is_set) \
SKM_ASN1_SET_OF_i2d(OCSP_SINGLERESP, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set)) SKM_ASN1_SET_OF_i2d(OCSP_SINGLERESP, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
#define ASN1_seq_pack_OCSP_SINGLERESP(st, i2d_func, buf, len) \ #define ASN1_seq_pack_OCSP_SINGLERESP(st, i2d_func, buf, len) \
SKM_ASN1_seq_pack(OCSP_SINGLERESP, (st), (i2d_func), (buf), (len)) SKM_ASN1_seq_pack(OCSP_SINGLERESP, (st), (i2d_func), (buf), (len))
#define ASN1_seq_unpack_OCSP_SINGLERESP(buf, len, d2i_func, free_func) \ #define ASN1_seq_unpack_OCSP_SINGLERESP(buf, len, d2i_func, free_func) \
SKM_ASN1_seq_unpack(OCSP_SINGLERESP, (buf), (len), (d2i_func), (free_func)) SKM_ASN1_seq_unpack(OCSP_SINGLERESP, (buf), (len), (d2i_func), (free_func))
#define d2i_ASN1_SET_OF_PKCS12_SAFEBAG(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \ #define d2i_ASN1_SET_OF_PKCS12_SAFEBAG(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
SKM_ASN1_SET_OF_d2i(PKCS12_SAFEBAG, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) SKM_ASN1_SET_OF_d2i(PKCS12_SAFEBAG, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class))
#define i2d_ASN1_SET_OF_PKCS12_SAFEBAG(st, pp, i2d_func, ex_tag, ex_class, is_set) \ #define i2d_ASN1_SET_OF_PKCS12_SAFEBAG(st, pp, i2d_func, ex_tag, ex_class, is_set) \
SKM_ASN1_SET_OF_i2d(PKCS12_SAFEBAG, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set)) SKM_ASN1_SET_OF_i2d(PKCS12_SAFEBAG, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
#define ASN1_seq_pack_PKCS12_SAFEBAG(st, i2d_func, buf, len) \ #define ASN1_seq_pack_PKCS12_SAFEBAG(st, i2d_func, buf, len) \
SKM_ASN1_seq_pack(PKCS12_SAFEBAG, (st), (i2d_func), (buf), (len)) SKM_ASN1_seq_pack(PKCS12_SAFEBAG, (st), (i2d_func), (buf), (len))
#define ASN1_seq_unpack_PKCS12_SAFEBAG(buf, len, d2i_func, free_func) \ #define ASN1_seq_unpack_PKCS12_SAFEBAG(buf, len, d2i_func, free_func) \
SKM_ASN1_seq_unpack(PKCS12_SAFEBAG, (buf), (len), (d2i_func), (free_func)) SKM_ASN1_seq_unpack(PKCS12_SAFEBAG, (buf), (len), (d2i_func), (free_func))
#define d2i_ASN1_SET_OF_PKCS7(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \ #define d2i_ASN1_SET_OF_PKCS7(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
SKM_ASN1_SET_OF_d2i(PKCS7, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) SKM_ASN1_SET_OF_d2i(PKCS7, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class))
#define i2d_ASN1_SET_OF_PKCS7(st, pp, i2d_func, ex_tag, ex_class, is_set) \ #define i2d_ASN1_SET_OF_PKCS7(st, pp, i2d_func, ex_tag, ex_class, is_set) \
SKM_ASN1_SET_OF_i2d(PKCS7, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set)) SKM_ASN1_SET_OF_i2d(PKCS7, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
#define ASN1_seq_pack_PKCS7(st, i2d_func, buf, len) \ #define ASN1_seq_pack_PKCS7(st, i2d_func, buf, len) \
SKM_ASN1_seq_pack(PKCS7, (st), (i2d_func), (buf), (len)) SKM_ASN1_seq_pack(PKCS7, (st), (i2d_func), (buf), (len))
#define ASN1_seq_unpack_PKCS7(buf, len, d2i_func, free_func) \ #define ASN1_seq_unpack_PKCS7(buf, len, d2i_func, free_func) \
SKM_ASN1_seq_unpack(PKCS7, (buf), (len), (d2i_func), (free_func)) SKM_ASN1_seq_unpack(PKCS7, (buf), (len), (d2i_func), (free_func))
#define d2i_ASN1_SET_OF_PKCS7_RECIP_INFO(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \ #define d2i_ASN1_SET_OF_PKCS7_RECIP_INFO(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
SKM_ASN1_SET_OF_d2i(PKCS7_RECIP_INFO, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) SKM_ASN1_SET_OF_d2i(PKCS7_RECIP_INFO, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class))
#define i2d_ASN1_SET_OF_PKCS7_RECIP_INFO(st, pp, i2d_func, ex_tag, ex_class, is_set) \ #define i2d_ASN1_SET_OF_PKCS7_RECIP_INFO(st, pp, i2d_func, ex_tag, ex_class, is_set) \
SKM_ASN1_SET_OF_i2d(PKCS7_RECIP_INFO, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set)) SKM_ASN1_SET_OF_i2d(PKCS7_RECIP_INFO, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
#define ASN1_seq_pack_PKCS7_RECIP_INFO(st, i2d_func, buf, len) \ #define ASN1_seq_pack_PKCS7_RECIP_INFO(st, i2d_func, buf, len) \
SKM_ASN1_seq_pack(PKCS7_RECIP_INFO, (st), (i2d_func), (buf), (len)) SKM_ASN1_seq_pack(PKCS7_RECIP_INFO, (st), (i2d_func), (buf), (len))
#define ASN1_seq_unpack_PKCS7_RECIP_INFO(buf, len, d2i_func, free_func) \ #define ASN1_seq_unpack_PKCS7_RECIP_INFO(buf, len, d2i_func, free_func) \
SKM_ASN1_seq_unpack(PKCS7_RECIP_INFO, (buf), (len), (d2i_func), (free_func)) SKM_ASN1_seq_unpack(PKCS7_RECIP_INFO, (buf), (len), (d2i_func), (free_func))
#define d2i_ASN1_SET_OF_PKCS7_SIGNER_INFO(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \ #define d2i_ASN1_SET_OF_PKCS7_SIGNER_INFO(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
SKM_ASN1_SET_OF_d2i(PKCS7_SIGNER_INFO, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) SKM_ASN1_SET_OF_d2i(PKCS7_SIGNER_INFO, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class))
#define i2d_ASN1_SET_OF_PKCS7_SIGNER_INFO(st, pp, i2d_func, ex_tag, ex_class, is_set) \ #define i2d_ASN1_SET_OF_PKCS7_SIGNER_INFO(st, pp, i2d_func, ex_tag, ex_class, is_set) \
SKM_ASN1_SET_OF_i2d(PKCS7_SIGNER_INFO, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set)) SKM_ASN1_SET_OF_i2d(PKCS7_SIGNER_INFO, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
#define ASN1_seq_pack_PKCS7_SIGNER_INFO(st, i2d_func, buf, len) \ #define ASN1_seq_pack_PKCS7_SIGNER_INFO(st, i2d_func, buf, len) \
SKM_ASN1_seq_pack(PKCS7_SIGNER_INFO, (st), (i2d_func), (buf), (len)) SKM_ASN1_seq_pack(PKCS7_SIGNER_INFO, (st), (i2d_func), (buf), (len))
#define ASN1_seq_unpack_PKCS7_SIGNER_INFO(buf, len, d2i_func, free_func) \ #define ASN1_seq_unpack_PKCS7_SIGNER_INFO(buf, len, d2i_func, free_func) \
SKM_ASN1_seq_unpack(PKCS7_SIGNER_INFO, (buf), (len), (d2i_func), (free_func)) SKM_ASN1_seq_unpack(PKCS7_SIGNER_INFO, (buf), (len), (d2i_func), (free_func))
#define d2i_ASN1_SET_OF_POLICYINFO(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \ #define d2i_ASN1_SET_OF_POLICYINFO(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
SKM_ASN1_SET_OF_d2i(POLICYINFO, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) SKM_ASN1_SET_OF_d2i(POLICYINFO, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class))
#define i2d_ASN1_SET_OF_POLICYINFO(st, pp, i2d_func, ex_tag, ex_class, is_set) \ #define i2d_ASN1_SET_OF_POLICYINFO(st, pp, i2d_func, ex_tag, ex_class, is_set) \
SKM_ASN1_SET_OF_i2d(POLICYINFO, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set)) SKM_ASN1_SET_OF_i2d(POLICYINFO, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
#define ASN1_seq_pack_POLICYINFO(st, i2d_func, buf, len) \ #define ASN1_seq_pack_POLICYINFO(st, i2d_func, buf, len) \
SKM_ASN1_seq_pack(POLICYINFO, (st), (i2d_func), (buf), (len)) SKM_ASN1_seq_pack(POLICYINFO, (st), (i2d_func), (buf), (len))
#define ASN1_seq_unpack_POLICYINFO(buf, len, d2i_func, free_func) \ #define ASN1_seq_unpack_POLICYINFO(buf, len, d2i_func, free_func) \
SKM_ASN1_seq_unpack(POLICYINFO, (buf), (len), (d2i_func), (free_func)) SKM_ASN1_seq_unpack(POLICYINFO, (buf), (len), (d2i_func), (free_func))
#define d2i_ASN1_SET_OF_POLICYQUALINFO(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \ #define d2i_ASN1_SET_OF_POLICYQUALINFO(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
SKM_ASN1_SET_OF_d2i(POLICYQUALINFO, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) SKM_ASN1_SET_OF_d2i(POLICYQUALINFO, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class))
#define i2d_ASN1_SET_OF_POLICYQUALINFO(st, pp, i2d_func, ex_tag, ex_class, is_set) \ #define i2d_ASN1_SET_OF_POLICYQUALINFO(st, pp, i2d_func, ex_tag, ex_class, is_set) \
SKM_ASN1_SET_OF_i2d(POLICYQUALINFO, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set)) SKM_ASN1_SET_OF_i2d(POLICYQUALINFO, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
#define ASN1_seq_pack_POLICYQUALINFO(st, i2d_func, buf, len) \ #define ASN1_seq_pack_POLICYQUALINFO(st, i2d_func, buf, len) \
SKM_ASN1_seq_pack(POLICYQUALINFO, (st), (i2d_func), (buf), (len)) SKM_ASN1_seq_pack(POLICYQUALINFO, (st), (i2d_func), (buf), (len))
#define ASN1_seq_unpack_POLICYQUALINFO(buf, len, d2i_func, free_func) \ #define ASN1_seq_unpack_POLICYQUALINFO(buf, len, d2i_func, free_func) \
SKM_ASN1_seq_unpack(POLICYQUALINFO, (buf), (len), (d2i_func), (free_func)) SKM_ASN1_seq_unpack(POLICYQUALINFO, (buf), (len), (d2i_func), (free_func))
#define d2i_ASN1_SET_OF_SXNETID(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \ #define d2i_ASN1_SET_OF_SXNETID(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
SKM_ASN1_SET_OF_d2i(SXNETID, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) SKM_ASN1_SET_OF_d2i(SXNETID, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class))
#define i2d_ASN1_SET_OF_SXNETID(st, pp, i2d_func, ex_tag, ex_class, is_set) \ #define i2d_ASN1_SET_OF_SXNETID(st, pp, i2d_func, ex_tag, ex_class, is_set) \
SKM_ASN1_SET_OF_i2d(SXNETID, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set)) SKM_ASN1_SET_OF_i2d(SXNETID, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
#define ASN1_seq_pack_SXNETID(st, i2d_func, buf, len) \ #define ASN1_seq_pack_SXNETID(st, i2d_func, buf, len) \
SKM_ASN1_seq_pack(SXNETID, (st), (i2d_func), (buf), (len)) SKM_ASN1_seq_pack(SXNETID, (st), (i2d_func), (buf), (len))
#define ASN1_seq_unpack_SXNETID(buf, len, d2i_func, free_func) \ #define ASN1_seq_unpack_SXNETID(buf, len, d2i_func, free_func) \
SKM_ASN1_seq_unpack(SXNETID, (buf), (len), (d2i_func), (free_func)) SKM_ASN1_seq_unpack(SXNETID, (buf), (len), (d2i_func), (free_func))
#define d2i_ASN1_SET_OF_X509(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \ #define d2i_ASN1_SET_OF_X509(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
SKM_ASN1_SET_OF_d2i(X509, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) SKM_ASN1_SET_OF_d2i(X509, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class))
#define i2d_ASN1_SET_OF_X509(st, pp, i2d_func, ex_tag, ex_class, is_set) \ #define i2d_ASN1_SET_OF_X509(st, pp, i2d_func, ex_tag, ex_class, is_set) \
SKM_ASN1_SET_OF_i2d(X509, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set)) SKM_ASN1_SET_OF_i2d(X509, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
#define ASN1_seq_pack_X509(st, i2d_func, buf, len) \ #define ASN1_seq_pack_X509(st, i2d_func, buf, len) \
SKM_ASN1_seq_pack(X509, (st), (i2d_func), (buf), (len)) SKM_ASN1_seq_pack(X509, (st), (i2d_func), (buf), (len))
#define ASN1_seq_unpack_X509(buf, len, d2i_func, free_func) \ #define ASN1_seq_unpack_X509(buf, len, d2i_func, free_func) \
SKM_ASN1_seq_unpack(X509, (buf), (len), (d2i_func), (free_func)) SKM_ASN1_seq_unpack(X509, (buf), (len), (d2i_func), (free_func))
#define d2i_ASN1_SET_OF_X509_ALGOR(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \ #define d2i_ASN1_SET_OF_X509_ALGOR(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
SKM_ASN1_SET_OF_d2i(X509_ALGOR, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) SKM_ASN1_SET_OF_d2i(X509_ALGOR, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class))
#define i2d_ASN1_SET_OF_X509_ALGOR(st, pp, i2d_func, ex_tag, ex_class, is_set) \ #define i2d_ASN1_SET_OF_X509_ALGOR(st, pp, i2d_func, ex_tag, ex_class, is_set) \
SKM_ASN1_SET_OF_i2d(X509_ALGOR, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set)) SKM_ASN1_SET_OF_i2d(X509_ALGOR, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
#define ASN1_seq_pack_X509_ALGOR(st, i2d_func, buf, len) \ #define ASN1_seq_pack_X509_ALGOR(st, i2d_func, buf, len) \
SKM_ASN1_seq_pack(X509_ALGOR, (st), (i2d_func), (buf), (len)) SKM_ASN1_seq_pack(X509_ALGOR, (st), (i2d_func), (buf), (len))
#define ASN1_seq_unpack_X509_ALGOR(buf, len, d2i_func, free_func) \ #define ASN1_seq_unpack_X509_ALGOR(buf, len, d2i_func, free_func) \
SKM_ASN1_seq_unpack(X509_ALGOR, (buf), (len), (d2i_func), (free_func)) SKM_ASN1_seq_unpack(X509_ALGOR, (buf), (len), (d2i_func), (free_func))
#define d2i_ASN1_SET_OF_X509_ATTRIBUTE(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \ #define d2i_ASN1_SET_OF_X509_ATTRIBUTE(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
SKM_ASN1_SET_OF_d2i(X509_ATTRIBUTE, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) SKM_ASN1_SET_OF_d2i(X509_ATTRIBUTE, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class))
#define i2d_ASN1_SET_OF_X509_ATTRIBUTE(st, pp, i2d_func, ex_tag, ex_class, is_set) \ #define i2d_ASN1_SET_OF_X509_ATTRIBUTE(st, pp, i2d_func, ex_tag, ex_class, is_set) \
SKM_ASN1_SET_OF_i2d(X509_ATTRIBUTE, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set)) SKM_ASN1_SET_OF_i2d(X509_ATTRIBUTE, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
#define ASN1_seq_pack_X509_ATTRIBUTE(st, i2d_func, buf, len) \ #define ASN1_seq_pack_X509_ATTRIBUTE(st, i2d_func, buf, len) \
SKM_ASN1_seq_pack(X509_ATTRIBUTE, (st), (i2d_func), (buf), (len)) SKM_ASN1_seq_pack(X509_ATTRIBUTE, (st), (i2d_func), (buf), (len))
#define ASN1_seq_unpack_X509_ATTRIBUTE(buf, len, d2i_func, free_func) \ #define ASN1_seq_unpack_X509_ATTRIBUTE(buf, len, d2i_func, free_func) \
SKM_ASN1_seq_unpack(X509_ATTRIBUTE, (buf), (len), (d2i_func), (free_func)) SKM_ASN1_seq_unpack(X509_ATTRIBUTE, (buf), (len), (d2i_func), (free_func))
#define d2i_ASN1_SET_OF_X509_CRL(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \ #define d2i_ASN1_SET_OF_X509_CRL(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
SKM_ASN1_SET_OF_d2i(X509_CRL, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) SKM_ASN1_SET_OF_d2i(X509_CRL, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class))
#define i2d_ASN1_SET_OF_X509_CRL(st, pp, i2d_func, ex_tag, ex_class, is_set) \ #define i2d_ASN1_SET_OF_X509_CRL(st, pp, i2d_func, ex_tag, ex_class, is_set) \
SKM_ASN1_SET_OF_i2d(X509_CRL, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set)) SKM_ASN1_SET_OF_i2d(X509_CRL, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
#define ASN1_seq_pack_X509_CRL(st, i2d_func, buf, len) \ #define ASN1_seq_pack_X509_CRL(st, i2d_func, buf, len) \
SKM_ASN1_seq_pack(X509_CRL, (st), (i2d_func), (buf), (len)) SKM_ASN1_seq_pack(X509_CRL, (st), (i2d_func), (buf), (len))
#define ASN1_seq_unpack_X509_CRL(buf, len, d2i_func, free_func) \ #define ASN1_seq_unpack_X509_CRL(buf, len, d2i_func, free_func) \
SKM_ASN1_seq_unpack(X509_CRL, (buf), (len), (d2i_func), (free_func)) SKM_ASN1_seq_unpack(X509_CRL, (buf), (len), (d2i_func), (free_func))
#define d2i_ASN1_SET_OF_X509_EXTENSION(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \ #define d2i_ASN1_SET_OF_X509_EXTENSION(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
SKM_ASN1_SET_OF_d2i(X509_EXTENSION, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) SKM_ASN1_SET_OF_d2i(X509_EXTENSION, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class))
#define i2d_ASN1_SET_OF_X509_EXTENSION(st, pp, i2d_func, ex_tag, ex_class, is_set) \ #define i2d_ASN1_SET_OF_X509_EXTENSION(st, pp, i2d_func, ex_tag, ex_class, is_set) \
SKM_ASN1_SET_OF_i2d(X509_EXTENSION, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set)) SKM_ASN1_SET_OF_i2d(X509_EXTENSION, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
#define ASN1_seq_pack_X509_EXTENSION(st, i2d_func, buf, len) \ #define ASN1_seq_pack_X509_EXTENSION(st, i2d_func, buf, len) \
SKM_ASN1_seq_pack(X509_EXTENSION, (st), (i2d_func), (buf), (len)) SKM_ASN1_seq_pack(X509_EXTENSION, (st), (i2d_func), (buf), (len))
#define ASN1_seq_unpack_X509_EXTENSION(buf, len, d2i_func, free_func) \ #define ASN1_seq_unpack_X509_EXTENSION(buf, len, d2i_func, free_func) \
SKM_ASN1_seq_unpack(X509_EXTENSION, (buf), (len), (d2i_func), (free_func)) SKM_ASN1_seq_unpack(X509_EXTENSION, (buf), (len), (d2i_func), (free_func))
#define d2i_ASN1_SET_OF_X509_NAME_ENTRY(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \ #define d2i_ASN1_SET_OF_X509_NAME_ENTRY(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
SKM_ASN1_SET_OF_d2i(X509_NAME_ENTRY, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) SKM_ASN1_SET_OF_d2i(X509_NAME_ENTRY, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class))
#define i2d_ASN1_SET_OF_X509_NAME_ENTRY(st, pp, i2d_func, ex_tag, ex_class, is_set) \ #define i2d_ASN1_SET_OF_X509_NAME_ENTRY(st, pp, i2d_func, ex_tag, ex_class, is_set) \
SKM_ASN1_SET_OF_i2d(X509_NAME_ENTRY, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set)) SKM_ASN1_SET_OF_i2d(X509_NAME_ENTRY, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
#define ASN1_seq_pack_X509_NAME_ENTRY(st, i2d_func, buf, len) \ #define ASN1_seq_pack_X509_NAME_ENTRY(st, i2d_func, buf, len) \
SKM_ASN1_seq_pack(X509_NAME_ENTRY, (st), (i2d_func), (buf), (len)) SKM_ASN1_seq_pack(X509_NAME_ENTRY, (st), (i2d_func), (buf), (len))
#define ASN1_seq_unpack_X509_NAME_ENTRY(buf, len, d2i_func, free_func) \ #define ASN1_seq_unpack_X509_NAME_ENTRY(buf, len, d2i_func, free_func) \
SKM_ASN1_seq_unpack(X509_NAME_ENTRY, (buf), (len), (d2i_func), (free_func)) SKM_ASN1_seq_unpack(X509_NAME_ENTRY, (buf), (len), (d2i_func), (free_func))
#define d2i_ASN1_SET_OF_X509_REVOKED(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \ #define d2i_ASN1_SET_OF_X509_REVOKED(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
SKM_ASN1_SET_OF_d2i(X509_REVOKED, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) SKM_ASN1_SET_OF_d2i(X509_REVOKED, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class))
#define i2d_ASN1_SET_OF_X509_REVOKED(st, pp, i2d_func, ex_tag, ex_class, is_set) \ #define i2d_ASN1_SET_OF_X509_REVOKED(st, pp, i2d_func, ex_tag, ex_class, is_set) \
SKM_ASN1_SET_OF_i2d(X509_REVOKED, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set)) SKM_ASN1_SET_OF_i2d(X509_REVOKED, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
#define ASN1_seq_pack_X509_REVOKED(st, i2d_func, buf, len) \ #define ASN1_seq_pack_X509_REVOKED(st, i2d_func, buf, len) \
SKM_ASN1_seq_pack(X509_REVOKED, (st), (i2d_func), (buf), (len)) SKM_ASN1_seq_pack(X509_REVOKED, (st), (i2d_func), (buf), (len))
#define ASN1_seq_unpack_X509_REVOKED(buf, len, d2i_func, free_func) \ #define ASN1_seq_unpack_X509_REVOKED(buf, len, d2i_func, free_func) \
SKM_ASN1_seq_unpack(X509_REVOKED, (buf), (len), (d2i_func), (free_func)) SKM_ASN1_seq_unpack(X509_REVOKED, (buf), (len), (d2i_func), (free_func))
#define PKCS12_decrypt_d2i_PKCS12_SAFEBAG(algor, d2i_func, free_func, pass, passlen, oct, seq) \ #define PKCS12_decrypt_d2i_PKCS12_SAFEBAG(algor, d2i_func, free_func, pass, passlen, oct, seq) \
SKM_PKCS12_decrypt_d2i(PKCS12_SAFEBAG, (algor), (d2i_func), (free_func), (pass), (passlen), (oct), (seq)) SKM_PKCS12_decrypt_d2i(PKCS12_SAFEBAG, (algor), (d2i_func), (free_func), (pass), (passlen), (oct), (seq))
#define PKCS12_decrypt_d2i_PKCS7(algor, d2i_func, free_func, pass, passlen, oct, seq) \ #define PKCS12_decrypt_d2i_PKCS7(algor, d2i_func, free_func, pass, passlen, oct, seq) \
SKM_PKCS12_decrypt_d2i(PKCS7, (algor), (d2i_func), (free_func), (pass), (passlen), (oct), (seq)) SKM_PKCS12_decrypt_d2i(PKCS7, (algor), (d2i_func), (free_func), (pass), (passlen), (oct), (seq))
/* End of util/mkstack.pl block, you may now edit :-) */ /* End of util/mkstack.pl block, you may now edit :-) */
#endif /* !defined HEADER_SAFESTACK_H */ #endif /* !defined HEADER_SAFESTACK_H */
dep/include/openssl/sha.h
+38 -36
View File
@@ -90,22 +90,25 @@ extern "C" {
#define SHA_LONG unsigned int #define SHA_LONG unsigned int
#endif #endif
#define SHA_LBLOCK 16 #define SHA_LBLOCK 16
#define SHA_CBLOCK (SHA_LBLOCK*4) /* SHA treats input data as a #define SHA_CBLOCK (SHA_LBLOCK*4) /* SHA treats input data as a
* contiguous array of 32 bit * contiguous array of 32 bit
* wide big-endian values. */ * wide big-endian values. */
#define SHA_LAST_BLOCK (SHA_CBLOCK-8) #define SHA_LAST_BLOCK (SHA_CBLOCK-8)
#define SHA_DIGEST_LENGTH 20 #define SHA_DIGEST_LENGTH 20
typedef struct SHAstate_st typedef struct SHAstate_st
{ {
SHA_LONG h0,h1,h2,h3,h4; SHA_LONG h0,h1,h2,h3,h4;
SHA_LONG Nl,Nh; SHA_LONG Nl,Nh;
SHA_LONG data[SHA_LBLOCK]; SHA_LONG data[SHA_LBLOCK];
unsigned int num; unsigned int num;
} SHA_CTX; } SHA_CTX;
#ifndef OPENSSL_NO_SHA0 #ifndef OPENSSL_NO_SHA0
#ifdef OPENSSL_FIPS
int private_SHA_Init(SHA_CTX *c);
#endif
int SHA_Init(SHA_CTX *c); int SHA_Init(SHA_CTX *c);
int SHA_Update(SHA_CTX *c, const void *data, size_t len); int SHA_Update(SHA_CTX *c, const void *data, size_t len);
int SHA_Final(unsigned char *md, SHA_CTX *c); int SHA_Final(unsigned char *md, SHA_CTX *c);
@@ -120,19 +123,19 @@ unsigned char *SHA1(const unsigned char *d, size_t n, unsigned char *md);
void SHA1_Transform(SHA_CTX *c, const unsigned char *data); void SHA1_Transform(SHA_CTX *c, const unsigned char *data);
#endif #endif
#define SHA256_CBLOCK (SHA_LBLOCK*4) /* SHA-256 treats input data as a #define SHA256_CBLOCK (SHA_LBLOCK*4) /* SHA-256 treats input data as a
* contiguous array of 32 bit * contiguous array of 32 bit
* wide big-endian values. */ * wide big-endian values. */
#define SHA224_DIGEST_LENGTH 28 #define SHA224_DIGEST_LENGTH 28
#define SHA256_DIGEST_LENGTH 32 #define SHA256_DIGEST_LENGTH 32
typedef struct SHA256state_st typedef struct SHA256state_st
{ {
SHA_LONG h[8]; SHA_LONG h[8];
SHA_LONG Nl,Nh; SHA_LONG Nl,Nh;
SHA_LONG data[SHA_LBLOCK]; SHA_LONG data[SHA_LBLOCK];
unsigned int num,md_len; unsigned int num,md_len;
} SHA256_CTX; } SHA256_CTX;
#ifndef OPENSSL_NO_SHA256 #ifndef OPENSSL_NO_SHA256
int SHA224_Init(SHA256_CTX *c); int SHA224_Init(SHA256_CTX *c);
@@ -146,8 +149,8 @@ unsigned char *SHA256(const unsigned char *d, size_t n,unsigned char *md);
void SHA256_Transform(SHA256_CTX *c, const unsigned char *data); void SHA256_Transform(SHA256_CTX *c, const unsigned char *data);
#endif #endif
#define SHA384_DIGEST_LENGTH 48 #define SHA384_DIGEST_LENGTH 48
#define SHA512_DIGEST_LENGTH 64 #define SHA512_DIGEST_LENGTH 64
#ifndef OPENSSL_NO_SHA512 #ifndef OPENSSL_NO_SHA512
/* /*
@@ -155,9 +158,9 @@ void SHA256_Transform(SHA256_CTX *c, const unsigned char *data);
* being exactly 64-bit wide. See Implementation Notes in sha512.c * being exactly 64-bit wide. See Implementation Notes in sha512.c
* for further details. * for further details.
*/ */
#define SHA512_CBLOCK (SHA_LBLOCK*8) /* SHA-512 treats input data as a #define SHA512_CBLOCK (SHA_LBLOCK*8) /* SHA-512 treats input data as a
* contiguous array of 64 bit * contiguous array of 64 bit
* wide big-endian values. */ * wide big-endian values. */
#if (defined(_WIN32) || defined(_WIN64)) && !defined(__MINGW32__) #if (defined(_WIN32) || defined(_WIN64)) && !defined(__MINGW32__)
#define SHA_LONG64 unsigned __int64 #define SHA_LONG64 unsigned __int64
#define U64(C) C##UI64 #define U64(C) C##UI64
@@ -170,15 +173,15 @@ void SHA256_Transform(SHA256_CTX *c, const unsigned char *data);
#endif #endif
typedef struct SHA512state_st typedef struct SHA512state_st
{ {
SHA_LONG64 h[8]; SHA_LONG64 h[8];
SHA_LONG64 Nl,Nh; SHA_LONG64 Nl,Nh;
union { union {
SHA_LONG64 d[SHA_LBLOCK]; SHA_LONG64 d[SHA_LBLOCK];
unsigned char p[SHA512_CBLOCK]; unsigned char p[SHA512_CBLOCK];
} u; } u;
unsigned int num,md_len; unsigned int num,md_len;
} SHA512_CTX; } SHA512_CTX;
#endif #endif
#ifndef OPENSSL_NO_SHA512 #ifndef OPENSSL_NO_SHA512
@@ -198,4 +201,3 @@ void SHA512_Transform(SHA512_CTX *c, const unsigned char *data);
#endif #endif
#endif #endif
dep/include/openssl/ssl.h
+1225 -1111
View File
File diff suppressed because it is too large Load Diff
dep/include/openssl/ssl3.h
+322 -313
View File
@@ -129,428 +129,437 @@
extern "C" { extern "C" {
#endif #endif
#define SSL3_CK_RSA_NULL_MD5 0x03000001 #define SSL3_CK_RSA_NULL_MD5 0x03000001
#define SSL3_CK_RSA_NULL_SHA 0x03000002 #define SSL3_CK_RSA_NULL_SHA 0x03000002
#define SSL3_CK_RSA_RC4_40_MD5 0x03000003 #define SSL3_CK_RSA_RC4_40_MD5 0x03000003
#define SSL3_CK_RSA_RC4_128_MD5 0x03000004 #define SSL3_CK_RSA_RC4_128_MD5 0x03000004
#define SSL3_CK_RSA_RC4_128_SHA 0x03000005 #define SSL3_CK_RSA_RC4_128_SHA 0x03000005
#define SSL3_CK_RSA_RC2_40_MD5 0x03000006 #define SSL3_CK_RSA_RC2_40_MD5 0x03000006
#define SSL3_CK_RSA_IDEA_128_SHA 0x03000007 #define SSL3_CK_RSA_IDEA_128_SHA 0x03000007
#define SSL3_CK_RSA_DES_40_CBC_SHA 0x03000008 #define SSL3_CK_RSA_DES_40_CBC_SHA 0x03000008
#define SSL3_CK_RSA_DES_64_CBC_SHA 0x03000009 #define SSL3_CK_RSA_DES_64_CBC_SHA 0x03000009
#define SSL3_CK_RSA_DES_192_CBC3_SHA 0x0300000A #define SSL3_CK_RSA_DES_192_CBC3_SHA 0x0300000A
#define SSL3_CK_DH_DSS_DES_40_CBC_SHA 0x0300000B #define SSL3_CK_DH_DSS_DES_40_CBC_SHA 0x0300000B
#define SSL3_CK_DH_DSS_DES_64_CBC_SHA 0x0300000C #define SSL3_CK_DH_DSS_DES_64_CBC_SHA 0x0300000C
#define SSL3_CK_DH_DSS_DES_192_CBC3_SHA 0x0300000D #define SSL3_CK_DH_DSS_DES_192_CBC3_SHA 0x0300000D
#define SSL3_CK_DH_RSA_DES_40_CBC_SHA 0x0300000E #define SSL3_CK_DH_RSA_DES_40_CBC_SHA 0x0300000E
#define SSL3_CK_DH_RSA_DES_64_CBC_SHA 0x0300000F #define SSL3_CK_DH_RSA_DES_64_CBC_SHA 0x0300000F
#define SSL3_CK_DH_RSA_DES_192_CBC3_SHA 0x03000010 #define SSL3_CK_DH_RSA_DES_192_CBC3_SHA 0x03000010
#define SSL3_CK_EDH_DSS_DES_40_CBC_SHA 0x03000011 #define SSL3_CK_EDH_DSS_DES_40_CBC_SHA 0x03000011
#define SSL3_CK_EDH_DSS_DES_64_CBC_SHA 0x03000012 #define SSL3_CK_EDH_DSS_DES_64_CBC_SHA 0x03000012
#define SSL3_CK_EDH_DSS_DES_192_CBC3_SHA 0x03000013 #define SSL3_CK_EDH_DSS_DES_192_CBC3_SHA 0x03000013
#define SSL3_CK_EDH_RSA_DES_40_CBC_SHA 0x03000014 #define SSL3_CK_EDH_RSA_DES_40_CBC_SHA 0x03000014
#define SSL3_CK_EDH_RSA_DES_64_CBC_SHA 0x03000015 #define SSL3_CK_EDH_RSA_DES_64_CBC_SHA 0x03000015
#define SSL3_CK_EDH_RSA_DES_192_CBC3_SHA 0x03000016 #define SSL3_CK_EDH_RSA_DES_192_CBC3_SHA 0x03000016
#define SSL3_CK_ADH_RC4_40_MD5 0x03000017 #define SSL3_CK_ADH_RC4_40_MD5 0x03000017
#define SSL3_CK_ADH_RC4_128_MD5 0x03000018 #define SSL3_CK_ADH_RC4_128_MD5 0x03000018
#define SSL3_CK_ADH_DES_40_CBC_SHA 0x03000019 #define SSL3_CK_ADH_DES_40_CBC_SHA 0x03000019
#define SSL3_CK_ADH_DES_64_CBC_SHA 0x0300001A #define SSL3_CK_ADH_DES_64_CBC_SHA 0x0300001A
#define SSL3_CK_ADH_DES_192_CBC_SHA 0x0300001B #define SSL3_CK_ADH_DES_192_CBC_SHA 0x0300001B
#define SSL3_CK_FZA_DMS_NULL_SHA 0x0300001C #define SSL3_CK_FZA_DMS_NULL_SHA 0x0300001C
#define SSL3_CK_FZA_DMS_FZA_SHA 0x0300001D #define SSL3_CK_FZA_DMS_FZA_SHA 0x0300001D
#if 0 /* Because it clashes with KRB5, is never used any more, and is safe #if 0 /* Because it clashes with KRB5, is never used any more, and is safe
to remove according to David Hopwood <david.hopwood@zetnet.co.uk> to remove according to David Hopwood <david.hopwood@zetnet.co.uk>
of the ietf-tls list */ of the ietf-tls list */
#define SSL3_CK_FZA_DMS_RC4_SHA 0x0300001E #define SSL3_CK_FZA_DMS_RC4_SHA 0x0300001E
#endif #endif
/* VRS Additional Kerberos5 entries /* VRS Additional Kerberos5 entries
*/ */
#define SSL3_CK_KRB5_DES_64_CBC_SHA 0x0300001E #define SSL3_CK_KRB5_DES_64_CBC_SHA 0x0300001E
#define SSL3_CK_KRB5_DES_192_CBC3_SHA 0x0300001F #define SSL3_CK_KRB5_DES_192_CBC3_SHA 0x0300001F
#define SSL3_CK_KRB5_RC4_128_SHA 0x03000020 #define SSL3_CK_KRB5_RC4_128_SHA 0x03000020
#define SSL3_CK_KRB5_IDEA_128_CBC_SHA 0x03000021 #define SSL3_CK_KRB5_IDEA_128_CBC_SHA 0x03000021
#define SSL3_CK_KRB5_DES_64_CBC_MD5 0x03000022 #define SSL3_CK_KRB5_DES_64_CBC_MD5 0x03000022
#define SSL3_CK_KRB5_DES_192_CBC3_MD5 0x03000023 #define SSL3_CK_KRB5_DES_192_CBC3_MD5 0x03000023
#define SSL3_CK_KRB5_RC4_128_MD5 0x03000024 #define SSL3_CK_KRB5_RC4_128_MD5 0x03000024
#define SSL3_CK_KRB5_IDEA_128_CBC_MD5 0x03000025 #define SSL3_CK_KRB5_IDEA_128_CBC_MD5 0x03000025
#define SSL3_CK_KRB5_DES_40_CBC_SHA 0x03000026 #define SSL3_CK_KRB5_DES_40_CBC_SHA 0x03000026
#define SSL3_CK_KRB5_RC2_40_CBC_SHA 0x03000027 #define SSL3_CK_KRB5_RC2_40_CBC_SHA 0x03000027
#define SSL3_CK_KRB5_RC4_40_SHA 0x03000028 #define SSL3_CK_KRB5_RC4_40_SHA 0x03000028
#define SSL3_CK_KRB5_DES_40_CBC_MD5 0x03000029 #define SSL3_CK_KRB5_DES_40_CBC_MD5 0x03000029
#define SSL3_CK_KRB5_RC2_40_CBC_MD5 0x0300002A #define SSL3_CK_KRB5_RC2_40_CBC_MD5 0x0300002A
#define SSL3_CK_KRB5_RC4_40_MD5 0x0300002B #define SSL3_CK_KRB5_RC4_40_MD5 0x0300002B
#define SSL3_TXT_RSA_NULL_MD5 "NULL-MD5" #define SSL3_TXT_RSA_NULL_MD5 "NULL-MD5"
#define SSL3_TXT_RSA_NULL_SHA "NULL-SHA" #define SSL3_TXT_RSA_NULL_SHA "NULL-SHA"
#define SSL3_TXT_RSA_RC4_40_MD5 "EXP-RC4-MD5" #define SSL3_TXT_RSA_RC4_40_MD5 "EXP-RC4-MD5"
#define SSL3_TXT_RSA_RC4_128_MD5 "RC4-MD5" #define SSL3_TXT_RSA_RC4_128_MD5 "RC4-MD5"
#define SSL3_TXT_RSA_RC4_128_SHA "RC4-SHA" #define SSL3_TXT_RSA_RC4_128_SHA "RC4-SHA"
#define SSL3_TXT_RSA_RC2_40_MD5 "EXP-RC2-CBC-MD5" #define SSL3_TXT_RSA_RC2_40_MD5 "EXP-RC2-CBC-MD5"
#define SSL3_TXT_RSA_IDEA_128_SHA "IDEA-CBC-SHA" #define SSL3_TXT_RSA_IDEA_128_SHA "IDEA-CBC-SHA"
#define SSL3_TXT_RSA_DES_40_CBC_SHA "EXP-DES-CBC-SHA" #define SSL3_TXT_RSA_DES_40_CBC_SHA "EXP-DES-CBC-SHA"
#define SSL3_TXT_RSA_DES_64_CBC_SHA "DES-CBC-SHA" #define SSL3_TXT_RSA_DES_64_CBC_SHA "DES-CBC-SHA"
#define SSL3_TXT_RSA_DES_192_CBC3_SHA "DES-CBC3-SHA" #define SSL3_TXT_RSA_DES_192_CBC3_SHA "DES-CBC3-SHA"
#define SSL3_TXT_DH_DSS_DES_40_CBC_SHA "EXP-DH-DSS-DES-CBC-SHA" #define SSL3_TXT_DH_DSS_DES_40_CBC_SHA "EXP-DH-DSS-DES-CBC-SHA"
#define SSL3_TXT_DH_DSS_DES_64_CBC_SHA "DH-DSS-DES-CBC-SHA" #define SSL3_TXT_DH_DSS_DES_64_CBC_SHA "DH-DSS-DES-CBC-SHA"
#define SSL3_TXT_DH_DSS_DES_192_CBC3_SHA "DH-DSS-DES-CBC3-SHA" #define SSL3_TXT_DH_DSS_DES_192_CBC3_SHA "DH-DSS-DES-CBC3-SHA"
#define SSL3_TXT_DH_RSA_DES_40_CBC_SHA "EXP-DH-RSA-DES-CBC-SHA" #define SSL3_TXT_DH_RSA_DES_40_CBC_SHA "EXP-DH-RSA-DES-CBC-SHA"
#define SSL3_TXT_DH_RSA_DES_64_CBC_SHA "DH-RSA-DES-CBC-SHA" #define SSL3_TXT_DH_RSA_DES_64_CBC_SHA "DH-RSA-DES-CBC-SHA"
#define SSL3_TXT_DH_RSA_DES_192_CBC3_SHA "DH-RSA-DES-CBC3-SHA" #define SSL3_TXT_DH_RSA_DES_192_CBC3_SHA "DH-RSA-DES-CBC3-SHA"
#define SSL3_TXT_EDH_DSS_DES_40_CBC_SHA "EXP-EDH-DSS-DES-CBC-SHA" #define SSL3_TXT_EDH_DSS_DES_40_CBC_SHA "EXP-EDH-DSS-DES-CBC-SHA"
#define SSL3_TXT_EDH_DSS_DES_64_CBC_SHA "EDH-DSS-DES-CBC-SHA" #define SSL3_TXT_EDH_DSS_DES_64_CBC_SHA "EDH-DSS-DES-CBC-SHA"
#define SSL3_TXT_EDH_DSS_DES_192_CBC3_SHA "EDH-DSS-DES-CBC3-SHA" #define SSL3_TXT_EDH_DSS_DES_192_CBC3_SHA "EDH-DSS-DES-CBC3-SHA"
#define SSL3_TXT_EDH_RSA_DES_40_CBC_SHA "EXP-EDH-RSA-DES-CBC-SHA" #define SSL3_TXT_EDH_RSA_DES_40_CBC_SHA "EXP-EDH-RSA-DES-CBC-SHA"
#define SSL3_TXT_EDH_RSA_DES_64_CBC_SHA "EDH-RSA-DES-CBC-SHA" #define SSL3_TXT_EDH_RSA_DES_64_CBC_SHA "EDH-RSA-DES-CBC-SHA"
#define SSL3_TXT_EDH_RSA_DES_192_CBC3_SHA "EDH-RSA-DES-CBC3-SHA" #define SSL3_TXT_EDH_RSA_DES_192_CBC3_SHA "EDH-RSA-DES-CBC3-SHA"
#define SSL3_TXT_ADH_RC4_40_MD5 "EXP-ADH-RC4-MD5" #define SSL3_TXT_ADH_RC4_40_MD5 "EXP-ADH-RC4-MD5"
#define SSL3_TXT_ADH_RC4_128_MD5 "ADH-RC4-MD5" #define SSL3_TXT_ADH_RC4_128_MD5 "ADH-RC4-MD5"
#define SSL3_TXT_ADH_DES_40_CBC_SHA "EXP-ADH-DES-CBC-SHA" #define SSL3_TXT_ADH_DES_40_CBC_SHA "EXP-ADH-DES-CBC-SHA"
#define SSL3_TXT_ADH_DES_64_CBC_SHA "ADH-DES-CBC-SHA" #define SSL3_TXT_ADH_DES_64_CBC_SHA "ADH-DES-CBC-SHA"
#define SSL3_TXT_ADH_DES_192_CBC_SHA "ADH-DES-CBC3-SHA" #define SSL3_TXT_ADH_DES_192_CBC_SHA "ADH-DES-CBC3-SHA"
#define SSL3_TXT_FZA_DMS_NULL_SHA "FZA-NULL-SHA" #define SSL3_TXT_FZA_DMS_NULL_SHA "FZA-NULL-SHA"
#define SSL3_TXT_FZA_DMS_FZA_SHA "FZA-FZA-CBC-SHA" #define SSL3_TXT_FZA_DMS_FZA_SHA "FZA-FZA-CBC-SHA"
#define SSL3_TXT_FZA_DMS_RC4_SHA "FZA-RC4-SHA" #define SSL3_TXT_FZA_DMS_RC4_SHA "FZA-RC4-SHA"
#define SSL3_TXT_KRB5_DES_64_CBC_SHA "KRB5-DES-CBC-SHA" #define SSL3_TXT_KRB5_DES_64_CBC_SHA "KRB5-DES-CBC-SHA"
#define SSL3_TXT_KRB5_DES_192_CBC3_SHA "KRB5-DES-CBC3-SHA" #define SSL3_TXT_KRB5_DES_192_CBC3_SHA "KRB5-DES-CBC3-SHA"
#define SSL3_TXT_KRB5_RC4_128_SHA "KRB5-RC4-SHA" #define SSL3_TXT_KRB5_RC4_128_SHA "KRB5-RC4-SHA"
#define SSL3_TXT_KRB5_IDEA_128_CBC_SHA "KRB5-IDEA-CBC-SHA" #define SSL3_TXT_KRB5_IDEA_128_CBC_SHA "KRB5-IDEA-CBC-SHA"
#define SSL3_TXT_KRB5_DES_64_CBC_MD5 "KRB5-DES-CBC-MD5" #define SSL3_TXT_KRB5_DES_64_CBC_MD5 "KRB5-DES-CBC-MD5"
#define SSL3_TXT_KRB5_DES_192_CBC3_MD5 "KRB5-DES-CBC3-MD5" #define SSL3_TXT_KRB5_DES_192_CBC3_MD5 "KRB5-DES-CBC3-MD5"
#define SSL3_TXT_KRB5_RC4_128_MD5 "KRB5-RC4-MD5" #define SSL3_TXT_KRB5_RC4_128_MD5 "KRB5-RC4-MD5"
#define SSL3_TXT_KRB5_IDEA_128_CBC_MD5 "KRB5-IDEA-CBC-MD5" #define SSL3_TXT_KRB5_IDEA_128_CBC_MD5 "KRB5-IDEA-CBC-MD5"
#define SSL3_TXT_KRB5_DES_40_CBC_SHA "EXP-KRB5-DES-CBC-SHA" #define SSL3_TXT_KRB5_DES_40_CBC_SHA "EXP-KRB5-DES-CBC-SHA"
#define SSL3_TXT_KRB5_RC2_40_CBC_SHA "EXP-KRB5-RC2-CBC-SHA" #define SSL3_TXT_KRB5_RC2_40_CBC_SHA "EXP-KRB5-RC2-CBC-SHA"
#define SSL3_TXT_KRB5_RC4_40_SHA "EXP-KRB5-RC4-SHA" #define SSL3_TXT_KRB5_RC4_40_SHA "EXP-KRB5-RC4-SHA"
#define SSL3_TXT_KRB5_DES_40_CBC_MD5 "EXP-KRB5-DES-CBC-MD5" #define SSL3_TXT_KRB5_DES_40_CBC_MD5 "EXP-KRB5-DES-CBC-MD5"
#define SSL3_TXT_KRB5_RC2_40_CBC_MD5 "EXP-KRB5-RC2-CBC-MD5" #define SSL3_TXT_KRB5_RC2_40_CBC_MD5 "EXP-KRB5-RC2-CBC-MD5"
#define SSL3_TXT_KRB5_RC4_40_MD5 "EXP-KRB5-RC4-MD5" #define SSL3_TXT_KRB5_RC4_40_MD5 "EXP-KRB5-RC4-MD5"
#define SSL3_SSL_SESSION_ID_LENGTH 32 #define SSL3_SSL_SESSION_ID_LENGTH 32
#define SSL3_MAX_SSL_SESSION_ID_LENGTH 32 #define SSL3_MAX_SSL_SESSION_ID_LENGTH 32
#define SSL3_MASTER_SECRET_SIZE 48 #define SSL3_MASTER_SECRET_SIZE 48
#define SSL3_RANDOM_SIZE 32 #define SSL3_RANDOM_SIZE 32
#define SSL3_SESSION_ID_SIZE 32 #define SSL3_SESSION_ID_SIZE 32
#define SSL3_RT_HEADER_LENGTH 5 #define SSL3_RT_HEADER_LENGTH 5
/* Due to MS stuffing up, this can change.... */ /* Due to MS stuffing up, this can change.... */
#if defined(OPENSSL_SYS_WIN16) || \ #if defined(OPENSSL_SYS_WIN16) || \
(defined(OPENSSL_SYS_MSDOS) && !defined(OPENSSL_SYS_WIN32)) (defined(OPENSSL_SYS_MSDOS) && !defined(OPENSSL_SYS_WIN32))
#define SSL3_RT_MAX_EXTRA (14000) #define SSL3_RT_MAX_EXTRA (14000)
#else #else
#define SSL3_RT_MAX_EXTRA (16384) #define SSL3_RT_MAX_EXTRA (16384)
#endif #endif
#define SSL3_RT_MAX_PLAIN_LENGTH 16384 #define SSL3_RT_MAX_PLAIN_LENGTH 16384
#ifdef OPENSSL_NO_COMP #ifdef OPENSSL_NO_COMP
#define SSL3_RT_MAX_COMPRESSED_LENGTH SSL3_RT_MAX_PLAIN_LENGTH #define SSL3_RT_MAX_COMPRESSED_LENGTH SSL3_RT_MAX_PLAIN_LENGTH
#else #else
#define SSL3_RT_MAX_COMPRESSED_LENGTH (1024+SSL3_RT_MAX_PLAIN_LENGTH) #define SSL3_RT_MAX_COMPRESSED_LENGTH (1024+SSL3_RT_MAX_PLAIN_LENGTH)
#endif #endif
#define SSL3_RT_MAX_ENCRYPTED_LENGTH (1024+SSL3_RT_MAX_COMPRESSED_LENGTH) #define SSL3_RT_MAX_ENCRYPTED_LENGTH (1024+SSL3_RT_MAX_COMPRESSED_LENGTH)
#define SSL3_RT_MAX_PACKET_SIZE (SSL3_RT_MAX_ENCRYPTED_LENGTH+SSL3_RT_HEADER_LENGTH) #define SSL3_RT_MAX_PACKET_SIZE (SSL3_RT_MAX_ENCRYPTED_LENGTH+SSL3_RT_HEADER_LENGTH)
#define SSL3_RT_MAX_DATA_SIZE (1024*1024) #define SSL3_RT_MAX_DATA_SIZE (1024*1024)
#define SSL3_MD_CLIENT_FINISHED_CONST "\x43\x4C\x4E\x54" #define SSL3_MD_CLIENT_FINISHED_CONST "\x43\x4C\x4E\x54"
#define SSL3_MD_SERVER_FINISHED_CONST "\x53\x52\x56\x52" #define SSL3_MD_SERVER_FINISHED_CONST "\x53\x52\x56\x52"
#define SSL3_VERSION 0x0300 #define SSL3_VERSION 0x0300
#define SSL3_VERSION_MAJOR 0x03 #define SSL3_VERSION_MAJOR 0x03
#define SSL3_VERSION_MINOR 0x00 #define SSL3_VERSION_MINOR 0x00
#define SSL3_RT_CHANGE_CIPHER_SPEC 20 #define SSL3_RT_CHANGE_CIPHER_SPEC 20
#define SSL3_RT_ALERT 21 #define SSL3_RT_ALERT 21
#define SSL3_RT_HANDSHAKE 22 #define SSL3_RT_HANDSHAKE 22
#define SSL3_RT_APPLICATION_DATA 23 #define SSL3_RT_APPLICATION_DATA 23
#define SSL3_AL_WARNING 1 #define SSL3_AL_WARNING 1
#define SSL3_AL_FATAL 2 #define SSL3_AL_FATAL 2
#define SSL3_AD_CLOSE_NOTIFY 0 #define SSL3_AD_CLOSE_NOTIFY 0
#define SSL3_AD_UNEXPECTED_MESSAGE 10 /* fatal */ #define SSL3_AD_UNEXPECTED_MESSAGE 10 /* fatal */
#define SSL3_AD_BAD_RECORD_MAC 20 /* fatal */ #define SSL3_AD_BAD_RECORD_MAC 20 /* fatal */
#define SSL3_AD_DECOMPRESSION_FAILURE 30 /* fatal */ #define SSL3_AD_DECOMPRESSION_FAILURE 30 /* fatal */
#define SSL3_AD_HANDSHAKE_FAILURE 40 /* fatal */ #define SSL3_AD_HANDSHAKE_FAILURE 40 /* fatal */
#define SSL3_AD_NO_CERTIFICATE 41 #define SSL3_AD_NO_CERTIFICATE 41
#define SSL3_AD_BAD_CERTIFICATE 42 #define SSL3_AD_BAD_CERTIFICATE 42
#define SSL3_AD_UNSUPPORTED_CERTIFICATE 43 #define SSL3_AD_UNSUPPORTED_CERTIFICATE 43
#define SSL3_AD_CERTIFICATE_REVOKED 44 #define SSL3_AD_CERTIFICATE_REVOKED 44
#define SSL3_AD_CERTIFICATE_EXPIRED 45 #define SSL3_AD_CERTIFICATE_EXPIRED 45
#define SSL3_AD_CERTIFICATE_UNKNOWN 46 #define SSL3_AD_CERTIFICATE_UNKNOWN 46
#define SSL3_AD_ILLEGAL_PARAMETER 47 /* fatal */ #define SSL3_AD_ILLEGAL_PARAMETER 47 /* fatal */
typedef struct ssl3_record_st typedef struct ssl3_record_st
{ {
/*r */ int type; /* type of record */ /*r */ int type; /* type of record */
/*rw*/ unsigned int length; /* How many bytes available */ /*rw*/ unsigned int length; /* How many bytes available */
/*r */ unsigned int off; /* read/write offset into 'buf' */ /*r */ unsigned int off; /* read/write offset into 'buf' */
/*rw*/ unsigned char *data; /* pointer to the record data */ /*rw*/ unsigned char *data; /* pointer to the record data */
/*rw*/ unsigned char *input; /* where the decode bytes are */ /*rw*/ unsigned char *input; /* where the decode bytes are */
/*r */ unsigned char *comp; /* only used with decompression - malloc()ed */ /*r */ unsigned char *comp; /* only used with decompression - malloc()ed */
/*r */ unsigned long epoch; /* epoch number, needed by DTLS1 */ /*r */ unsigned long epoch; /* epoch number, needed by DTLS1 */
/*r */ PQ_64BIT seq_num; /* sequence number, needed by DTLS1 */ /*r */ PQ_64BIT seq_num; /* sequence number, needed by DTLS1 */
} SSL3_RECORD; } SSL3_RECORD;
typedef struct ssl3_buffer_st typedef struct ssl3_buffer_st
{ {
unsigned char *buf; /* at least SSL3_RT_MAX_PACKET_SIZE bytes, unsigned char *buf; /* at least SSL3_RT_MAX_PACKET_SIZE bytes,
* see ssl3_setup_buffers() */ * see ssl3_setup_buffers() */
size_t len; /* buffer size */ size_t len; /* buffer size */
int offset; /* where to 'copy from' */ int offset; /* where to 'copy from' */
int left; /* how many bytes left */ int left; /* how many bytes left */
} SSL3_BUFFER; } SSL3_BUFFER;
#define SSL3_CT_RSA_SIGN 1 #define SSL3_CT_RSA_SIGN 1
#define SSL3_CT_DSS_SIGN 2 #define SSL3_CT_DSS_SIGN 2
#define SSL3_CT_RSA_FIXED_DH 3 #define SSL3_CT_RSA_FIXED_DH 3
#define SSL3_CT_DSS_FIXED_DH 4 #define SSL3_CT_DSS_FIXED_DH 4
#define SSL3_CT_RSA_EPHEMERAL_DH 5 #define SSL3_CT_RSA_EPHEMERAL_DH 5
#define SSL3_CT_DSS_EPHEMERAL_DH 6 #define SSL3_CT_DSS_EPHEMERAL_DH 6
#define SSL3_CT_FORTEZZA_DMS 20 #define SSL3_CT_FORTEZZA_DMS 20
/* SSL3_CT_NUMBER is used to size arrays and it must be large /* SSL3_CT_NUMBER is used to size arrays and it must be large
* enough to contain all of the cert types defined either for * enough to contain all of the cert types defined either for
* SSLv3 and TLSv1. * SSLv3 and TLSv1.
*/ */
#define SSL3_CT_NUMBER 7 #define SSL3_CT_NUMBER 7
#define SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS 0x0001 #define SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS 0x0001
#define SSL3_FLAGS_DELAY_CLIENT_FINISHED 0x0002 #define SSL3_FLAGS_DELAY_CLIENT_FINISHED 0x0002
#define SSL3_FLAGS_POP_BUFFER 0x0004 #define SSL3_FLAGS_POP_BUFFER 0x0004
#define TLS1_FLAGS_TLS_PADDING_BUG 0x0008 #define TLS1_FLAGS_TLS_PADDING_BUG 0x0008
typedef struct ssl3_state_st typedef struct ssl3_state_st
{ {
long flags; long flags;
int delay_buf_pop_ret; int delay_buf_pop_ret;
unsigned char read_sequence[8]; unsigned char read_sequence[8];
unsigned char read_mac_secret[EVP_MAX_MD_SIZE]; unsigned char read_mac_secret[EVP_MAX_MD_SIZE];
unsigned char write_sequence[8]; unsigned char write_sequence[8];
unsigned char write_mac_secret[EVP_MAX_MD_SIZE]; unsigned char write_mac_secret[EVP_MAX_MD_SIZE];
unsigned char server_random[SSL3_RANDOM_SIZE]; unsigned char server_random[SSL3_RANDOM_SIZE];
unsigned char client_random[SSL3_RANDOM_SIZE]; unsigned char client_random[SSL3_RANDOM_SIZE];
/* flags for countermeasure against known-IV weakness */ /* flags for countermeasure against known-IV weakness */
int need_empty_fragments; int need_empty_fragments;
int empty_fragment_done; int empty_fragment_done;
SSL3_BUFFER rbuf; /* read IO goes into here */ SSL3_BUFFER rbuf; /* read IO goes into here */
SSL3_BUFFER wbuf; /* write IO goes into here */ SSL3_BUFFER wbuf; /* write IO goes into here */
SSL3_RECORD rrec; /* each decoded record goes in here */ SSL3_RECORD rrec; /* each decoded record goes in here */
SSL3_RECORD wrec; /* goes out from here */ SSL3_RECORD wrec; /* goes out from here */
/* storage for Alert/Handshake protocol data received but not /* storage for Alert/Handshake protocol data received but not
* yet processed by ssl3_read_bytes: */ * yet processed by ssl3_read_bytes: */
unsigned char alert_fragment[2]; unsigned char alert_fragment[2];
unsigned int alert_fragment_len; unsigned int alert_fragment_len;
unsigned char handshake_fragment[4]; unsigned char handshake_fragment[4];
unsigned int handshake_fragment_len; unsigned int handshake_fragment_len;
/* partial write - check the numbers match */ /* partial write - check the numbers match */
unsigned int wnum; /* number of bytes sent so far */ unsigned int wnum; /* number of bytes sent so far */
int wpend_tot; /* number bytes written */ int wpend_tot; /* number bytes written */
int wpend_type; int wpend_type;
int wpend_ret; /* number of bytes submitted */ int wpend_ret; /* number of bytes submitted */
const unsigned char *wpend_buf; const unsigned char *wpend_buf;
/* used during startup, digest all incoming/outgoing packets */ /* used during startup, digest all incoming/outgoing packets */
EVP_MD_CTX finish_dgst1; EVP_MD_CTX finish_dgst1;
EVP_MD_CTX finish_dgst2; EVP_MD_CTX finish_dgst2;
/* this is set whenerver we see a change_cipher_spec message /* this is set whenerver we see a change_cipher_spec message
* come in when we are not looking for one */ * come in when we are not looking for one */
int change_cipher_spec; int change_cipher_spec;
int warn_alert; int warn_alert;
int fatal_alert; int fatal_alert;
/* we allow one fatal and one warning alert to be outstanding, /* we allow one fatal and one warning alert to be outstanding,
* send close alert via the warning alert */ * send close alert via the warning alert */
int alert_dispatch; int alert_dispatch;
unsigned char send_alert[2]; unsigned char send_alert[2];
/* This flag is set when we should renegotiate ASAP, basically when /* This flag is set when we should renegotiate ASAP, basically when
* there is no more data in the read or write buffers */ * there is no more data in the read or write buffers */
int renegotiate; int renegotiate;
int total_renegotiations; int total_renegotiations;
int num_renegotiations; int num_renegotiations;
int in_read_app_data; int in_read_app_data;
struct { struct {
/* actually only needs to be 16+20 */ /* actually only needs to be 16+20 */
unsigned char cert_verify_md[EVP_MAX_MD_SIZE*2]; unsigned char cert_verify_md[EVP_MAX_MD_SIZE*2];
/* actually only need to be 16+20 for SSLv3 and 12 for TLS */ /* actually only need to be 16+20 for SSLv3 and 12 for TLS */
unsigned char finish_md[EVP_MAX_MD_SIZE*2]; unsigned char finish_md[EVP_MAX_MD_SIZE*2];
int finish_md_len; int finish_md_len;
unsigned char peer_finish_md[EVP_MAX_MD_SIZE*2]; unsigned char peer_finish_md[EVP_MAX_MD_SIZE*2];
int peer_finish_md_len; int peer_finish_md_len;
unsigned long message_size; unsigned long message_size;
int message_type; int message_type;
/* used to hold the new cipher we are going to use */ /* used to hold the new cipher we are going to use */
SSL_CIPHER *new_cipher; SSL_CIPHER *new_cipher;
#ifndef OPENSSL_NO_DH #ifndef OPENSSL_NO_DH
DH *dh; DH *dh;
#endif #endif
#ifndef OPENSSL_NO_ECDH #ifndef OPENSSL_NO_ECDH
EC_KEY *ecdh; /* holds short lived ECDH key */ EC_KEY *ecdh; /* holds short lived ECDH key */
#endif #endif
/* used when SSL_ST_FLUSH_DATA is entered */ /* used when SSL_ST_FLUSH_DATA is entered */
int next_state; int next_state;
int reuse_message; int reuse_message;
/* used for certificate requests */ /* used for certificate requests */
int cert_req; int cert_req;
int ctype_num; int ctype_num;
char ctype[SSL3_CT_NUMBER]; char ctype[SSL3_CT_NUMBER];
STACK_OF(X509_NAME) *ca_names; STACK_OF(X509_NAME) *ca_names;
int use_rsa_tmp; int use_rsa_tmp;
int key_block_length; int key_block_length;
unsigned char *key_block; unsigned char *key_block;
const EVP_CIPHER *new_sym_enc; const EVP_CIPHER *new_sym_enc;
const EVP_MD *new_hash; const EVP_MD *new_hash;
#ifndef OPENSSL_NO_COMP #ifndef OPENSSL_NO_COMP
const SSL_COMP *new_compression; const SSL_COMP *new_compression;
#else #else
char *new_compression; char *new_compression;
#endif #endif
int cert_request; int cert_request;
} tmp; } tmp;
} SSL3_STATE; } SSL3_STATE;
/* SSLv3 */ /* SSLv3 */
/*client */ /*client */
/* extra state */ /* extra state */
#define SSL3_ST_CW_FLUSH (0x100|SSL_ST_CONNECT) #define SSL3_ST_CW_FLUSH (0x100|SSL_ST_CONNECT)
/* write to server */ /* write to server */
#define SSL3_ST_CW_CLNT_HELLO_A (0x110|SSL_ST_CONNECT) #define SSL3_ST_CW_CLNT_HELLO_A (0x110|SSL_ST_CONNECT)
#define SSL3_ST_CW_CLNT_HELLO_B (0x111|SSL_ST_CONNECT) #define SSL3_ST_CW_CLNT_HELLO_B (0x111|SSL_ST_CONNECT)
/* read from server */ /* read from server */
#define SSL3_ST_CR_SRVR_HELLO_A (0x120|SSL_ST_CONNECT) #define SSL3_ST_CR_SRVR_HELLO_A (0x120|SSL_ST_CONNECT)
#define SSL3_ST_CR_SRVR_HELLO_B (0x121|SSL_ST_CONNECT) #define SSL3_ST_CR_SRVR_HELLO_B (0x121|SSL_ST_CONNECT)
#define DTLS1_ST_CR_HELLO_VERIFY_REQUEST_A (0x126|SSL_ST_CONNECT) #define DTLS1_ST_CR_HELLO_VERIFY_REQUEST_A (0x126|SSL_ST_CONNECT)
#define DTLS1_ST_CR_HELLO_VERIFY_REQUEST_B (0x127|SSL_ST_CONNECT) #define DTLS1_ST_CR_HELLO_VERIFY_REQUEST_B (0x127|SSL_ST_CONNECT)
#define SSL3_ST_CR_CERT_A (0x130|SSL_ST_CONNECT) #define SSL3_ST_CR_CERT_A (0x130|SSL_ST_CONNECT)
#define SSL3_ST_CR_CERT_B (0x131|SSL_ST_CONNECT) #define SSL3_ST_CR_CERT_B (0x131|SSL_ST_CONNECT)
#define SSL3_ST_CR_KEY_EXCH_A (0x140|SSL_ST_CONNECT) #define SSL3_ST_CR_KEY_EXCH_A (0x140|SSL_ST_CONNECT)
#define SSL3_ST_CR_KEY_EXCH_B (0x141|SSL_ST_CONNECT) #define SSL3_ST_CR_KEY_EXCH_B (0x141|SSL_ST_CONNECT)
#define SSL3_ST_CR_CERT_REQ_A (0x150|SSL_ST_CONNECT) #define SSL3_ST_CR_CERT_REQ_A (0x150|SSL_ST_CONNECT)
#define SSL3_ST_CR_CERT_REQ_B (0x151|SSL_ST_CONNECT) #define SSL3_ST_CR_CERT_REQ_B (0x151|SSL_ST_CONNECT)
#define SSL3_ST_CR_SRVR_DONE_A (0x160|SSL_ST_CONNECT) #define SSL3_ST_CR_SRVR_DONE_A (0x160|SSL_ST_CONNECT)
#define SSL3_ST_CR_SRVR_DONE_B (0x161|SSL_ST_CONNECT) #define SSL3_ST_CR_SRVR_DONE_B (0x161|SSL_ST_CONNECT)
/* write to server */ /* write to server */
#define SSL3_ST_CW_CERT_A (0x170|SSL_ST_CONNECT) #define SSL3_ST_CW_CERT_A (0x170|SSL_ST_CONNECT)
#define SSL3_ST_CW_CERT_B (0x171|SSL_ST_CONNECT) #define SSL3_ST_CW_CERT_B (0x171|SSL_ST_CONNECT)
#define SSL3_ST_CW_CERT_C (0x172|SSL_ST_CONNECT) #define SSL3_ST_CW_CERT_C (0x172|SSL_ST_CONNECT)
#define SSL3_ST_CW_CERT_D (0x173|SSL_ST_CONNECT) #define SSL3_ST_CW_CERT_D (0x173|SSL_ST_CONNECT)
#define SSL3_ST_CW_KEY_EXCH_A (0x180|SSL_ST_CONNECT) #define SSL3_ST_CW_KEY_EXCH_A (0x180|SSL_ST_CONNECT)
#define SSL3_ST_CW_KEY_EXCH_B (0x181|SSL_ST_CONNECT) #define SSL3_ST_CW_KEY_EXCH_B (0x181|SSL_ST_CONNECT)
#define SSL3_ST_CW_CERT_VRFY_A (0x190|SSL_ST_CONNECT) #define SSL3_ST_CW_CERT_VRFY_A (0x190|SSL_ST_CONNECT)
#define SSL3_ST_CW_CERT_VRFY_B (0x191|SSL_ST_CONNECT) #define SSL3_ST_CW_CERT_VRFY_B (0x191|SSL_ST_CONNECT)
#define SSL3_ST_CW_CHANGE_A (0x1A0|SSL_ST_CONNECT) #define SSL3_ST_CW_CHANGE_A (0x1A0|SSL_ST_CONNECT)
#define SSL3_ST_CW_CHANGE_B (0x1A1|SSL_ST_CONNECT) #define SSL3_ST_CW_CHANGE_B (0x1A1|SSL_ST_CONNECT)
#define SSL3_ST_CW_FINISHED_A (0x1B0|SSL_ST_CONNECT) #define SSL3_ST_CW_FINISHED_A (0x1B0|SSL_ST_CONNECT)
#define SSL3_ST_CW_FINISHED_B (0x1B1|SSL_ST_CONNECT) #define SSL3_ST_CW_FINISHED_B (0x1B1|SSL_ST_CONNECT)
/* read from server */ /* read from server */
#define SSL3_ST_CR_CHANGE_A (0x1C0|SSL_ST_CONNECT) #define SSL3_ST_CR_CHANGE_A (0x1C0|SSL_ST_CONNECT)
#define SSL3_ST_CR_CHANGE_B (0x1C1|SSL_ST_CONNECT) #define SSL3_ST_CR_CHANGE_B (0x1C1|SSL_ST_CONNECT)
#define SSL3_ST_CR_FINISHED_A (0x1D0|SSL_ST_CONNECT) #define SSL3_ST_CR_FINISHED_A (0x1D0|SSL_ST_CONNECT)
#define SSL3_ST_CR_FINISHED_B (0x1D1|SSL_ST_CONNECT) #define SSL3_ST_CR_FINISHED_B (0x1D1|SSL_ST_CONNECT)
#define SSL3_ST_CR_SESSION_TICKET_A (0x1E0|SSL_ST_CONNECT)
#define SSL3_ST_CR_SESSION_TICKET_B (0x1E1|SSL_ST_CONNECT)
#define SSL3_ST_CR_CERT_STATUS_A (0x1F0|SSL_ST_CONNECT)
#define SSL3_ST_CR_CERT_STATUS_B (0x1F1|SSL_ST_CONNECT)
/* server */ /* server */
/* extra state */ /* extra state */
#define SSL3_ST_SW_FLUSH (0x100|SSL_ST_ACCEPT) #define SSL3_ST_SW_FLUSH (0x100|SSL_ST_ACCEPT)
/* read from client */ /* read from client */
/* Do not change the number values, they do matter */ /* Do not change the number values, they do matter */
#define SSL3_ST_SR_CLNT_HELLO_A (0x110|SSL_ST_ACCEPT) #define SSL3_ST_SR_CLNT_HELLO_A (0x110|SSL_ST_ACCEPT)
#define SSL3_ST_SR_CLNT_HELLO_B (0x111|SSL_ST_ACCEPT) #define SSL3_ST_SR_CLNT_HELLO_B (0x111|SSL_ST_ACCEPT)
#define SSL3_ST_SR_CLNT_HELLO_C (0x112|SSL_ST_ACCEPT) #define SSL3_ST_SR_CLNT_HELLO_C (0x112|SSL_ST_ACCEPT)
/* write to client */ /* write to client */
#define DTLS1_ST_SW_HELLO_VERIFY_REQUEST_A (0x113|SSL_ST_ACCEPT) #define DTLS1_ST_SW_HELLO_VERIFY_REQUEST_A (0x113|SSL_ST_ACCEPT)
#define DTLS1_ST_SW_HELLO_VERIFY_REQUEST_B (0x114|SSL_ST_ACCEPT) #define DTLS1_ST_SW_HELLO_VERIFY_REQUEST_B (0x114|SSL_ST_ACCEPT)
#define SSL3_ST_SW_HELLO_REQ_A (0x120|SSL_ST_ACCEPT) #define SSL3_ST_SW_HELLO_REQ_A (0x120|SSL_ST_ACCEPT)
#define SSL3_ST_SW_HELLO_REQ_B (0x121|SSL_ST_ACCEPT) #define SSL3_ST_SW_HELLO_REQ_B (0x121|SSL_ST_ACCEPT)
#define SSL3_ST_SW_HELLO_REQ_C (0x122|SSL_ST_ACCEPT) #define SSL3_ST_SW_HELLO_REQ_C (0x122|SSL_ST_ACCEPT)
#define SSL3_ST_SW_SRVR_HELLO_A (0x130|SSL_ST_ACCEPT) #define SSL3_ST_SW_SRVR_HELLO_A (0x130|SSL_ST_ACCEPT)
#define SSL3_ST_SW_SRVR_HELLO_B (0x131|SSL_ST_ACCEPT) #define SSL3_ST_SW_SRVR_HELLO_B (0x131|SSL_ST_ACCEPT)
#define SSL3_ST_SW_CERT_A (0x140|SSL_ST_ACCEPT) #define SSL3_ST_SW_CERT_A (0x140|SSL_ST_ACCEPT)
#define SSL3_ST_SW_CERT_B (0x141|SSL_ST_ACCEPT) #define SSL3_ST_SW_CERT_B (0x141|SSL_ST_ACCEPT)
#define SSL3_ST_SW_KEY_EXCH_A (0x150|SSL_ST_ACCEPT) #define SSL3_ST_SW_KEY_EXCH_A (0x150|SSL_ST_ACCEPT)
#define SSL3_ST_SW_KEY_EXCH_B (0x151|SSL_ST_ACCEPT) #define SSL3_ST_SW_KEY_EXCH_B (0x151|SSL_ST_ACCEPT)
#define SSL3_ST_SW_CERT_REQ_A (0x160|SSL_ST_ACCEPT) #define SSL3_ST_SW_CERT_REQ_A (0x160|SSL_ST_ACCEPT)
#define SSL3_ST_SW_CERT_REQ_B (0x161|SSL_ST_ACCEPT) #define SSL3_ST_SW_CERT_REQ_B (0x161|SSL_ST_ACCEPT)
#define SSL3_ST_SW_SRVR_DONE_A (0x170|SSL_ST_ACCEPT) #define SSL3_ST_SW_SRVR_DONE_A (0x170|SSL_ST_ACCEPT)
#define SSL3_ST_SW_SRVR_DONE_B (0x171|SSL_ST_ACCEPT) #define SSL3_ST_SW_SRVR_DONE_B (0x171|SSL_ST_ACCEPT)
/* read from client */ /* read from client */
#define SSL3_ST_SR_CERT_A (0x180|SSL_ST_ACCEPT) #define SSL3_ST_SR_CERT_A (0x180|SSL_ST_ACCEPT)
#define SSL3_ST_SR_CERT_B (0x181|SSL_ST_ACCEPT) #define SSL3_ST_SR_CERT_B (0x181|SSL_ST_ACCEPT)
#define SSL3_ST_SR_KEY_EXCH_A (0x190|SSL_ST_ACCEPT) #define SSL3_ST_SR_KEY_EXCH_A (0x190|SSL_ST_ACCEPT)
#define SSL3_ST_SR_KEY_EXCH_B (0x191|SSL_ST_ACCEPT) #define SSL3_ST_SR_KEY_EXCH_B (0x191|SSL_ST_ACCEPT)
#define SSL3_ST_SR_CERT_VRFY_A (0x1A0|SSL_ST_ACCEPT) #define SSL3_ST_SR_CERT_VRFY_A (0x1A0|SSL_ST_ACCEPT)
#define SSL3_ST_SR_CERT_VRFY_B (0x1A1|SSL_ST_ACCEPT) #define SSL3_ST_SR_CERT_VRFY_B (0x1A1|SSL_ST_ACCEPT)
#define SSL3_ST_SR_CHANGE_A (0x1B0|SSL_ST_ACCEPT) #define SSL3_ST_SR_CHANGE_A (0x1B0|SSL_ST_ACCEPT)
#define SSL3_ST_SR_CHANGE_B (0x1B1|SSL_ST_ACCEPT) #define SSL3_ST_SR_CHANGE_B (0x1B1|SSL_ST_ACCEPT)
#define SSL3_ST_SR_FINISHED_A (0x1C0|SSL_ST_ACCEPT) #define SSL3_ST_SR_FINISHED_A (0x1C0|SSL_ST_ACCEPT)
#define SSL3_ST_SR_FINISHED_B (0x1C1|SSL_ST_ACCEPT) #define SSL3_ST_SR_FINISHED_B (0x1C1|SSL_ST_ACCEPT)
/* write to client */ /* write to client */
#define SSL3_ST_SW_CHANGE_A (0x1D0|SSL_ST_ACCEPT) #define SSL3_ST_SW_CHANGE_A (0x1D0|SSL_ST_ACCEPT)
#define SSL3_ST_SW_CHANGE_B (0x1D1|SSL_ST_ACCEPT) #define SSL3_ST_SW_CHANGE_B (0x1D1|SSL_ST_ACCEPT)
#define SSL3_ST_SW_FINISHED_A (0x1E0|SSL_ST_ACCEPT) #define SSL3_ST_SW_FINISHED_A (0x1E0|SSL_ST_ACCEPT)
#define SSL3_ST_SW_FINISHED_B (0x1E1|SSL_ST_ACCEPT) #define SSL3_ST_SW_FINISHED_B (0x1E1|SSL_ST_ACCEPT)
#define SSL3_ST_SW_SESSION_TICKET_A (0x1F0|SSL_ST_ACCEPT)
#define SSL3_ST_SW_SESSION_TICKET_B (0x1F1|SSL_ST_ACCEPT)
#define SSL3_ST_SW_CERT_STATUS_A (0x200|SSL_ST_ACCEPT)
#define SSL3_ST_SW_CERT_STATUS_B (0x201|SSL_ST_ACCEPT)
#define SSL3_MT_HELLO_REQUEST 0 #define SSL3_MT_HELLO_REQUEST 0
#define SSL3_MT_CLIENT_HELLO 1 #define SSL3_MT_CLIENT_HELLO 1
#define SSL3_MT_SERVER_HELLO 2 #define SSL3_MT_SERVER_HELLO 2
#define SSL3_MT_CERTIFICATE 11 #define SSL3_MT_NEWSESSION_TICKET 4
#define SSL3_MT_SERVER_KEY_EXCHANGE 12 #define SSL3_MT_CERTIFICATE 11
#define SSL3_MT_CERTIFICATE_REQUEST 13 #define SSL3_MT_SERVER_KEY_EXCHANGE 12
#define SSL3_MT_SERVER_DONE 14 #define SSL3_MT_CERTIFICATE_REQUEST 13
#define SSL3_MT_CERTIFICATE_VERIFY 15 #define SSL3_MT_SERVER_DONE 14
#define SSL3_MT_CLIENT_KEY_EXCHANGE 16 #define SSL3_MT_CERTIFICATE_VERIFY 15
#define SSL3_MT_FINISHED 20 #define SSL3_MT_CLIENT_KEY_EXCHANGE 16
#define SSL3_MT_FINISHED 20
#define SSL3_MT_CERTIFICATE_STATUS 22
#define DTLS1_MT_HELLO_VERIFY_REQUEST 3 #define DTLS1_MT_HELLO_VERIFY_REQUEST 3
#define SSL3_MT_CCS 1 #define SSL3_MT_CCS 1
/* These are used when changing over to a new cipher */ /* These are used when changing over to a new cipher */
#define SSL3_CC_READ 0x01 #define SSL3_CC_READ 0x01
#define SSL3_CC_WRITE 0x02 #define SSL3_CC_WRITE 0x02
#define SSL3_CC_CLIENT 0x10 #define SSL3_CC_CLIENT 0x10
#define SSL3_CC_SERVER 0x20 #define SSL3_CC_SERVER 0x20
#define SSL3_CHANGE_CIPHER_CLIENT_WRITE (SSL3_CC_CLIENT|SSL3_CC_WRITE) #define SSL3_CHANGE_CIPHER_CLIENT_WRITE (SSL3_CC_CLIENT|SSL3_CC_WRITE)
#define SSL3_CHANGE_CIPHER_SERVER_READ (SSL3_CC_SERVER|SSL3_CC_READ) #define SSL3_CHANGE_CIPHER_SERVER_READ (SSL3_CC_SERVER|SSL3_CC_READ)
#define SSL3_CHANGE_CIPHER_CLIENT_READ (SSL3_CC_CLIENT|SSL3_CC_READ) #define SSL3_CHANGE_CIPHER_CLIENT_READ (SSL3_CC_CLIENT|SSL3_CC_READ)
#define SSL3_CHANGE_CIPHER_SERVER_WRITE (SSL3_CC_SERVER|SSL3_CC_WRITE) #define SSL3_CHANGE_CIPHER_SERVER_WRITE (SSL3_CC_SERVER|SSL3_CC_WRITE)
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif #endif
dep/include/openssl/symhacks.h
+83 -62
View File
@@ -64,75 +64,75 @@
/* Hack a long name in crypto/ex_data.c */ /* Hack a long name in crypto/ex_data.c */
#undef CRYPTO_get_ex_data_implementation #undef CRYPTO_get_ex_data_implementation
#define CRYPTO_get_ex_data_implementation CRYPTO_get_ex_data_impl #define CRYPTO_get_ex_data_implementation CRYPTO_get_ex_data_impl
#undef CRYPTO_set_ex_data_implementation #undef CRYPTO_set_ex_data_implementation
#define CRYPTO_set_ex_data_implementation CRYPTO_set_ex_data_impl #define CRYPTO_set_ex_data_implementation CRYPTO_set_ex_data_impl
/* Hack a long name in crypto/asn1/a_mbstr.c */ /* Hack a long name in crypto/asn1/a_mbstr.c */
#undef ASN1_STRING_set_default_mask_asc #undef ASN1_STRING_set_default_mask_asc
#define ASN1_STRING_set_default_mask_asc ASN1_STRING_set_def_mask_asc #define ASN1_STRING_set_default_mask_asc ASN1_STRING_set_def_mask_asc
#if 0 /* No longer needed, since safestack macro magic does the job */ #if 0 /* No longer needed, since safestack macro magic does the job */
/* Hack the names created with DECLARE_ASN1_SET_OF(PKCS7_SIGNER_INFO) */ /* Hack the names created with DECLARE_ASN1_SET_OF(PKCS7_SIGNER_INFO) */
#undef i2d_ASN1_SET_OF_PKCS7_SIGNER_INFO #undef i2d_ASN1_SET_OF_PKCS7_SIGNER_INFO
#define i2d_ASN1_SET_OF_PKCS7_SIGNER_INFO i2d_ASN1_SET_OF_PKCS7_SIGINF #define i2d_ASN1_SET_OF_PKCS7_SIGNER_INFO i2d_ASN1_SET_OF_PKCS7_SIGINF
#undef d2i_ASN1_SET_OF_PKCS7_SIGNER_INFO #undef d2i_ASN1_SET_OF_PKCS7_SIGNER_INFO
#define d2i_ASN1_SET_OF_PKCS7_SIGNER_INFO d2i_ASN1_SET_OF_PKCS7_SIGINF #define d2i_ASN1_SET_OF_PKCS7_SIGNER_INFO d2i_ASN1_SET_OF_PKCS7_SIGINF
#endif #endif
#if 0 /* No longer needed, since safestack macro magic does the job */ #if 0 /* No longer needed, since safestack macro magic does the job */
/* Hack the names created with DECLARE_ASN1_SET_OF(PKCS7_RECIP_INFO) */ /* Hack the names created with DECLARE_ASN1_SET_OF(PKCS7_RECIP_INFO) */
#undef i2d_ASN1_SET_OF_PKCS7_RECIP_INFO #undef i2d_ASN1_SET_OF_PKCS7_RECIP_INFO
#define i2d_ASN1_SET_OF_PKCS7_RECIP_INFO i2d_ASN1_SET_OF_PKCS7_RECINF #define i2d_ASN1_SET_OF_PKCS7_RECIP_INFO i2d_ASN1_SET_OF_PKCS7_RECINF
#undef d2i_ASN1_SET_OF_PKCS7_RECIP_INFO #undef d2i_ASN1_SET_OF_PKCS7_RECIP_INFO
#define d2i_ASN1_SET_OF_PKCS7_RECIP_INFO d2i_ASN1_SET_OF_PKCS7_RECINF #define d2i_ASN1_SET_OF_PKCS7_RECIP_INFO d2i_ASN1_SET_OF_PKCS7_RECINF
#endif #endif
#if 0 /* No longer needed, since safestack macro magic does the job */ #if 0 /* No longer needed, since safestack macro magic does the job */
/* Hack the names created with DECLARE_ASN1_SET_OF(ACCESS_DESCRIPTION) */ /* Hack the names created with DECLARE_ASN1_SET_OF(ACCESS_DESCRIPTION) */
#undef i2d_ASN1_SET_OF_ACCESS_DESCRIPTION #undef i2d_ASN1_SET_OF_ACCESS_DESCRIPTION
#define i2d_ASN1_SET_OF_ACCESS_DESCRIPTION i2d_ASN1_SET_OF_ACC_DESC #define i2d_ASN1_SET_OF_ACCESS_DESCRIPTION i2d_ASN1_SET_OF_ACC_DESC
#undef d2i_ASN1_SET_OF_ACCESS_DESCRIPTION #undef d2i_ASN1_SET_OF_ACCESS_DESCRIPTION
#define d2i_ASN1_SET_OF_ACCESS_DESCRIPTION d2i_ASN1_SET_OF_ACC_DESC #define d2i_ASN1_SET_OF_ACCESS_DESCRIPTION d2i_ASN1_SET_OF_ACC_DESC
#endif #endif
/* Hack the names created with DECLARE_PEM_rw(NETSCAPE_CERT_SEQUENCE) */ /* Hack the names created with DECLARE_PEM_rw(NETSCAPE_CERT_SEQUENCE) */
#undef PEM_read_NETSCAPE_CERT_SEQUENCE #undef PEM_read_NETSCAPE_CERT_SEQUENCE
#define PEM_read_NETSCAPE_CERT_SEQUENCE PEM_read_NS_CERT_SEQ #define PEM_read_NETSCAPE_CERT_SEQUENCE PEM_read_NS_CERT_SEQ
#undef PEM_write_NETSCAPE_CERT_SEQUENCE #undef PEM_write_NETSCAPE_CERT_SEQUENCE
#define PEM_write_NETSCAPE_CERT_SEQUENCE PEM_write_NS_CERT_SEQ #define PEM_write_NETSCAPE_CERT_SEQUENCE PEM_write_NS_CERT_SEQ
#undef PEM_read_bio_NETSCAPE_CERT_SEQUENCE #undef PEM_read_bio_NETSCAPE_CERT_SEQUENCE
#define PEM_read_bio_NETSCAPE_CERT_SEQUENCE PEM_read_bio_NS_CERT_SEQ #define PEM_read_bio_NETSCAPE_CERT_SEQUENCE PEM_read_bio_NS_CERT_SEQ
#undef PEM_write_bio_NETSCAPE_CERT_SEQUENCE #undef PEM_write_bio_NETSCAPE_CERT_SEQUENCE
#define PEM_write_bio_NETSCAPE_CERT_SEQUENCE PEM_write_bio_NS_CERT_SEQ #define PEM_write_bio_NETSCAPE_CERT_SEQUENCE PEM_write_bio_NS_CERT_SEQ
#undef PEM_write_cb_bio_NETSCAPE_CERT_SEQUENCE #undef PEM_write_cb_bio_NETSCAPE_CERT_SEQUENCE
#define PEM_write_cb_bio_NETSCAPE_CERT_SEQUENCE PEM_write_cb_bio_NS_CERT_SEQ #define PEM_write_cb_bio_NETSCAPE_CERT_SEQUENCE PEM_write_cb_bio_NS_CERT_SEQ
/* Hack the names created with DECLARE_PEM_rw(PKCS8_PRIV_KEY_INFO) */ /* Hack the names created with DECLARE_PEM_rw(PKCS8_PRIV_KEY_INFO) */
#undef PEM_read_PKCS8_PRIV_KEY_INFO #undef PEM_read_PKCS8_PRIV_KEY_INFO
#define PEM_read_PKCS8_PRIV_KEY_INFO PEM_read_P8_PRIV_KEY_INFO #define PEM_read_PKCS8_PRIV_KEY_INFO PEM_read_P8_PRIV_KEY_INFO
#undef PEM_write_PKCS8_PRIV_KEY_INFO #undef PEM_write_PKCS8_PRIV_KEY_INFO
#define PEM_write_PKCS8_PRIV_KEY_INFO PEM_write_P8_PRIV_KEY_INFO #define PEM_write_PKCS8_PRIV_KEY_INFO PEM_write_P8_PRIV_KEY_INFO
#undef PEM_read_bio_PKCS8_PRIV_KEY_INFO #undef PEM_read_bio_PKCS8_PRIV_KEY_INFO
#define PEM_read_bio_PKCS8_PRIV_KEY_INFO PEM_read_bio_P8_PRIV_KEY_INFO #define PEM_read_bio_PKCS8_PRIV_KEY_INFO PEM_read_bio_P8_PRIV_KEY_INFO
#undef PEM_write_bio_PKCS8_PRIV_KEY_INFO #undef PEM_write_bio_PKCS8_PRIV_KEY_INFO
#define PEM_write_bio_PKCS8_PRIV_KEY_INFO PEM_write_bio_P8_PRIV_KEY_INFO #define PEM_write_bio_PKCS8_PRIV_KEY_INFO PEM_write_bio_P8_PRIV_KEY_INFO
#undef PEM_write_cb_bio_PKCS8_PRIV_KEY_INFO #undef PEM_write_cb_bio_PKCS8_PRIV_KEY_INFO
#define PEM_write_cb_bio_PKCS8_PRIV_KEY_INFO PEM_wrt_cb_bio_P8_PRIV_KEY_INFO #define PEM_write_cb_bio_PKCS8_PRIV_KEY_INFO PEM_wrt_cb_bio_P8_PRIV_KEY_INFO
/* Hack other PEM names */ /* Hack other PEM names */
#undef PEM_write_bio_PKCS8PrivateKey_nid #undef PEM_write_bio_PKCS8PrivateKey_nid
#define PEM_write_bio_PKCS8PrivateKey_nid PEM_write_bio_PKCS8PrivKey_nid #define PEM_write_bio_PKCS8PrivateKey_nid PEM_write_bio_PKCS8PrivKey_nid
/* Hack some long X509 names */ /* Hack some long X509 names */
#undef X509_REVOKED_get_ext_by_critical #undef X509_REVOKED_get_ext_by_critical
#define X509_REVOKED_get_ext_by_critical X509_REVOKED_get_ext_by_critic #define X509_REVOKED_get_ext_by_critical X509_REVOKED_get_ext_by_critic
#undef X509_policy_tree_get0_user_policies #undef X509_policy_tree_get0_user_policies
#define X509_policy_tree_get0_user_policies X509_pcy_tree_get0_usr_policies #define X509_policy_tree_get0_user_policies X509_pcy_tree_get0_usr_policies
#undef X509_policy_node_get0_qualifiers #undef X509_policy_node_get0_qualifiers
#define X509_policy_node_get0_qualifiers X509_pcy_node_get0_qualifiers #define X509_policy_node_get0_qualifiers X509_pcy_node_get0_qualifiers
#undef X509_STORE_CTX_get_explicit_policy #undef X509_STORE_CTX_get_explicit_policy
#define X509_STORE_CTX_get_explicit_policy X509_STORE_CTX_get_expl_policy #define X509_STORE_CTX_get_explicit_policy X509_STORE_CTX_get_expl_policy
/* Hack some long CRYPTO names */ /* Hack some long CRYPTO names */
#undef CRYPTO_set_dynlock_destroy_callback #undef CRYPTO_set_dynlock_destroy_callback
@@ -168,17 +168,22 @@
#undef SSL_CTX_set_default_passwd_cb_userdata #undef SSL_CTX_set_default_passwd_cb_userdata
#define SSL_CTX_set_default_passwd_cb_userdata SSL_CTX_set_def_passwd_cb_ud #define SSL_CTX_set_default_passwd_cb_userdata SSL_CTX_set_def_passwd_cb_ud
#undef SSL_COMP_get_compression_methods #undef SSL_COMP_get_compression_methods
#define SSL_COMP_get_compression_methods SSL_COMP_get_compress_methods #define SSL_COMP_get_compression_methods SSL_COMP_get_compress_methods
/* Hack some long ENGINE names */ /* Hack some long ENGINE names */
#undef ENGINE_get_default_BN_mod_exp_crt #undef ENGINE_get_default_BN_mod_exp_crt
#define ENGINE_get_default_BN_mod_exp_crt ENGINE_get_def_BN_mod_exp_crt #define ENGINE_get_default_BN_mod_exp_crt ENGINE_get_def_BN_mod_exp_crt
#undef ENGINE_set_default_BN_mod_exp_crt #undef ENGINE_set_default_BN_mod_exp_crt
#define ENGINE_set_default_BN_mod_exp_crt ENGINE_set_def_BN_mod_exp_crt #define ENGINE_set_default_BN_mod_exp_crt ENGINE_set_def_BN_mod_exp_crt
#undef ENGINE_set_load_privkey_function #undef ENGINE_set_load_privkey_function
#define ENGINE_set_load_privkey_function ENGINE_set_load_privkey_fn #define ENGINE_set_load_privkey_function ENGINE_set_load_privkey_fn
#undef ENGINE_get_load_privkey_function #undef ENGINE_get_load_privkey_function
#define ENGINE_get_load_privkey_function ENGINE_get_load_privkey_fn #define ENGINE_get_load_privkey_function ENGINE_get_load_privkey_fn
#undef ENGINE_set_load_ssl_client_cert_function
#define ENGINE_set_load_ssl_client_cert_function \
ENGINE_set_ld_ssl_clnt_cert_fn
#undef ENGINE_get_ssl_client_cert_function
#define ENGINE_get_ssl_client_cert_function ENGINE_get_ssl_client_cert_fn
/* Hack some long OCSP names */ /* Hack some long OCSP names */
#undef OCSP_REQUEST_get_ext_by_critical #undef OCSP_REQUEST_get_ext_by_critical
@@ -190,23 +195,23 @@
/* Hack some long DES names */ /* Hack some long DES names */
#undef _ossl_old_des_ede3_cfb64_encrypt #undef _ossl_old_des_ede3_cfb64_encrypt
#define _ossl_old_des_ede3_cfb64_encrypt _ossl_odes_ede3_cfb64_encrypt #define _ossl_old_des_ede3_cfb64_encrypt _ossl_odes_ede3_cfb64_encrypt
#undef _ossl_old_des_ede3_ofb64_encrypt #undef _ossl_old_des_ede3_ofb64_encrypt
#define _ossl_old_des_ede3_ofb64_encrypt _ossl_odes_ede3_ofb64_encrypt #define _ossl_old_des_ede3_ofb64_encrypt _ossl_odes_ede3_ofb64_encrypt
/* Hack some long EVP names */ /* Hack some long EVP names */
#undef OPENSSL_add_all_algorithms_noconf #undef OPENSSL_add_all_algorithms_noconf
#define OPENSSL_add_all_algorithms_noconf OPENSSL_add_all_algo_noconf #define OPENSSL_add_all_algorithms_noconf OPENSSL_add_all_algo_noconf
#undef OPENSSL_add_all_algorithms_conf #undef OPENSSL_add_all_algorithms_conf
#define OPENSSL_add_all_algorithms_conf OPENSSL_add_all_algo_conf #define OPENSSL_add_all_algorithms_conf OPENSSL_add_all_algo_conf
/* Hack some long EC names */ /* Hack some long EC names */
#undef EC_GROUP_set_point_conversion_form #undef EC_GROUP_set_point_conversion_form
#define EC_GROUP_set_point_conversion_form EC_GROUP_set_point_conv_form #define EC_GROUP_set_point_conversion_form EC_GROUP_set_point_conv_form
#undef EC_GROUP_get_point_conversion_form #undef EC_GROUP_get_point_conversion_form
#define EC_GROUP_get_point_conversion_form EC_GROUP_get_point_conv_form #define EC_GROUP_get_point_conversion_form EC_GROUP_get_point_conv_form
#undef EC_GROUP_clear_free_all_extra_data #undef EC_GROUP_clear_free_all_extra_data
#define EC_GROUP_clear_free_all_extra_data EC_GROUP_clr_free_all_xtra_data #define EC_GROUP_clear_free_all_extra_data EC_GROUP_clr_free_all_xtra_data
#undef EC_POINT_set_Jprojective_coordinates_GFp #undef EC_POINT_set_Jprojective_coordinates_GFp
#define EC_POINT_set_Jprojective_coordinates_GFp \ #define EC_POINT_set_Jprojective_coordinates_GFp \
EC_POINT_set_Jproj_coords_GFp EC_POINT_set_Jproj_coords_GFp
@@ -229,7 +234,7 @@
#undef ec_GF2m_simple_group_clear_finish #undef ec_GF2m_simple_group_clear_finish
#define ec_GF2m_simple_group_clear_finish ec_GF2m_simple_grp_clr_finish #define ec_GF2m_simple_group_clear_finish ec_GF2m_simple_grp_clr_finish
#undef ec_GF2m_simple_group_check_discriminant #undef ec_GF2m_simple_group_check_discriminant
#define ec_GF2m_simple_group_check_discriminant ec_GF2m_simple_grp_chk_discrim #define ec_GF2m_simple_group_check_discriminant ec_GF2m_simple_grp_chk_discrim
#undef ec_GF2m_simple_point_clear_finish #undef ec_GF2m_simple_point_clear_finish
#define ec_GF2m_simple_point_clear_finish ec_GF2m_simple_pt_clr_finish #define ec_GF2m_simple_point_clear_finish ec_GF2m_simple_pt_clr_finish
#undef ec_GF2m_simple_point_set_to_infinity #undef ec_GF2m_simple_point_set_to_infinity
@@ -290,57 +295,71 @@
#define ec_GFp_simple_set_compressed_coordinates \ #define ec_GFp_simple_set_compressed_coordinates \
ec_GFp_smp_set_compr_coords ec_GFp_smp_set_compr_coords
#undef ec_GFp_simple_group_check_discriminant #undef ec_GFp_simple_group_check_discriminant
#define ec_GFp_simple_group_check_discriminant ec_GFp_simple_grp_chk_discrim #define ec_GFp_simple_group_check_discriminant ec_GFp_simple_grp_chk_discrim
/* Hack som long STORE names */ /* Hack som long STORE names */
#undef STORE_method_set_initialise_function #undef STORE_method_set_initialise_function
#define STORE_method_set_initialise_function STORE_meth_set_initialise_fn #define STORE_method_set_initialise_function STORE_meth_set_initialise_fn
#undef STORE_method_set_cleanup_function #undef STORE_method_set_cleanup_function
#define STORE_method_set_cleanup_function STORE_meth_set_cleanup_fn #define STORE_method_set_cleanup_function STORE_meth_set_cleanup_fn
#undef STORE_method_set_generate_function #undef STORE_method_set_generate_function
#define STORE_method_set_generate_function STORE_meth_set_generate_fn #define STORE_method_set_generate_function STORE_meth_set_generate_fn
#undef STORE_method_set_modify_function #undef STORE_method_set_modify_function
#define STORE_method_set_modify_function STORE_meth_set_modify_fn #define STORE_method_set_modify_function STORE_meth_set_modify_fn
#undef STORE_method_set_revoke_function #undef STORE_method_set_revoke_function
#define STORE_method_set_revoke_function STORE_meth_set_revoke_fn #define STORE_method_set_revoke_function STORE_meth_set_revoke_fn
#undef STORE_method_set_delete_function #undef STORE_method_set_delete_function
#define STORE_method_set_delete_function STORE_meth_set_delete_fn #define STORE_method_set_delete_function STORE_meth_set_delete_fn
#undef STORE_method_set_list_start_function #undef STORE_method_set_list_start_function
#define STORE_method_set_list_start_function STORE_meth_set_list_start_fn #define STORE_method_set_list_start_function STORE_meth_set_list_start_fn
#undef STORE_method_set_list_next_function #undef STORE_method_set_list_next_function
#define STORE_method_set_list_next_function STORE_meth_set_list_next_fn #define STORE_method_set_list_next_function STORE_meth_set_list_next_fn
#undef STORE_method_set_list_end_function #undef STORE_method_set_list_end_function
#define STORE_method_set_list_end_function STORE_meth_set_list_end_fn #define STORE_method_set_list_end_function STORE_meth_set_list_end_fn
#undef STORE_method_set_update_store_function #undef STORE_method_set_update_store_function
#define STORE_method_set_update_store_function STORE_meth_set_update_store_fn #define STORE_method_set_update_store_function STORE_meth_set_update_store_fn
#undef STORE_method_set_lock_store_function #undef STORE_method_set_lock_store_function
#define STORE_method_set_lock_store_function STORE_meth_set_lock_store_fn #define STORE_method_set_lock_store_function STORE_meth_set_lock_store_fn
#undef STORE_method_set_unlock_store_function #undef STORE_method_set_unlock_store_function
#define STORE_method_set_unlock_store_function STORE_meth_set_unlock_store_fn #define STORE_method_set_unlock_store_function STORE_meth_set_unlock_store_fn
#undef STORE_method_get_initialise_function #undef STORE_method_get_initialise_function
#define STORE_method_get_initialise_function STORE_meth_get_initialise_fn #define STORE_method_get_initialise_function STORE_meth_get_initialise_fn
#undef STORE_method_get_cleanup_function #undef STORE_method_get_cleanup_function
#define STORE_method_get_cleanup_function STORE_meth_get_cleanup_fn #define STORE_method_get_cleanup_function STORE_meth_get_cleanup_fn
#undef STORE_method_get_generate_function #undef STORE_method_get_generate_function
#define STORE_method_get_generate_function STORE_meth_get_generate_fn #define STORE_method_get_generate_function STORE_meth_get_generate_fn
#undef STORE_method_get_modify_function #undef STORE_method_get_modify_function
#define STORE_method_get_modify_function STORE_meth_get_modify_fn #define STORE_method_get_modify_function STORE_meth_get_modify_fn
#undef STORE_method_get_revoke_function #undef STORE_method_get_revoke_function
#define STORE_method_get_revoke_function STORE_meth_get_revoke_fn #define STORE_method_get_revoke_function STORE_meth_get_revoke_fn
#undef STORE_method_get_delete_function #undef STORE_method_get_delete_function
#define STORE_method_get_delete_function STORE_meth_get_delete_fn #define STORE_method_get_delete_function STORE_meth_get_delete_fn
#undef STORE_method_get_list_start_function #undef STORE_method_get_list_start_function
#define STORE_method_get_list_start_function STORE_meth_get_list_start_fn #define STORE_method_get_list_start_function STORE_meth_get_list_start_fn
#undef STORE_method_get_list_next_function #undef STORE_method_get_list_next_function
#define STORE_method_get_list_next_function STORE_meth_get_list_next_fn #define STORE_method_get_list_next_function STORE_meth_get_list_next_fn
#undef STORE_method_get_list_end_function #undef STORE_method_get_list_end_function
#define STORE_method_get_list_end_function STORE_meth_get_list_end_fn #define STORE_method_get_list_end_function STORE_meth_get_list_end_fn
#undef STORE_method_get_update_store_function #undef STORE_method_get_update_store_function
#define STORE_method_get_update_store_function STORE_meth_get_update_store_fn #define STORE_method_get_update_store_function STORE_meth_get_update_store_fn
#undef STORE_method_get_lock_store_function #undef STORE_method_get_lock_store_function
#define STORE_method_get_lock_store_function STORE_meth_get_lock_store_fn #define STORE_method_get_lock_store_function STORE_meth_get_lock_store_fn
#undef STORE_method_get_unlock_store_function #undef STORE_method_get_unlock_store_function
#define STORE_method_get_unlock_store_function STORE_meth_get_unlock_store_fn #define STORE_method_get_unlock_store_function STORE_meth_get_unlock_store_fn
/* Hack some long CMS names */
#undef CMS_RecipientInfo_ktri_get0_algs
#define CMS_RecipientInfo_ktri_get0_algs CMS_RecipInfo_ktri_get0_algs
#undef CMS_RecipientInfo_ktri_get0_signer_id
#define CMS_RecipientInfo_ktri_get0_signer_id CMS_RecipInfo_ktri_get0_sigr_id
#undef CMS_OtherRevocationInfoFormat_it
#define CMS_OtherRevocationInfoFormat_it CMS_OtherRevocInfoFormat_it
#undef CMS_KeyAgreeRecipientIdentifier_it
#define CMS_KeyAgreeRecipientIdentifier_it CMS_KeyAgreeRecipIdentifier_it
#undef CMS_OriginatorIdentifierOrKey_it
#define CMS_OriginatorIdentifierOrKey_it CMS_OriginatorIdOrKey_it
#undef cms_SignerIdentifier_get0_signer_id
#define cms_SignerIdentifier_get0_signer_id cms_SignerId_get0_signer_id
#endif /* defined OPENSSL_SYS_VMS */ #endif /* defined OPENSSL_SYS_VMS */
@@ -348,7 +367,7 @@
/* Case insensiteve linking causes problems.... */ /* Case insensiteve linking causes problems.... */
#if defined(OPENSSL_SYS_WIN16) || defined(OPENSSL_SYS_VMS) || defined(OPENSSL_SYS_OS2) #if defined(OPENSSL_SYS_WIN16) || defined(OPENSSL_SYS_VMS) || defined(OPENSSL_SYS_OS2)
#undef ERR_load_CRYPTO_strings #undef ERR_load_CRYPTO_strings
#define ERR_load_CRYPTO_strings ERR_load_CRYPTOlib_strings #define ERR_load_CRYPTO_strings ERR_load_CRYPTOlib_strings
#undef OCSP_crlID_new #undef OCSP_crlID_new
#define OCSP_crlID_new OCSP_crlID2_new #define OCSP_crlID_new OCSP_crlID2_new
@@ -381,4 +400,6 @@
#endif /* ! defined HEADER_VMS_IDHACKS_H */ #endif /* ! defined HEADER_VMS_IDHACKS_H */
/* This one clashes with CMS_data_create */
#undef cms_Data_create
#define cms_Data_create priv_cms_Data_create
dep/include/openssl/tls1.h
+207 -106
View File
@@ -78,67 +78,162 @@
extern "C" { extern "C" {
#endif #endif
#define TLS1_ALLOW_EXPERIMENTAL_CIPHERSUITES 0 #define TLS1_ALLOW_EXPERIMENTAL_CIPHERSUITES 0
#define TLS1_VERSION 0x0301 #define TLS1_VERSION 0x0301
#define TLS1_VERSION_MAJOR 0x03 #define TLS1_VERSION_MAJOR 0x03
#define TLS1_VERSION_MINOR 0x01 #define TLS1_VERSION_MINOR 0x01
#define TLS1_AD_DECRYPTION_FAILED 21 #define TLS1_AD_DECRYPTION_FAILED 21
#define TLS1_AD_RECORD_OVERFLOW 22 #define TLS1_AD_RECORD_OVERFLOW 22
#define TLS1_AD_UNKNOWN_CA 48 /* fatal */ #define TLS1_AD_UNKNOWN_CA 48 /* fatal */
#define TLS1_AD_ACCESS_DENIED 49 /* fatal */ #define TLS1_AD_ACCESS_DENIED 49 /* fatal */
#define TLS1_AD_DECODE_ERROR 50 /* fatal */ #define TLS1_AD_DECODE_ERROR 50 /* fatal */
#define TLS1_AD_DECRYPT_ERROR 51 #define TLS1_AD_DECRYPT_ERROR 51
#define TLS1_AD_EXPORT_RESTRICTION 60 /* fatal */ #define TLS1_AD_EXPORT_RESTRICTION 60 /* fatal */
#define TLS1_AD_PROTOCOL_VERSION 70 /* fatal */ #define TLS1_AD_PROTOCOL_VERSION 70 /* fatal */
#define TLS1_AD_INSUFFICIENT_SECURITY 71 /* fatal */ #define TLS1_AD_INSUFFICIENT_SECURITY 71 /* fatal */
#define TLS1_AD_INTERNAL_ERROR 80 /* fatal */ #define TLS1_AD_INTERNAL_ERROR 80 /* fatal */
#define TLS1_AD_USER_CANCELLED 90 #define TLS1_AD_USER_CANCELLED 90
#define TLS1_AD_NO_RENEGOTIATION 100 #define TLS1_AD_NO_RENEGOTIATION 100
/* codes 110-114 are from RFC3546 */
#define TLS1_AD_UNSUPPORTED_EXTENSION 110
#define TLS1_AD_CERTIFICATE_UNOBTAINABLE 111
#define TLS1_AD_UNRECOGNIZED_NAME 112
#define TLS1_AD_BAD_CERTIFICATE_STATUS_RESPONSE 113
#define TLS1_AD_BAD_CERTIFICATE_HASH_VALUE 114
#define TLS1_AD_UNKNOWN_PSK_IDENTITY 115 /* fatal */
/* ExtensionType values from RFC 3546 */
#define TLSEXT_TYPE_server_name 0
#define TLSEXT_TYPE_max_fragment_length 1
#define TLSEXT_TYPE_client_certificate_url 2
#define TLSEXT_TYPE_trusted_ca_keys 3
#define TLSEXT_TYPE_truncated_hmac 4
#define TLSEXT_TYPE_status_request 5
#define TLSEXT_TYPE_elliptic_curves 10
#define TLSEXT_TYPE_ec_point_formats 11
#define TLSEXT_TYPE_session_ticket 35
/* NameType value from RFC 3546 */
#define TLSEXT_NAMETYPE_host_name 0
/* status request value from RFC 3546 */
#define TLSEXT_STATUSTYPE_ocsp 1
#ifndef OPENSSL_NO_TLSEXT
#define TLSEXT_MAXLEN_host_name 255
const char *SSL_get_servername(const SSL *s, const int type) ;
int SSL_get_servername_type(const SSL *s) ;
#define SSL_set_tlsext_host_name(s,name) \
SSL_ctrl(s,SSL_CTRL_SET_TLSEXT_HOSTNAME,TLSEXT_NAMETYPE_host_name,(char *)name)
#define SSL_set_tlsext_debug_callback(ssl, cb) \
SSL_callback_ctrl(ssl,SSL_CTRL_SET_TLSEXT_DEBUG_CB,(void (*)(void))cb)
#define SSL_set_tlsext_debug_arg(ssl, arg) \
SSL_ctrl(ssl,SSL_CTRL_SET_TLSEXT_DEBUG_ARG,0, (void *)arg)
#define SSL_set_tlsext_status_type(ssl, type) \
SSL_ctrl(ssl,SSL_CTRL_SET_TLSEXT_STATUS_REQ_TYPE,type, NULL)
#define SSL_get_tlsext_status_exts(ssl, arg) \
SSL_ctrl(ssl,SSL_CTRL_GET_TLSEXT_STATUS_REQ_EXTS,0, (void *)arg)
#define SSL_set_tlsext_status_exts(ssl, arg) \
SSL_ctrl(ssl,SSL_CTRL_SET_TLSEXT_STATUS_REQ_EXTS,0, (void *)arg)
#define SSL_get_tlsext_status_ids(ssl, arg) \
SSL_ctrl(ssl,SSL_CTRL_GET_TLSEXT_STATUS_REQ_IDS,0, (void *)arg)
#define SSL_set_tlsext_status_ids(ssl, arg) \
SSL_ctrl(ssl,SSL_CTRL_SET_TLSEXT_STATUS_REQ_IDS,0, (void *)arg)
#define SSL_get_tlsext_status_ocsp_resp(ssl, arg) \
SSL_ctrl(ssl,SSL_CTRL_GET_TLSEXT_STATUS_REQ_OCSP_RESP,0, (void *)arg)
#define SSL_set_tlsext_status_ocsp_resp(ssl, arg, arglen) \
SSL_ctrl(ssl,SSL_CTRL_SET_TLSEXT_STATUS_REQ_OCSP_RESP,arglen, (void *)arg)
#define SSL_CTX_set_tlsext_servername_callback(ctx, cb) \
SSL_CTX_callback_ctrl(ctx,SSL_CTRL_SET_TLSEXT_SERVERNAME_CB,(void (*)(void))cb)
#define SSL_TLSEXT_ERR_OK 0
#define SSL_TLSEXT_ERR_ALERT_WARNING 1
#define SSL_TLSEXT_ERR_ALERT_FATAL 2
#define SSL_TLSEXT_ERR_NOACK 3
#define SSL_CTX_set_tlsext_servername_arg(ctx, arg) \
SSL_CTX_ctrl(ctx,SSL_CTRL_SET_TLSEXT_SERVERNAME_ARG,0, (void *)arg)
#define SSL_CTX_get_tlsext_ticket_keys(ctx, keys, keylen) \
SSL_CTX_ctrl((ctx),SSL_CTRL_GET_TLXEXT_TICKET_KEYS,(keylen),(keys))
#define SSL_CTX_set_tlsext_ticket_keys(ctx, keys, keylen) \
SSL_CTX_ctrl((ctx),SSL_CTRL_SET_TLXEXT_TICKET_KEYS,(keylen),(keys))
#define SSL_CTX_set_tlsext_status_cb(ssl, cb) \
SSL_CTX_callback_ctrl(ssl,SSL_CTRL_SET_TLSEXT_STATUS_REQ_CB,(void (*)(void))cb)
#define SSL_CTX_set_tlsext_status_arg(ssl, arg) \
SSL_CTX_ctrl(ssl,SSL_CTRL_SET_TLSEXT_STATUS_REQ_CB_ARG,0, (void *)arg)
#define SSL_CTX_set_tlsext_ticket_key_cb(ssl, cb) \
SSL_CTX_callback_ctrl(ssl,SSL_CTRL_SET_TLSEXT_TICKET_KEY_CB,(void (*)(void))cb)
#endif
/* Additional TLS ciphersuites from draft-ietf-tls-56-bit-ciphersuites-00.txt /* Additional TLS ciphersuites from draft-ietf-tls-56-bit-ciphersuites-00.txt
* (available if TLS1_ALLOW_EXPERIMENTAL_CIPHERSUITES is defined, see * (available if TLS1_ALLOW_EXPERIMENTAL_CIPHERSUITES is defined, see
* s3_lib.c). We actually treat them like SSL 3.0 ciphers, which we probably * s3_lib.c). We actually treat them like SSL 3.0 ciphers, which we probably
* shouldn't. */ * shouldn't. */
#define TLS1_CK_RSA_EXPORT1024_WITH_RC4_56_MD5 0x03000060 #define TLS1_CK_RSA_EXPORT1024_WITH_RC4_56_MD5 0x03000060
#define TLS1_CK_RSA_EXPORT1024_WITH_RC2_CBC_56_MD5 0x03000061 #define TLS1_CK_RSA_EXPORT1024_WITH_RC2_CBC_56_MD5 0x03000061
#define TLS1_CK_RSA_EXPORT1024_WITH_DES_CBC_SHA 0x03000062 #define TLS1_CK_RSA_EXPORT1024_WITH_DES_CBC_SHA 0x03000062
#define TLS1_CK_DHE_DSS_EXPORT1024_WITH_DES_CBC_SHA 0x03000063 #define TLS1_CK_DHE_DSS_EXPORT1024_WITH_DES_CBC_SHA 0x03000063
#define TLS1_CK_RSA_EXPORT1024_WITH_RC4_56_SHA 0x03000064 #define TLS1_CK_RSA_EXPORT1024_WITH_RC4_56_SHA 0x03000064
#define TLS1_CK_DHE_DSS_EXPORT1024_WITH_RC4_56_SHA 0x03000065 #define TLS1_CK_DHE_DSS_EXPORT1024_WITH_RC4_56_SHA 0x03000065
#define TLS1_CK_DHE_DSS_WITH_RC4_128_SHA 0x03000066 #define TLS1_CK_DHE_DSS_WITH_RC4_128_SHA 0x03000066
/* AES ciphersuites from RFC3268 */ /* AES ciphersuites from RFC3268 */
#define TLS1_CK_RSA_WITH_AES_128_SHA 0x0300002F #define TLS1_CK_RSA_WITH_AES_128_SHA 0x0300002F
#define TLS1_CK_DH_DSS_WITH_AES_128_SHA 0x03000030 #define TLS1_CK_DH_DSS_WITH_AES_128_SHA 0x03000030
#define TLS1_CK_DH_RSA_WITH_AES_128_SHA 0x03000031 #define TLS1_CK_DH_RSA_WITH_AES_128_SHA 0x03000031
#define TLS1_CK_DHE_DSS_WITH_AES_128_SHA 0x03000032 #define TLS1_CK_DHE_DSS_WITH_AES_128_SHA 0x03000032
#define TLS1_CK_DHE_RSA_WITH_AES_128_SHA 0x03000033 #define TLS1_CK_DHE_RSA_WITH_AES_128_SHA 0x03000033
#define TLS1_CK_ADH_WITH_AES_128_SHA 0x03000034 #define TLS1_CK_ADH_WITH_AES_128_SHA 0x03000034
#define TLS1_CK_RSA_WITH_AES_256_SHA 0x03000035 #define TLS1_CK_RSA_WITH_AES_256_SHA 0x03000035
#define TLS1_CK_DH_DSS_WITH_AES_256_SHA 0x03000036 #define TLS1_CK_DH_DSS_WITH_AES_256_SHA 0x03000036
#define TLS1_CK_DH_RSA_WITH_AES_256_SHA 0x03000037 #define TLS1_CK_DH_RSA_WITH_AES_256_SHA 0x03000037
#define TLS1_CK_DHE_DSS_WITH_AES_256_SHA 0x03000038 #define TLS1_CK_DHE_DSS_WITH_AES_256_SHA 0x03000038
#define TLS1_CK_DHE_RSA_WITH_AES_256_SHA 0x03000039 #define TLS1_CK_DHE_RSA_WITH_AES_256_SHA 0x03000039
#define TLS1_CK_ADH_WITH_AES_256_SHA 0x0300003A #define TLS1_CK_ADH_WITH_AES_256_SHA 0x0300003A
/* Camellia ciphersuites from RFC4132 */ /* Camellia ciphersuites from RFC4132 */
#define TLS1_CK_RSA_WITH_CAMELLIA_128_CBC_SHA 0x03000041 #define TLS1_CK_RSA_WITH_CAMELLIA_128_CBC_SHA 0x03000041
#define TLS1_CK_DH_DSS_WITH_CAMELLIA_128_CBC_SHA 0x03000042 #define TLS1_CK_DH_DSS_WITH_CAMELLIA_128_CBC_SHA 0x03000042
#define TLS1_CK_DH_RSA_WITH_CAMELLIA_128_CBC_SHA 0x03000043 #define TLS1_CK_DH_RSA_WITH_CAMELLIA_128_CBC_SHA 0x03000043
#define TLS1_CK_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA 0x03000044 #define TLS1_CK_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA 0x03000044
#define TLS1_CK_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA 0x03000045 #define TLS1_CK_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA 0x03000045
#define TLS1_CK_ADH_WITH_CAMELLIA_128_CBC_SHA 0x03000046 #define TLS1_CK_ADH_WITH_CAMELLIA_128_CBC_SHA 0x03000046
#define TLS1_CK_RSA_WITH_CAMELLIA_256_CBC_SHA 0x03000084 #define TLS1_CK_RSA_WITH_CAMELLIA_256_CBC_SHA 0x03000084
#define TLS1_CK_DH_DSS_WITH_CAMELLIA_256_CBC_SHA 0x03000085 #define TLS1_CK_DH_DSS_WITH_CAMELLIA_256_CBC_SHA 0x03000085
#define TLS1_CK_DH_RSA_WITH_CAMELLIA_256_CBC_SHA 0x03000086 #define TLS1_CK_DH_RSA_WITH_CAMELLIA_256_CBC_SHA 0x03000086
#define TLS1_CK_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA 0x03000087 #define TLS1_CK_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA 0x03000087
#define TLS1_CK_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA 0x03000088 #define TLS1_CK_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA 0x03000088
#define TLS1_CK_ADH_WITH_CAMELLIA_256_CBC_SHA 0x03000089 #define TLS1_CK_ADH_WITH_CAMELLIA_256_CBC_SHA 0x03000089
/* SEED ciphersuites from RFC4162 */
#define TLS1_CK_RSA_WITH_SEED_SHA 0x03000096
#define TLS1_CK_DH_DSS_WITH_SEED_SHA 0x03000097
#define TLS1_CK_DH_RSA_WITH_SEED_SHA 0x03000098
#define TLS1_CK_DHE_DSS_WITH_SEED_SHA 0x03000099
#define TLS1_CK_DHE_RSA_WITH_SEED_SHA 0x0300009A
#define TLS1_CK_ADH_WITH_SEED_SHA 0x0300009B
/* ECC ciphersuites from draft-ietf-tls-ecc-12.txt with changes soon to be in draft 13 */ /* ECC ciphersuites from draft-ietf-tls-ecc-12.txt with changes soon to be in draft 13 */
#define TLS1_CK_ECDH_ECDSA_WITH_NULL_SHA 0x0300C001 #define TLS1_CK_ECDH_ECDSA_WITH_NULL_SHA 0x0300C001
@@ -178,28 +273,28 @@ extern "C" {
* (The alias for the list of all such ciphers also is "EDH".) * (The alias for the list of all such ciphers also is "EDH".)
* The specifications speak of "EDH"; maybe we should allow both forms * The specifications speak of "EDH"; maybe we should allow both forms
* for everything. */ * for everything. */
#define TLS1_TXT_RSA_EXPORT1024_WITH_RC4_56_MD5 "EXP1024-RC4-MD5" #define TLS1_TXT_RSA_EXPORT1024_WITH_RC4_56_MD5 "EXP1024-RC4-MD5"
#define TLS1_TXT_RSA_EXPORT1024_WITH_RC2_CBC_56_MD5 "EXP1024-RC2-CBC-MD5" #define TLS1_TXT_RSA_EXPORT1024_WITH_RC2_CBC_56_MD5 "EXP1024-RC2-CBC-MD5"
#define TLS1_TXT_RSA_EXPORT1024_WITH_DES_CBC_SHA "EXP1024-DES-CBC-SHA" #define TLS1_TXT_RSA_EXPORT1024_WITH_DES_CBC_SHA "EXP1024-DES-CBC-SHA"
#define TLS1_TXT_DHE_DSS_EXPORT1024_WITH_DES_CBC_SHA "EXP1024-DHE-DSS-DES-CBC-SHA" #define TLS1_TXT_DHE_DSS_EXPORT1024_WITH_DES_CBC_SHA "EXP1024-DHE-DSS-DES-CBC-SHA"
#define TLS1_TXT_RSA_EXPORT1024_WITH_RC4_56_SHA "EXP1024-RC4-SHA" #define TLS1_TXT_RSA_EXPORT1024_WITH_RC4_56_SHA "EXP1024-RC4-SHA"
#define TLS1_TXT_DHE_DSS_EXPORT1024_WITH_RC4_56_SHA "EXP1024-DHE-DSS-RC4-SHA" #define TLS1_TXT_DHE_DSS_EXPORT1024_WITH_RC4_56_SHA "EXP1024-DHE-DSS-RC4-SHA"
#define TLS1_TXT_DHE_DSS_WITH_RC4_128_SHA "DHE-DSS-RC4-SHA" #define TLS1_TXT_DHE_DSS_WITH_RC4_128_SHA "DHE-DSS-RC4-SHA"
/* AES ciphersuites from RFC3268 */ /* AES ciphersuites from RFC3268 */
#define TLS1_TXT_RSA_WITH_AES_128_SHA "AES128-SHA" #define TLS1_TXT_RSA_WITH_AES_128_SHA "AES128-SHA"
#define TLS1_TXT_DH_DSS_WITH_AES_128_SHA "DH-DSS-AES128-SHA" #define TLS1_TXT_DH_DSS_WITH_AES_128_SHA "DH-DSS-AES128-SHA"
#define TLS1_TXT_DH_RSA_WITH_AES_128_SHA "DH-RSA-AES128-SHA" #define TLS1_TXT_DH_RSA_WITH_AES_128_SHA "DH-RSA-AES128-SHA"
#define TLS1_TXT_DHE_DSS_WITH_AES_128_SHA "DHE-DSS-AES128-SHA" #define TLS1_TXT_DHE_DSS_WITH_AES_128_SHA "DHE-DSS-AES128-SHA"
#define TLS1_TXT_DHE_RSA_WITH_AES_128_SHA "DHE-RSA-AES128-SHA" #define TLS1_TXT_DHE_RSA_WITH_AES_128_SHA "DHE-RSA-AES128-SHA"
#define TLS1_TXT_ADH_WITH_AES_128_SHA "ADH-AES128-SHA" #define TLS1_TXT_ADH_WITH_AES_128_SHA "ADH-AES128-SHA"
#define TLS1_TXT_RSA_WITH_AES_256_SHA "AES256-SHA" #define TLS1_TXT_RSA_WITH_AES_256_SHA "AES256-SHA"
#define TLS1_TXT_DH_DSS_WITH_AES_256_SHA "DH-DSS-AES256-SHA" #define TLS1_TXT_DH_DSS_WITH_AES_256_SHA "DH-DSS-AES256-SHA"
#define TLS1_TXT_DH_RSA_WITH_AES_256_SHA "DH-RSA-AES256-SHA" #define TLS1_TXT_DH_RSA_WITH_AES_256_SHA "DH-RSA-AES256-SHA"
#define TLS1_TXT_DHE_DSS_WITH_AES_256_SHA "DHE-DSS-AES256-SHA" #define TLS1_TXT_DHE_DSS_WITH_AES_256_SHA "DHE-DSS-AES256-SHA"
#define TLS1_TXT_DHE_RSA_WITH_AES_256_SHA "DHE-RSA-AES256-SHA" #define TLS1_TXT_DHE_RSA_WITH_AES_256_SHA "DHE-RSA-AES256-SHA"
#define TLS1_TXT_ADH_WITH_AES_256_SHA "ADH-AES256-SHA" #define TLS1_TXT_ADH_WITH_AES_256_SHA "ADH-AES256-SHA"
/* ECC ciphersuites from draft-ietf-tls-ecc-01.txt (Mar 15, 2001) */ /* ECC ciphersuites from draft-ietf-tls-ecc-01.txt (Mar 15, 2001) */
#define TLS1_TXT_ECDH_ECDSA_WITH_NULL_SHA "ECDH-ECDSA-NULL-SHA" #define TLS1_TXT_ECDH_ECDSA_WITH_NULL_SHA "ECDH-ECDSA-NULL-SHA"
@@ -232,50 +327,57 @@ extern "C" {
#define TLS1_TXT_ECDH_anon_WITH_AES_128_CBC_SHA "AECDH-AES128-SHA" #define TLS1_TXT_ECDH_anon_WITH_AES_128_CBC_SHA "AECDH-AES128-SHA"
#define TLS1_TXT_ECDH_anon_WITH_AES_256_CBC_SHA "AECDH-AES256-SHA" #define TLS1_TXT_ECDH_anon_WITH_AES_256_CBC_SHA "AECDH-AES256-SHA"
/* Camellia ciphersuites form RFC4132 */ /* Camellia ciphersuites from RFC4132 */
#define TLS1_TXT_RSA_WITH_CAMELLIA_128_CBC_SHA "CAMELLIA128-SHA" #define TLS1_TXT_RSA_WITH_CAMELLIA_128_CBC_SHA "CAMELLIA128-SHA"
#define TLS1_TXT_DH_DSS_WITH_CAMELLIA_128_CBC_SHA "DH-DSS-CAMELLIA128-SHA" #define TLS1_TXT_DH_DSS_WITH_CAMELLIA_128_CBC_SHA "DH-DSS-CAMELLIA128-SHA"
#define TLS1_TXT_DH_RSA_WITH_CAMELLIA_128_CBC_SHA "DH-RSA-CAMELLIA128-SHA" #define TLS1_TXT_DH_RSA_WITH_CAMELLIA_128_CBC_SHA "DH-RSA-CAMELLIA128-SHA"
#define TLS1_TXT_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA "DHE-DSS-CAMELLIA128-SHA" #define TLS1_TXT_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA "DHE-DSS-CAMELLIA128-SHA"
#define TLS1_TXT_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA "DHE-RSA-CAMELLIA128-SHA" #define TLS1_TXT_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA "DHE-RSA-CAMELLIA128-SHA"
#define TLS1_TXT_ADH_WITH_CAMELLIA_128_CBC_SHA "ADH-CAMELLIA128-SHA" #define TLS1_TXT_ADH_WITH_CAMELLIA_128_CBC_SHA "ADH-CAMELLIA128-SHA"
#define TLS1_TXT_RSA_WITH_CAMELLIA_256_CBC_SHA "CAMELLIA256-SHA" #define TLS1_TXT_RSA_WITH_CAMELLIA_256_CBC_SHA "CAMELLIA256-SHA"
#define TLS1_TXT_DH_DSS_WITH_CAMELLIA_256_CBC_SHA "DH-DSS-CAMELLIA256-SHA" #define TLS1_TXT_DH_DSS_WITH_CAMELLIA_256_CBC_SHA "DH-DSS-CAMELLIA256-SHA"
#define TLS1_TXT_DH_RSA_WITH_CAMELLIA_256_CBC_SHA "DH-RSA-CAMELLIA256-SHA" #define TLS1_TXT_DH_RSA_WITH_CAMELLIA_256_CBC_SHA "DH-RSA-CAMELLIA256-SHA"
#define TLS1_TXT_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA "DHE-DSS-CAMELLIA256-SHA" #define TLS1_TXT_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA "DHE-DSS-CAMELLIA256-SHA"
#define TLS1_TXT_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA "DHE-RSA-CAMELLIA256-SHA" #define TLS1_TXT_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA "DHE-RSA-CAMELLIA256-SHA"
#define TLS1_TXT_ADH_WITH_CAMELLIA_256_CBC_SHA "ADH-CAMELLIA256-SHA" #define TLS1_TXT_ADH_WITH_CAMELLIA_256_CBC_SHA "ADH-CAMELLIA256-SHA"
/* SEED ciphersuites from RFC4162 */
#define TLS1_TXT_RSA_WITH_SEED_SHA "SEED-SHA"
#define TLS1_TXT_DH_DSS_WITH_SEED_SHA "DH-DSS-SEED-SHA"
#define TLS1_TXT_DH_RSA_WITH_SEED_SHA "DH-RSA-SEED-SHA"
#define TLS1_TXT_DHE_DSS_WITH_SEED_SHA "DHE-DSS-SEED-SHA"
#define TLS1_TXT_DHE_RSA_WITH_SEED_SHA "DHE-RSA-SEED-SHA"
#define TLS1_TXT_ADH_WITH_SEED_SHA "ADH-SEED-SHA"
#define TLS_CT_RSA_SIGN 1 #define TLS_CT_RSA_SIGN 1
#define TLS_CT_DSS_SIGN 2 #define TLS_CT_DSS_SIGN 2
#define TLS_CT_RSA_FIXED_DH 3 #define TLS_CT_RSA_FIXED_DH 3
#define TLS_CT_DSS_FIXED_DH 4 #define TLS_CT_DSS_FIXED_DH 4
#define TLS_CT_ECDSA_SIGN 64 #define TLS_CT_ECDSA_SIGN 64
#define TLS_CT_RSA_FIXED_ECDH 65 #define TLS_CT_RSA_FIXED_ECDH 65
#define TLS_CT_ECDSA_FIXED_ECDH 66 #define TLS_CT_ECDSA_FIXED_ECDH 66
#define TLS_CT_NUMBER 7 #define TLS_CT_NUMBER 7
#define TLS1_FINISH_MAC_LENGTH 12 #define TLS1_FINISH_MAC_LENGTH 12
#define TLS_MD_MAX_CONST_SIZE 20 #define TLS_MD_MAX_CONST_SIZE 20
#define TLS_MD_CLIENT_FINISH_CONST "client finished" #define TLS_MD_CLIENT_FINISH_CONST "client finished"
#define TLS_MD_CLIENT_FINISH_CONST_SIZE 15 #define TLS_MD_CLIENT_FINISH_CONST_SIZE 15
#define TLS_MD_SERVER_FINISH_CONST "server finished" #define TLS_MD_SERVER_FINISH_CONST "server finished"
#define TLS_MD_SERVER_FINISH_CONST_SIZE 15 #define TLS_MD_SERVER_FINISH_CONST_SIZE 15
#define TLS_MD_SERVER_WRITE_KEY_CONST "server write key" #define TLS_MD_SERVER_WRITE_KEY_CONST "server write key"
#define TLS_MD_SERVER_WRITE_KEY_CONST_SIZE 16 #define TLS_MD_SERVER_WRITE_KEY_CONST_SIZE 16
#define TLS_MD_KEY_EXPANSION_CONST "key expansion" #define TLS_MD_KEY_EXPANSION_CONST "key expansion"
#define TLS_MD_KEY_EXPANSION_CONST_SIZE 13 #define TLS_MD_KEY_EXPANSION_CONST_SIZE 13
#define TLS_MD_CLIENT_WRITE_KEY_CONST "client write key" #define TLS_MD_CLIENT_WRITE_KEY_CONST "client write key"
#define TLS_MD_CLIENT_WRITE_KEY_CONST_SIZE 16 #define TLS_MD_CLIENT_WRITE_KEY_CONST_SIZE 16
#define TLS_MD_SERVER_WRITE_KEY_CONST "server write key" #define TLS_MD_SERVER_WRITE_KEY_CONST "server write key"
#define TLS_MD_SERVER_WRITE_KEY_CONST_SIZE 16 #define TLS_MD_SERVER_WRITE_KEY_CONST_SIZE 16
#define TLS_MD_IV_BLOCK_CONST "IV block" #define TLS_MD_IV_BLOCK_CONST "IV block"
#define TLS_MD_IV_BLOCK_CONST_SIZE 8 #define TLS_MD_IV_BLOCK_CONST_SIZE 8
#define TLS_MD_MASTER_SECRET_CONST "master secret" #define TLS_MD_MASTER_SECRET_CONST "master secret"
#define TLS_MD_MASTER_SECRET_CONST_SIZE 13 #define TLS_MD_MASTER_SECRET_CONST_SIZE 13
#ifdef CHARSET_EBCDIC #ifdef CHARSET_EBCDIC
#undef TLS_MD_CLIENT_FINISH_CONST #undef TLS_MD_CLIENT_FINISH_CONST
@@ -303,4 +405,3 @@ extern "C" {
dep/include/openssl/x509.h
+617 -607
View File
File diff suppressed because it is too large Load Diff
dep/include/openssl/x509v3.h
+328 -326
View File
@@ -1,5 +1,5 @@
/* x509v3.h */ /* x509v3.h */
/* Written by Dr Stephen N Henson (s[email protected]) for the OpenSSL /* Written by Dr Stephen N Henson (s[email protected]) for the OpenSSL
* project 1999. * project 1999.
*/ */
/* ==================================================================== /* ====================================================================
@@ -108,7 +108,7 @@ X509V3_EXT_V2I v2i;
X509V3_EXT_I2R i2r; X509V3_EXT_I2R i2r;
X509V3_EXT_R2I r2i; X509V3_EXT_R2I r2i;
void *usr_data; /* Any extension specific data */ void *usr_data; /* Any extension specific data */
}; };
typedef struct X509V3_CONF_METHOD_st { typedef struct X509V3_CONF_METHOD_st {
@@ -136,9 +136,9 @@ typedef struct v3_ext_method X509V3_EXT_METHOD;
DECLARE_STACK_OF(X509V3_EXT_METHOD) DECLARE_STACK_OF(X509V3_EXT_METHOD)
/* ext_flags values */ /* ext_flags values */
#define X509V3_EXT_DYNAMIC 0x1 #define X509V3_EXT_DYNAMIC 0x1
#define X509V3_EXT_CTX_DEP 0x2 #define X509V3_EXT_CTX_DEP 0x2
#define X509V3_EXT_MULTILINE 0x4 #define X509V3_EXT_MULTILINE 0x4
typedef BIT_STRING_BITNAME ENUMERATED_NAMES; typedef BIT_STRING_BITNAME ENUMERATED_NAMES;
@@ -159,49 +159,49 @@ ASN1_TYPE *value;
} OTHERNAME; } OTHERNAME;
typedef struct EDIPartyName_st { typedef struct EDIPartyName_st {
ASN1_STRING *nameAssigner; ASN1_STRING *nameAssigner;
ASN1_STRING *partyName; ASN1_STRING *partyName;
} EDIPARTYNAME; } EDIPARTYNAME;
typedef struct GENERAL_NAME_st { typedef struct GENERAL_NAME_st {
#define GEN_OTHERNAME 0 #define GEN_OTHERNAME 0
#define GEN_EMAIL 1 #define GEN_EMAIL 1
#define GEN_DNS 2 #define GEN_DNS 2
#define GEN_X400 3 #define GEN_X400 3
#define GEN_DIRNAME 4 #define GEN_DIRNAME 4
#define GEN_EDIPARTY 5 #define GEN_EDIPARTY 5
#define GEN_URI 6 #define GEN_URI 6
#define GEN_IPADD 7 #define GEN_IPADD 7
#define GEN_RID 8 #define GEN_RID 8
int type; int type;
union { union {
char *ptr; char *ptr;
OTHERNAME *otherName; /* otherName */ OTHERNAME *otherName; /* otherName */
ASN1_IA5STRING *rfc822Name; ASN1_IA5STRING *rfc822Name;
ASN1_IA5STRING *dNSName; ASN1_IA5STRING *dNSName;
ASN1_TYPE *x400Address; ASN1_TYPE *x400Address;
X509_NAME *directoryName; X509_NAME *directoryName;
EDIPARTYNAME *ediPartyName; EDIPARTYNAME *ediPartyName;
ASN1_IA5STRING *uniformResourceIdentifier; ASN1_IA5STRING *uniformResourceIdentifier;
ASN1_OCTET_STRING *iPAddress; ASN1_OCTET_STRING *iPAddress;
ASN1_OBJECT *registeredID; ASN1_OBJECT *registeredID;
/* Old names */ /* Old names */
ASN1_OCTET_STRING *ip; /* iPAddress */ ASN1_OCTET_STRING *ip; /* iPAddress */
X509_NAME *dirn; /* dirn */ X509_NAME *dirn; /* dirn */
ASN1_IA5STRING *ia5;/* rfc822Name, dNSName, uniformResourceIdentifier */ ASN1_IA5STRING *ia5;/* rfc822Name, dNSName, uniformResourceIdentifier */
ASN1_OBJECT *rid; /* registeredID */ ASN1_OBJECT *rid; /* registeredID */
ASN1_TYPE *other; /* x400Address */ ASN1_TYPE *other; /* x400Address */
} d; } d;
} GENERAL_NAME; } GENERAL_NAME;
typedef STACK_OF(GENERAL_NAME) GENERAL_NAMES; typedef STACK_OF(GENERAL_NAME) GENERAL_NAMES;
typedef struct ACCESS_DESCRIPTION_st { typedef struct ACCESS_DESCRIPTION_st {
ASN1_OBJECT *method; ASN1_OBJECT *method;
GENERAL_NAME *location; GENERAL_NAME *location;
} ACCESS_DESCRIPTION; } ACCESS_DESCRIPTION;
typedef STACK_OF(ACCESS_DESCRIPTION) AUTHORITY_INFO_ACCESS; typedef STACK_OF(ACCESS_DESCRIPTION) AUTHORITY_INFO_ACCESS;
@@ -217,13 +217,13 @@ DECLARE_ASN1_SET_OF(ACCESS_DESCRIPTION)
typedef struct DIST_POINT_NAME_st { typedef struct DIST_POINT_NAME_st {
int type; int type;
union { union {
GENERAL_NAMES *fullname; GENERAL_NAMES *fullname;
STACK_OF(X509_NAME_ENTRY) *relativename; STACK_OF(X509_NAME_ENTRY) *relativename;
} name; } name;
} DIST_POINT_NAME; } DIST_POINT_NAME;
typedef struct DIST_POINT_st { typedef struct DIST_POINT_st {
DIST_POINT_NAME *distpoint; DIST_POINT_NAME *distpoint;
ASN1_BIT_STRING *reasons; ASN1_BIT_STRING *reasons;
GENERAL_NAMES *CRLissuer; GENERAL_NAMES *CRLissuer;
} DIST_POINT; } DIST_POINT;
@@ -242,43 +242,43 @@ ASN1_INTEGER *serial;
/* Strong extranet structures */ /* Strong extranet structures */
typedef struct SXNET_ID_st { typedef struct SXNET_ID_st {
ASN1_INTEGER *zone; ASN1_INTEGER *zone;
ASN1_OCTET_STRING *user; ASN1_OCTET_STRING *user;
} SXNETID; } SXNETID;
DECLARE_STACK_OF(SXNETID) DECLARE_STACK_OF(SXNETID)
DECLARE_ASN1_SET_OF(SXNETID) DECLARE_ASN1_SET_OF(SXNETID)
typedef struct SXNET_st { typedef struct SXNET_st {
ASN1_INTEGER *version; ASN1_INTEGER *version;
STACK_OF(SXNETID) *ids; STACK_OF(SXNETID) *ids;
} SXNET; } SXNET;
typedef struct NOTICEREF_st { typedef struct NOTICEREF_st {
ASN1_STRING *organization; ASN1_STRING *organization;
STACK_OF(ASN1_INTEGER) *noticenos; STACK_OF(ASN1_INTEGER) *noticenos;
} NOTICEREF; } NOTICEREF;
typedef struct USERNOTICE_st { typedef struct USERNOTICE_st {
NOTICEREF *noticeref; NOTICEREF *noticeref;
ASN1_STRING *exptext; ASN1_STRING *exptext;
} USERNOTICE; } USERNOTICE;
typedef struct POLICYQUALINFO_st { typedef struct POLICYQUALINFO_st {
ASN1_OBJECT *pqualid; ASN1_OBJECT *pqualid;
union { union {
ASN1_IA5STRING *cpsuri; ASN1_IA5STRING *cpsuri;
USERNOTICE *usernotice; USERNOTICE *usernotice;
ASN1_TYPE *other; ASN1_TYPE *other;
} d; } d;
} POLICYQUALINFO; } POLICYQUALINFO;
DECLARE_STACK_OF(POLICYQUALINFO) DECLARE_STACK_OF(POLICYQUALINFO)
DECLARE_ASN1_SET_OF(POLICYQUALINFO) DECLARE_ASN1_SET_OF(POLICYQUALINFO)
typedef struct POLICYINFO_st { typedef struct POLICYINFO_st {
ASN1_OBJECT *policyid; ASN1_OBJECT *policyid;
STACK_OF(POLICYQUALINFO) *qualifiers; STACK_OF(POLICYQUALINFO) *qualifiers;
} POLICYINFO; } POLICYINFO;
typedef STACK_OF(POLICYINFO) CERTIFICATEPOLICIES; typedef STACK_OF(POLICYINFO) CERTIFICATEPOLICIES;
@@ -287,8 +287,8 @@ DECLARE_STACK_OF(POLICYINFO)
DECLARE_ASN1_SET_OF(POLICYINFO) DECLARE_ASN1_SET_OF(POLICYINFO)
typedef struct POLICY_MAPPING_st { typedef struct POLICY_MAPPING_st {
ASN1_OBJECT *issuerDomainPolicy; ASN1_OBJECT *issuerDomainPolicy;
ASN1_OBJECT *subjectDomainPolicy; ASN1_OBJECT *subjectDomainPolicy;
} POLICY_MAPPING; } POLICY_MAPPING;
DECLARE_STACK_OF(POLICY_MAPPING) DECLARE_STACK_OF(POLICY_MAPPING)
@@ -296,35 +296,35 @@ DECLARE_STACK_OF(POLICY_MAPPING)
typedef STACK_OF(POLICY_MAPPING) POLICY_MAPPINGS; typedef STACK_OF(POLICY_MAPPING) POLICY_MAPPINGS;
typedef struct GENERAL_SUBTREE_st { typedef struct GENERAL_SUBTREE_st {
GENERAL_NAME *base; GENERAL_NAME *base;
ASN1_INTEGER *minimum; ASN1_INTEGER *minimum;
ASN1_INTEGER *maximum; ASN1_INTEGER *maximum;
} GENERAL_SUBTREE; } GENERAL_SUBTREE;
DECLARE_STACK_OF(GENERAL_SUBTREE) DECLARE_STACK_OF(GENERAL_SUBTREE)
typedef struct NAME_CONSTRAINTS_st { typedef struct NAME_CONSTRAINTS_st {
STACK_OF(GENERAL_SUBTREE) *permittedSubtrees; STACK_OF(GENERAL_SUBTREE) *permittedSubtrees;
STACK_OF(GENERAL_SUBTREE) *excludedSubtrees; STACK_OF(GENERAL_SUBTREE) *excludedSubtrees;
} NAME_CONSTRAINTS; } NAME_CONSTRAINTS;
typedef struct POLICY_CONSTRAINTS_st { typedef struct POLICY_CONSTRAINTS_st {
ASN1_INTEGER *requireExplicitPolicy; ASN1_INTEGER *requireExplicitPolicy;
ASN1_INTEGER *inhibitPolicyMapping; ASN1_INTEGER *inhibitPolicyMapping;
} POLICY_CONSTRAINTS; } POLICY_CONSTRAINTS;
/* Proxy certificate structures, see RFC 3820 */ /* Proxy certificate structures, see RFC 3820 */
typedef struct PROXY_POLICY_st typedef struct PROXY_POLICY_st
{ {
ASN1_OBJECT *policyLanguage; ASN1_OBJECT *policyLanguage;
ASN1_OCTET_STRING *policy; ASN1_OCTET_STRING *policy;
} PROXY_POLICY; } PROXY_POLICY;
typedef struct PROXY_CERT_INFO_EXTENSION_st typedef struct PROXY_CERT_INFO_EXTENSION_st
{ {
ASN1_INTEGER *pcPathLengthConstraint; ASN1_INTEGER *pcPathLengthConstraint;
PROXY_POLICY *proxyPolicy; PROXY_POLICY *proxyPolicy;
} PROXY_CERT_INFO_EXTENSION; } PROXY_CERT_INFO_EXTENSION;
DECLARE_ASN1_FUNCTIONS(PROXY_POLICY) DECLARE_ASN1_FUNCTIONS(PROXY_POLICY)
DECLARE_ASN1_FUNCTIONS(PROXY_CERT_INFO_EXTENSION) DECLARE_ASN1_FUNCTIONS(PROXY_CERT_INFO_EXTENSION)
@@ -334,120 +334,122 @@ DECLARE_ASN1_FUNCTIONS(PROXY_CERT_INFO_EXTENSION)
",name:", val->name, ",value:", val->value); ",name:", val->name, ",value:", val->value);
#define X509V3_set_ctx_test(ctx) \ #define X509V3_set_ctx_test(ctx) \
X509V3_set_ctx(ctx, NULL, NULL, NULL, NULL, CTX_TEST) X509V3_set_ctx(ctx, NULL, NULL, NULL, NULL, CTX_TEST)
#define X509V3_set_ctx_nodb(ctx) (ctx)->db = NULL; #define X509V3_set_ctx_nodb(ctx) (ctx)->db = NULL;
#define EXT_BITSTRING(nid, table) { nid, 0, ASN1_ITEM_ref(ASN1_BIT_STRING), \ #define EXT_BITSTRING(nid, table) { nid, 0, ASN1_ITEM_ref(ASN1_BIT_STRING), \
0,0,0,0, \ 0,0,0,0, \
0,0, \ 0,0, \
(X509V3_EXT_I2V)i2v_ASN1_BIT_STRING, \ (X509V3_EXT_I2V)i2v_ASN1_BIT_STRING, \
(X509V3_EXT_V2I)v2i_ASN1_BIT_STRING, \ (X509V3_EXT_V2I)v2i_ASN1_BIT_STRING, \
NULL, NULL, \ NULL, NULL, \
table} table}
#define EXT_IA5STRING(nid) { nid, 0, ASN1_ITEM_ref(ASN1_IA5STRING), \ #define EXT_IA5STRING(nid) { nid, 0, ASN1_ITEM_ref(ASN1_IA5STRING), \
0,0,0,0, \ 0,0,0,0, \
(X509V3_EXT_I2S)i2s_ASN1_IA5STRING, \ (X509V3_EXT_I2S)i2s_ASN1_IA5STRING, \
(X509V3_EXT_S2I)s2i_ASN1_IA5STRING, \ (X509V3_EXT_S2I)s2i_ASN1_IA5STRING, \
0,0,0,0, \ 0,0,0,0, \
NULL} NULL}
#define EXT_END { -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0} #define EXT_END { -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
/* X509_PURPOSE stuff */ /* X509_PURPOSE stuff */
#define EXFLAG_BCONS 0x1 #define EXFLAG_BCONS 0x1
#define EXFLAG_KUSAGE 0x2 #define EXFLAG_KUSAGE 0x2
#define EXFLAG_XKUSAGE 0x4 #define EXFLAG_XKUSAGE 0x4
#define EXFLAG_NSCERT 0x8 #define EXFLAG_NSCERT 0x8
#define EXFLAG_CA 0x10 #define EXFLAG_CA 0x10
#define EXFLAG_SS 0x20 /* Really self issued not necessarily self signed */
#define EXFLAG_V1 0x40 #define EXFLAG_SI 0x20
#define EXFLAG_INVALID 0x80 #define EXFLAG_SS 0x20
#define EXFLAG_SET 0x100 #define EXFLAG_V1 0x40
#define EXFLAG_CRITICAL 0x200 #define EXFLAG_INVALID 0x80
#define EXFLAG_PROXY 0x400 #define EXFLAG_SET 0x100
#define EXFLAG_CRITICAL 0x200
#define EXFLAG_PROXY 0x400
#define EXFLAG_INVALID_POLICY 0x400 #define EXFLAG_INVALID_POLICY 0x800
#define KU_DIGITAL_SIGNATURE 0x0080 #define KU_DIGITAL_SIGNATURE 0x0080
#define KU_NON_REPUDIATION 0x0040 #define KU_NON_REPUDIATION 0x0040
#define KU_KEY_ENCIPHERMENT 0x0020 #define KU_KEY_ENCIPHERMENT 0x0020
#define KU_DATA_ENCIPHERMENT 0x0010 #define KU_DATA_ENCIPHERMENT 0x0010
#define KU_KEY_AGREEMENT 0x0008 #define KU_KEY_AGREEMENT 0x0008
#define KU_KEY_CERT_SIGN 0x0004 #define KU_KEY_CERT_SIGN 0x0004
#define KU_CRL_SIGN 0x0002 #define KU_CRL_SIGN 0x0002
#define KU_ENCIPHER_ONLY 0x0001 #define KU_ENCIPHER_ONLY 0x0001
#define KU_DECIPHER_ONLY 0x8000 #define KU_DECIPHER_ONLY 0x8000
#define NS_SSL_CLIENT 0x80 #define NS_SSL_CLIENT 0x80
#define NS_SSL_SERVER 0x40 #define NS_SSL_SERVER 0x40
#define NS_SMIME 0x20 #define NS_SMIME 0x20
#define NS_OBJSIGN 0x10 #define NS_OBJSIGN 0x10
#define NS_SSL_CA 0x04 #define NS_SSL_CA 0x04
#define NS_SMIME_CA 0x02 #define NS_SMIME_CA 0x02
#define NS_OBJSIGN_CA 0x01 #define NS_OBJSIGN_CA 0x01
#define NS_ANY_CA (NS_SSL_CA|NS_SMIME_CA|NS_OBJSIGN_CA) #define NS_ANY_CA (NS_SSL_CA|NS_SMIME_CA|NS_OBJSIGN_CA)
#define XKU_SSL_SERVER 0x1 #define XKU_SSL_SERVER 0x1
#define XKU_SSL_CLIENT 0x2 #define XKU_SSL_CLIENT 0x2
#define XKU_SMIME 0x4 #define XKU_SMIME 0x4
#define XKU_CODE_SIGN 0x8 #define XKU_CODE_SIGN 0x8
#define XKU_SGC 0x10 #define XKU_SGC 0x10
#define XKU_OCSP_SIGN 0x20 #define XKU_OCSP_SIGN 0x20
#define XKU_TIMESTAMP 0x40 #define XKU_TIMESTAMP 0x40
#define XKU_DVCS 0x80 #define XKU_DVCS 0x80
#define X509_PURPOSE_DYNAMIC 0x1 #define X509_PURPOSE_DYNAMIC 0x1
#define X509_PURPOSE_DYNAMIC_NAME 0x2 #define X509_PURPOSE_DYNAMIC_NAME 0x2
typedef struct x509_purpose_st { typedef struct x509_purpose_st {
int purpose; int purpose;
int trust; /* Default trust ID */ int trust; /* Default trust ID */
int flags; int flags;
int (*check_purpose)(const struct x509_purpose_st *, int (*check_purpose)(const struct x509_purpose_st *,
const X509 *, int); const X509 *, int);
char *name; char *name;
char *sname; char *sname;
void *usr_data; void *usr_data;
} X509_PURPOSE; } X509_PURPOSE;
#define X509_PURPOSE_SSL_CLIENT 1 #define X509_PURPOSE_SSL_CLIENT 1
#define X509_PURPOSE_SSL_SERVER 2 #define X509_PURPOSE_SSL_SERVER 2
#define X509_PURPOSE_NS_SSL_SERVER 3 #define X509_PURPOSE_NS_SSL_SERVER 3
#define X509_PURPOSE_SMIME_SIGN 4 #define X509_PURPOSE_SMIME_SIGN 4
#define X509_PURPOSE_SMIME_ENCRYPT 5 #define X509_PURPOSE_SMIME_ENCRYPT 5
#define X509_PURPOSE_CRL_SIGN 6 #define X509_PURPOSE_CRL_SIGN 6
#define X509_PURPOSE_ANY 7 #define X509_PURPOSE_ANY 7
#define X509_PURPOSE_OCSP_HELPER 8 #define X509_PURPOSE_OCSP_HELPER 8
#define X509_PURPOSE_MIN 1 #define X509_PURPOSE_MIN 1
#define X509_PURPOSE_MAX 8 #define X509_PURPOSE_MAX 8
/* Flags for X509V3_EXT_print() */ /* Flags for X509V3_EXT_print() */
#define X509V3_EXT_UNKNOWN_MASK (0xfL << 16) #define X509V3_EXT_UNKNOWN_MASK (0xfL << 16)
/* Return error for unknown extensions */ /* Return error for unknown extensions */
#define X509V3_EXT_DEFAULT 0 #define X509V3_EXT_DEFAULT 0
/* Print error for unknown extensions */ /* Print error for unknown extensions */
#define X509V3_EXT_ERROR_UNKNOWN (1L << 16) #define X509V3_EXT_ERROR_UNKNOWN (1L << 16)
/* ASN1 parse unknown extensions */ /* ASN1 parse unknown extensions */
#define X509V3_EXT_PARSE_UNKNOWN (2L << 16) #define X509V3_EXT_PARSE_UNKNOWN (2L << 16)
/* BIO_dump unknown extensions */ /* BIO_dump unknown extensions */
#define X509V3_EXT_DUMP_UNKNOWN (3L << 16) #define X509V3_EXT_DUMP_UNKNOWN (3L << 16)
/* Flags for X509V3_add1_i2d */ /* Flags for X509V3_add1_i2d */
#define X509V3_ADD_OP_MASK 0xfL #define X509V3_ADD_OP_MASK 0xfL
#define X509V3_ADD_DEFAULT 0L #define X509V3_ADD_DEFAULT 0L
#define X509V3_ADD_APPEND 1L #define X509V3_ADD_APPEND 1L
#define X509V3_ADD_REPLACE 2L #define X509V3_ADD_REPLACE 2L
#define X509V3_ADD_REPLACE_EXISTING 3L #define X509V3_ADD_REPLACE_EXISTING 3L
#define X509V3_ADD_KEEP_EXISTING 4L #define X509V3_ADD_KEEP_EXISTING 4L
#define X509V3_ADD_DELETE 5L #define X509V3_ADD_DELETE 5L
#define X509V3_ADD_SILENT 0x10 #define X509V3_ADD_SILENT 0x10
DECLARE_STACK_OF(X509_PURPOSE) DECLARE_STACK_OF(X509_PURPOSE)
@@ -472,10 +474,10 @@ DECLARE_ASN1_FUNCTIONS(GENERAL_NAME)
ASN1_BIT_STRING *v2i_ASN1_BIT_STRING(X509V3_EXT_METHOD *method, ASN1_BIT_STRING *v2i_ASN1_BIT_STRING(X509V3_EXT_METHOD *method,
X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval); X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval);
STACK_OF(CONF_VALUE) *i2v_ASN1_BIT_STRING(X509V3_EXT_METHOD *method, STACK_OF(CONF_VALUE) *i2v_ASN1_BIT_STRING(X509V3_EXT_METHOD *method,
ASN1_BIT_STRING *bits, ASN1_BIT_STRING *bits,
STACK_OF(CONF_VALUE) *extlist); STACK_OF(CONF_VALUE) *extlist);
STACK_OF(CONF_VALUE) *i2v_GENERAL_NAME(X509V3_EXT_METHOD *method, GENERAL_NAME *gen, STACK_OF(CONF_VALUE) *ret); STACK_OF(CONF_VALUE) *i2v_GENERAL_NAME(X509V3_EXT_METHOD *method, GENERAL_NAME *gen, STACK_OF(CONF_VALUE) *ret);
int GENERAL_NAME_print(BIO *out, GENERAL_NAME *gen); int GENERAL_NAME_print(BIO *out, GENERAL_NAME *gen);
@@ -483,9 +485,9 @@ int GENERAL_NAME_print(BIO *out, GENERAL_NAME *gen);
DECLARE_ASN1_FUNCTIONS(GENERAL_NAMES) DECLARE_ASN1_FUNCTIONS(GENERAL_NAMES)
STACK_OF(CONF_VALUE) *i2v_GENERAL_NAMES(X509V3_EXT_METHOD *method, STACK_OF(CONF_VALUE) *i2v_GENERAL_NAMES(X509V3_EXT_METHOD *method,
GENERAL_NAMES *gen, STACK_OF(CONF_VALUE) *extlist); GENERAL_NAMES *gen, STACK_OF(CONF_VALUE) *extlist);
GENERAL_NAMES *v2i_GENERAL_NAMES(X509V3_EXT_METHOD *method, GENERAL_NAMES *v2i_GENERAL_NAMES(X509V3_EXT_METHOD *method,
X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval); X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval);
DECLARE_ASN1_FUNCTIONS(OTHERNAME) DECLARE_ASN1_FUNCTIONS(OTHERNAME)
DECLARE_ASN1_FUNCTIONS(EDIPARTYNAME) DECLARE_ASN1_FUNCTIONS(EDIPARTYNAME)
@@ -524,9 +526,9 @@ DECLARE_ASN1_ITEM(POLICY_CONSTRAINTS)
#ifdef HEADER_CONF_H #ifdef HEADER_CONF_H
GENERAL_NAME *v2i_GENERAL_NAME(X509V3_EXT_METHOD *method, X509V3_CTX *ctx, GENERAL_NAME *v2i_GENERAL_NAME(X509V3_EXT_METHOD *method, X509V3_CTX *ctx,
CONF_VALUE *cnf); CONF_VALUE *cnf);
GENERAL_NAME *v2i_GENERAL_NAME_ex(GENERAL_NAME *out, X509V3_EXT_METHOD *method, GENERAL_NAME *v2i_GENERAL_NAME_ex(GENERAL_NAME *out, X509V3_EXT_METHOD *method,
X509V3_CTX *ctx, CONF_VALUE *cnf, int is_nc); X509V3_CTX *ctx, CONF_VALUE *cnf, int is_nc);
void X509V3_conf_free(CONF_VALUE *val); void X509V3_conf_free(CONF_VALUE *val);
X509_EXTENSION *X509V3_EXT_nconf_nid(CONF *conf, X509V3_CTX *ctx, int ext_nid, char *value); X509_EXTENSION *X509V3_EXT_nconf_nid(CONF *conf, X509V3_CTX *ctx, int ext_nid, char *value);
@@ -543,7 +545,7 @@ int X509V3_EXT_REQ_add_conf(LHASH *conf, X509V3_CTX *ctx, char *section, X509_RE
int X509V3_EXT_CRL_add_conf(LHASH *conf, X509V3_CTX *ctx, char *section, X509_CRL *crl); int X509V3_EXT_CRL_add_conf(LHASH *conf, X509V3_CTX *ctx, char *section, X509_CRL *crl);
int X509V3_add_value_bool_nf(char *name, int asn1_bool, int X509V3_add_value_bool_nf(char *name, int asn1_bool,
STACK_OF(CONF_VALUE) **extlist); STACK_OF(CONF_VALUE) **extlist);
int X509V3_get_value_bool(CONF_VALUE *value, int *asn1_bool); int X509V3_get_value_bool(CONF_VALUE *value, int *asn1_bool);
int X509V3_get_value_int(CONF_VALUE *value, ASN1_INTEGER **aint); int X509V3_get_value_int(CONF_VALUE *value, ASN1_INTEGER **aint);
void X509V3_set_nconf(X509V3_CTX *ctx, CONF *conf); void X509V3_set_nconf(X509V3_CTX *ctx, CONF *conf);
@@ -555,16 +557,16 @@ STACK_OF(CONF_VALUE) * X509V3_get_section(X509V3_CTX *ctx, char *section);
void X509V3_string_free(X509V3_CTX *ctx, char *str); void X509V3_string_free(X509V3_CTX *ctx, char *str);
void X509V3_section_free( X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *section); void X509V3_section_free( X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *section);
void X509V3_set_ctx(X509V3_CTX *ctx, X509 *issuer, X509 *subject, void X509V3_set_ctx(X509V3_CTX *ctx, X509 *issuer, X509 *subject,
X509_REQ *req, X509_CRL *crl, int flags); X509_REQ *req, X509_CRL *crl, int flags);
int X509V3_add_value(const char *name, const char *value, int X509V3_add_value(const char *name, const char *value,
STACK_OF(CONF_VALUE) **extlist); STACK_OF(CONF_VALUE) **extlist);
int X509V3_add_value_uchar(const char *name, const unsigned char *value, int X509V3_add_value_uchar(const char *name, const unsigned char *value,
STACK_OF(CONF_VALUE) **extlist); STACK_OF(CONF_VALUE) **extlist);
int X509V3_add_value_bool(const char *name, int asn1_bool, int X509V3_add_value_bool(const char *name, int asn1_bool,
STACK_OF(CONF_VALUE) **extlist); STACK_OF(CONF_VALUE) **extlist);
int X509V3_add_value_int(const char *name, ASN1_INTEGER *aint, int X509V3_add_value_int(const char *name, ASN1_INTEGER *aint,
STACK_OF(CONF_VALUE) **extlist); STACK_OF(CONF_VALUE) **extlist);
char * i2s_ASN1_INTEGER(X509V3_EXT_METHOD *meth, ASN1_INTEGER *aint); char * i2s_ASN1_INTEGER(X509V3_EXT_METHOD *meth, ASN1_INTEGER *aint);
ASN1_INTEGER * s2i_ASN1_INTEGER(X509V3_EXT_METHOD *meth, char *value); ASN1_INTEGER * s2i_ASN1_INTEGER(X509V3_EXT_METHOD *meth, char *value);
char * i2s_ASN1_ENUMERATED(X509V3_EXT_METHOD *meth, ASN1_ENUMERATED *aint); char * i2s_ASN1_ENUMERATED(X509V3_EXT_METHOD *meth, ASN1_ENUMERATED *aint);
@@ -590,7 +592,7 @@ unsigned char *string_to_hex(char *str, long *len);
int name_cmp(const char *name, const char *cmp); int name_cmp(const char *name, const char *cmp);
void X509V3_EXT_val_prn(BIO *out, STACK_OF(CONF_VALUE) *val, int indent, void X509V3_EXT_val_prn(BIO *out, STACK_OF(CONF_VALUE) *val, int indent,
int ml); int ml);
int X509V3_EXT_print(BIO *out, X509_EXTENSION *ext, unsigned long flag, int indent); int X509V3_EXT_print(BIO *out, X509_EXTENSION *ext, unsigned long flag, int indent);
int X509V3_EXT_print_fp(FILE *out, X509_EXTENSION *ext, int flag, int indent); int X509V3_EXT_print_fp(FILE *out, X509_EXTENSION *ext, int flag, int indent);
@@ -606,8 +608,8 @@ X509_PURPOSE * X509_PURPOSE_get0(int idx);
int X509_PURPOSE_get_by_sname(char *sname); int X509_PURPOSE_get_by_sname(char *sname);
int X509_PURPOSE_get_by_id(int id); int X509_PURPOSE_get_by_id(int id);
int X509_PURPOSE_add(int id, int trust, int flags, int X509_PURPOSE_add(int id, int trust, int flags,
int (*ck)(const X509_PURPOSE *, const X509 *, int), int (*ck)(const X509_PURPOSE *, const X509 *, int),
char *name, char *sname, void *arg); char *name, char *sname, void *arg);
char *X509_PURPOSE_get0_name(X509_PURPOSE *xp); char *X509_PURPOSE_get0_name(X509_PURPOSE *xp);
char *X509_PURPOSE_get0_sname(X509_PURPOSE *xp); char *X509_PURPOSE_get0_sname(X509_PURPOSE *xp);
int X509_PURPOSE_get_trust(X509_PURPOSE *xp); int X509_PURPOSE_get_trust(X509_PURPOSE *xp);
@@ -617,12 +619,13 @@ int X509_PURPOSE_get_id(X509_PURPOSE *);
STACK *X509_get1_email(X509 *x); STACK *X509_get1_email(X509 *x);
STACK *X509_REQ_get1_email(X509_REQ *x); STACK *X509_REQ_get1_email(X509_REQ *x);
void X509_email_free(STACK *sk); void X509_email_free(STACK *sk);
STACK *X509_get1_ocsp(X509 *x);
ASN1_OCTET_STRING *a2i_IPADDRESS(const char *ipasc); ASN1_OCTET_STRING *a2i_IPADDRESS(const char *ipasc);
ASN1_OCTET_STRING *a2i_IPADDRESS_NC(const char *ipasc); ASN1_OCTET_STRING *a2i_IPADDRESS_NC(const char *ipasc);
int a2i_ipadd(unsigned char *ipout, const char *ipasc); int a2i_ipadd(unsigned char *ipout, const char *ipasc);
int X509V3_NAME_from_section(X509_NAME *nm, STACK_OF(CONF_VALUE)*dn_sk, int X509V3_NAME_from_section(X509_NAME *nm, STACK_OF(CONF_VALUE)*dn_sk,
unsigned long chtype); unsigned long chtype);
void X509_POLICY_NODE_print(BIO *out, X509_POLICY_NODE *node, int indent); void X509_POLICY_NODE_print(BIO *out, X509_POLICY_NODE *node, int indent);
@@ -632,8 +635,8 @@ typedef struct ASRange_st {
ASN1_INTEGER *min, *max; ASN1_INTEGER *min, *max;
} ASRange; } ASRange;
#define ASIdOrRange_id 0 #define ASIdOrRange_id 0
#define ASIdOrRange_range 1 #define ASIdOrRange_range 1
typedef struct ASIdOrRange_st { typedef struct ASIdOrRange_st {
int type; int type;
@@ -646,8 +649,8 @@ typedef struct ASIdOrRange_st {
typedef STACK_OF(ASIdOrRange) ASIdOrRanges; typedef STACK_OF(ASIdOrRange) ASIdOrRanges;
DECLARE_STACK_OF(ASIdOrRange) DECLARE_STACK_OF(ASIdOrRange)
#define ASIdentifierChoice_inherit 0 #define ASIdentifierChoice_inherit 0
#define ASIdentifierChoice_asIdsOrRanges 1 #define ASIdentifierChoice_asIdsOrRanges 1
typedef struct ASIdentifierChoice_st { typedef struct ASIdentifierChoice_st {
int type; int type;
@@ -668,37 +671,37 @@ DECLARE_ASN1_FUNCTIONS(ASIdentifiers)
typedef struct IPAddressRange_st { typedef struct IPAddressRange_st {
ASN1_BIT_STRING *min, *max; ASN1_BIT_STRING *min, *max;
} IPAddressRange; } IPAddressRange;
#define IPAddressOrRange_addressPrefix 0 #define IPAddressOrRange_addressPrefix 0
#define IPAddressOrRange_addressRange 1 #define IPAddressOrRange_addressRange 1
typedef struct IPAddressOrRange_st { typedef struct IPAddressOrRange_st {
int type; int type;
union { union {
ASN1_BIT_STRING *addressPrefix; ASN1_BIT_STRING *addressPrefix;
IPAddressRange *addressRange; IPAddressRange *addressRange;
} u; } u;
} IPAddressOrRange; } IPAddressOrRange;
typedef STACK_OF(IPAddressOrRange) IPAddressOrRanges; typedef STACK_OF(IPAddressOrRange) IPAddressOrRanges;
DECLARE_STACK_OF(IPAddressOrRange) DECLARE_STACK_OF(IPAddressOrRange)
#define IPAddressChoice_inherit 0 #define IPAddressChoice_inherit 0
#define IPAddressChoice_addressesOrRanges 1 #define IPAddressChoice_addressesOrRanges 1
typedef struct IPAddressChoice_st { typedef struct IPAddressChoice_st {
int type; int type;
union { union {
ASN1_NULL *inherit; ASN1_NULL *inherit;
IPAddressOrRanges *addressesOrRanges; IPAddressOrRanges *addressesOrRanges;
} u; } u;
} IPAddressChoice; } IPAddressChoice;
typedef struct IPAddressFamily_st { typedef struct IPAddressFamily_st {
ASN1_OCTET_STRING *addressFamily; ASN1_OCTET_STRING *addressFamily;
IPAddressChoice *ipAddressChoice; IPAddressChoice *ipAddressChoice;
} IPAddressFamily; } IPAddressFamily;
typedef STACK_OF(IPAddressFamily) IPAddrBlocks; typedef STACK_OF(IPAddressFamily) IPAddrBlocks;
@@ -712,8 +715,8 @@ DECLARE_ASN1_FUNCTIONS(IPAddressFamily)
/* /*
* API tag for elements of the ASIdentifer SEQUENCE. * API tag for elements of the ASIdentifer SEQUENCE.
*/ */
#define V3_ASID_ASNUM 0 #define V3_ASID_ASNUM 0
#define V3_ASID_RDI 1 #define V3_ASID_RDI 1
/* /*
* AFI values, assigned by IANA. It'd be nice to make the AFI * AFI values, assigned by IANA. It'd be nice to make the AFI
@@ -721,8 +724,8 @@ DECLARE_ASN1_FUNCTIONS(IPAddressFamily)
* that would need to be defined for other address families for it to * that would need to be defined for other address families for it to
* be worth the trouble. * be worth the trouble.
*/ */
#define IANA_AFI_IPV4 1 #define IANA_AFI_IPV4 1
#define IANA_AFI_IPV6 2 #define IANA_AFI_IPV6 2
/* /*
* Utilities to construct and extract values from RFC3779 extensions, * Utilities to construct and extract values from RFC3779 extensions,
@@ -731,19 +734,19 @@ DECLARE_ASN1_FUNCTIONS(IPAddressFamily)
*/ */
int v3_asid_add_inherit(ASIdentifiers *asid, int which); int v3_asid_add_inherit(ASIdentifiers *asid, int which);
int v3_asid_add_id_or_range(ASIdentifiers *asid, int which, int v3_asid_add_id_or_range(ASIdentifiers *asid, int which,
ASN1_INTEGER *min, ASN1_INTEGER *max); ASN1_INTEGER *min, ASN1_INTEGER *max);
int v3_addr_add_inherit(IPAddrBlocks *addr, int v3_addr_add_inherit(IPAddrBlocks *addr,
const unsigned afi, const unsigned *safi); const unsigned afi, const unsigned *safi);
int v3_addr_add_prefix(IPAddrBlocks *addr, int v3_addr_add_prefix(IPAddrBlocks *addr,
const unsigned afi, const unsigned *safi, const unsigned afi, const unsigned *safi,
unsigned char *a, const int prefixlen); unsigned char *a, const int prefixlen);
int v3_addr_add_range(IPAddrBlocks *addr, int v3_addr_add_range(IPAddrBlocks *addr,
const unsigned afi, const unsigned *safi, const unsigned afi, const unsigned *safi,
unsigned char *min, unsigned char *max); unsigned char *min, unsigned char *max);
unsigned v3_addr_get_afi(const IPAddressFamily *f); unsigned v3_addr_get_afi(const IPAddressFamily *f);
int v3_addr_get_range(IPAddressOrRange *aor, const unsigned afi, int v3_addr_get_range(IPAddressOrRange *aor, const unsigned afi,
unsigned char *min, unsigned char *max, unsigned char *min, unsigned char *max,
const int length); const int length);
/* /*
* Canonical forms. * Canonical forms.
@@ -767,11 +770,11 @@ int v3_addr_subset(IPAddrBlocks *a, IPAddrBlocks *b);
int v3_asid_validate_path(X509_STORE_CTX *); int v3_asid_validate_path(X509_STORE_CTX *);
int v3_addr_validate_path(X509_STORE_CTX *); int v3_addr_validate_path(X509_STORE_CTX *);
int v3_asid_validate_resource_set(STACK_OF(X509) *chain, int v3_asid_validate_resource_set(STACK_OF(X509) *chain,
ASIdentifiers *ext, ASIdentifiers *ext,
int allow_inheritance); int allow_inheritance);
int v3_addr_validate_resource_set(STACK_OF(X509) *chain, int v3_addr_validate_resource_set(STACK_OF(X509) *chain,
IPAddrBlocks *ext, IPAddrBlocks *ext,
int allow_inheritance); int allow_inheritance);
#endif /* OPENSSL_NO_RFC3779 */ #endif /* OPENSSL_NO_RFC3779 */
@@ -784,137 +787,136 @@ void ERR_load_X509V3_strings(void);
/* Error codes for the X509V3 functions. */ /* Error codes for the X509V3 functions. */
/* Function codes. */ /* Function codes. */
#define X509V3_F_ASIDENTIFIERCHOICE_CANONIZE 156 #define X509V3_F_ASIDENTIFIERCHOICE_CANONIZE 156
#define X509V3_F_ASIDENTIFIERCHOICE_IS_CANONICAL 157 #define X509V3_F_ASIDENTIFIERCHOICE_IS_CANONICAL 157
#define X509V3_F_COPY_EMAIL 122 #define X509V3_F_COPY_EMAIL 122
#define X509V3_F_COPY_ISSUER 123 #define X509V3_F_COPY_ISSUER 123
#define X509V3_F_DO_DIRNAME 144 #define X509V3_F_DO_DIRNAME 144
#define X509V3_F_DO_EXT_CONF 124 #define X509V3_F_DO_EXT_CONF 124
#define X509V3_F_DO_EXT_I2D 135 #define X509V3_F_DO_EXT_I2D 135
#define X509V3_F_DO_EXT_NCONF 151 #define X509V3_F_DO_EXT_NCONF 151
#define X509V3_F_DO_I2V_NAME_CONSTRAINTS 148 #define X509V3_F_DO_I2V_NAME_CONSTRAINTS 148
#define X509V3_F_HEX_TO_STRING 111 #define X509V3_F_HEX_TO_STRING 111
#define X509V3_F_I2S_ASN1_ENUMERATED 121 #define X509V3_F_I2S_ASN1_ENUMERATED 121
#define X509V3_F_I2S_ASN1_IA5STRING 149 #define X509V3_F_I2S_ASN1_IA5STRING 149
#define X509V3_F_I2S_ASN1_INTEGER 120 #define X509V3_F_I2S_ASN1_INTEGER 120
#define X509V3_F_I2V_AUTHORITY_INFO_ACCESS 138 #define X509V3_F_I2V_AUTHORITY_INFO_ACCESS 138
#define X509V3_F_NOTICE_SECTION 132 #define X509V3_F_NOTICE_SECTION 132
#define X509V3_F_NREF_NOS 133 #define X509V3_F_NREF_NOS 133
#define X509V3_F_POLICY_SECTION 131 #define X509V3_F_POLICY_SECTION 131
#define X509V3_F_PROCESS_PCI_VALUE 150 #define X509V3_F_PROCESS_PCI_VALUE 150
#define X509V3_F_R2I_CERTPOL 130 #define X509V3_F_R2I_CERTPOL 130
#define X509V3_F_R2I_PCI 155 #define X509V3_F_R2I_PCI 155
#define X509V3_F_S2I_ASN1_IA5STRING 100 #define X509V3_F_S2I_ASN1_IA5STRING 100
#define X509V3_F_S2I_ASN1_INTEGER 108 #define X509V3_F_S2I_ASN1_INTEGER 108
#define X509V3_F_S2I_ASN1_OCTET_STRING 112 #define X509V3_F_S2I_ASN1_OCTET_STRING 112
#define X509V3_F_S2I_ASN1_SKEY_ID 114 #define X509V3_F_S2I_ASN1_SKEY_ID 114
#define X509V3_F_S2I_SKEY_ID 115 #define X509V3_F_S2I_SKEY_ID 115
#define X509V3_F_STRING_TO_HEX 113 #define X509V3_F_STRING_TO_HEX 113
#define X509V3_F_SXNET_ADD_ID_ASC 125 #define X509V3_F_SXNET_ADD_ID_ASC 125
#define X509V3_F_SXNET_ADD_ID_INTEGER 126 #define X509V3_F_SXNET_ADD_ID_INTEGER 126
#define X509V3_F_SXNET_ADD_ID_ULONG 127 #define X509V3_F_SXNET_ADD_ID_ULONG 127
#define X509V3_F_SXNET_GET_ID_ASC 128 #define X509V3_F_SXNET_GET_ID_ASC 128
#define X509V3_F_SXNET_GET_ID_ULONG 129 #define X509V3_F_SXNET_GET_ID_ULONG 129
#define X509V3_F_V2I_ASIDENTIFIERS 158 #define X509V3_F_V2I_ASIDENTIFIERS 158
#define X509V3_F_V2I_ASN1_BIT_STRING 101 #define X509V3_F_V2I_ASN1_BIT_STRING 101
#define X509V3_F_V2I_AUTHORITY_INFO_ACCESS 139 #define X509V3_F_V2I_AUTHORITY_INFO_ACCESS 139
#define X509V3_F_V2I_AUTHORITY_KEYID 119 #define X509V3_F_V2I_AUTHORITY_KEYID 119
#define X509V3_F_V2I_BASIC_CONSTRAINTS 102 #define X509V3_F_V2I_BASIC_CONSTRAINTS 102
#define X509V3_F_V2I_CRLD 134 #define X509V3_F_V2I_CRLD 134
#define X509V3_F_V2I_EXTENDED_KEY_USAGE 103 #define X509V3_F_V2I_EXTENDED_KEY_USAGE 103
#define X509V3_F_V2I_GENERAL_NAMES 118 #define X509V3_F_V2I_GENERAL_NAMES 118
#define X509V3_F_V2I_GENERAL_NAME_EX 117 #define X509V3_F_V2I_GENERAL_NAME_EX 117
#define X509V3_F_V2I_IPADDRBLOCKS 159 #define X509V3_F_V2I_IPADDRBLOCKS 159
#define X509V3_F_V2I_ISSUER_ALT 153 #define X509V3_F_V2I_ISSUER_ALT 153
#define X509V3_F_V2I_NAME_CONSTRAINTS 147 #define X509V3_F_V2I_NAME_CONSTRAINTS 147
#define X509V3_F_V2I_POLICY_CONSTRAINTS 146 #define X509V3_F_V2I_POLICY_CONSTRAINTS 146
#define X509V3_F_V2I_POLICY_MAPPINGS 145 #define X509V3_F_V2I_POLICY_MAPPINGS 145
#define X509V3_F_V2I_SUBJECT_ALT 154 #define X509V3_F_V2I_SUBJECT_ALT 154
#define X509V3_F_V3_ADDR_VALIDATE_PATH_INTERNAL 160 #define X509V3_F_V3_ADDR_VALIDATE_PATH_INTERNAL 160
#define X509V3_F_V3_GENERIC_EXTENSION 116 #define X509V3_F_V3_GENERIC_EXTENSION 116
#define X509V3_F_X509V3_ADD1_I2D 140 #define X509V3_F_X509V3_ADD1_I2D 140
#define X509V3_F_X509V3_ADD_VALUE 105 #define X509V3_F_X509V3_ADD_VALUE 105
#define X509V3_F_X509V3_EXT_ADD 104 #define X509V3_F_X509V3_EXT_ADD 104
#define X509V3_F_X509V3_EXT_ADD_ALIAS 106 #define X509V3_F_X509V3_EXT_ADD_ALIAS 106
#define X509V3_F_X509V3_EXT_CONF 107 #define X509V3_F_X509V3_EXT_CONF 107
#define X509V3_F_X509V3_EXT_I2D 136 #define X509V3_F_X509V3_EXT_I2D 136
#define X509V3_F_X509V3_EXT_NCONF 152 #define X509V3_F_X509V3_EXT_NCONF 152
#define X509V3_F_X509V3_GET_SECTION 142 #define X509V3_F_X509V3_GET_SECTION 142
#define X509V3_F_X509V3_GET_STRING 143 #define X509V3_F_X509V3_GET_STRING 143
#define X509V3_F_X509V3_GET_VALUE_BOOL 110 #define X509V3_F_X509V3_GET_VALUE_BOOL 110
#define X509V3_F_X509V3_PARSE_LIST 109 #define X509V3_F_X509V3_PARSE_LIST 109
#define X509V3_F_X509_PURPOSE_ADD 137 #define X509V3_F_X509_PURPOSE_ADD 137
#define X509V3_F_X509_PURPOSE_SET 141 #define X509V3_F_X509_PURPOSE_SET 141
/* Reason codes. */ /* Reason codes. */
#define X509V3_R_BAD_IP_ADDRESS 118 #define X509V3_R_BAD_IP_ADDRESS 118
#define X509V3_R_BAD_OBJECT 119 #define X509V3_R_BAD_OBJECT 119
#define X509V3_R_BN_DEC2BN_ERROR 100 #define X509V3_R_BN_DEC2BN_ERROR 100
#define X509V3_R_BN_TO_ASN1_INTEGER_ERROR 101 #define X509V3_R_BN_TO_ASN1_INTEGER_ERROR 101
#define X509V3_R_DIRNAME_ERROR 149 #define X509V3_R_DIRNAME_ERROR 149
#define X509V3_R_DUPLICATE_ZONE_ID 133 #define X509V3_R_DUPLICATE_ZONE_ID 133
#define X509V3_R_ERROR_CONVERTING_ZONE 131 #define X509V3_R_ERROR_CONVERTING_ZONE 131
#define X509V3_R_ERROR_CREATING_EXTENSION 144 #define X509V3_R_ERROR_CREATING_EXTENSION 144
#define X509V3_R_ERROR_IN_EXTENSION 128 #define X509V3_R_ERROR_IN_EXTENSION 128
#define X509V3_R_EXPECTED_A_SECTION_NAME 137 #define X509V3_R_EXPECTED_A_SECTION_NAME 137
#define X509V3_R_EXTENSION_EXISTS 145 #define X509V3_R_EXTENSION_EXISTS 145
#define X509V3_R_EXTENSION_NAME_ERROR 115 #define X509V3_R_EXTENSION_NAME_ERROR 115
#define X509V3_R_EXTENSION_NOT_FOUND 102 #define X509V3_R_EXTENSION_NOT_FOUND 102
#define X509V3_R_EXTENSION_SETTING_NOT_SUPPORTED 103 #define X509V3_R_EXTENSION_SETTING_NOT_SUPPORTED 103
#define X509V3_R_EXTENSION_VALUE_ERROR 116 #define X509V3_R_EXTENSION_VALUE_ERROR 116
#define X509V3_R_ILLEGAL_EMPTY_EXTENSION 151 #define X509V3_R_ILLEGAL_EMPTY_EXTENSION 151
#define X509V3_R_ILLEGAL_HEX_DIGIT 113 #define X509V3_R_ILLEGAL_HEX_DIGIT 113
#define X509V3_R_INCORRECT_POLICY_SYNTAX_TAG 152 #define X509V3_R_INCORRECT_POLICY_SYNTAX_TAG 152
#define X509V3_R_INVALID_ASNUMBER 160 #define X509V3_R_INVALID_ASNUMBER 160
#define X509V3_R_INVALID_ASRANGE 161 #define X509V3_R_INVALID_ASRANGE 161
#define X509V3_R_INVALID_BOOLEAN_STRING 104 #define X509V3_R_INVALID_BOOLEAN_STRING 104
#define X509V3_R_INVALID_EXTENSION_STRING 105 #define X509V3_R_INVALID_EXTENSION_STRING 105
#define X509V3_R_INVALID_INHERITANCE 162 #define X509V3_R_INVALID_INHERITANCE 162
#define X509V3_R_INVALID_IPADDRESS 163 #define X509V3_R_INVALID_IPADDRESS 163
#define X509V3_R_INVALID_NAME 106 #define X509V3_R_INVALID_NAME 106
#define X509V3_R_INVALID_NULL_ARGUMENT 107 #define X509V3_R_INVALID_NULL_ARGUMENT 107
#define X509V3_R_INVALID_NULL_NAME 108 #define X509V3_R_INVALID_NULL_NAME 108
#define X509V3_R_INVALID_NULL_VALUE 109 #define X509V3_R_INVALID_NULL_VALUE 109
#define X509V3_R_INVALID_NUMBER 140 #define X509V3_R_INVALID_NUMBER 140
#define X509V3_R_INVALID_NUMBERS 141 #define X509V3_R_INVALID_NUMBERS 141
#define X509V3_R_INVALID_OBJECT_IDENTIFIER 110 #define X509V3_R_INVALID_OBJECT_IDENTIFIER 110
#define X509V3_R_INVALID_OPTION 138 #define X509V3_R_INVALID_OPTION 138
#define X509V3_R_INVALID_POLICY_IDENTIFIER 134 #define X509V3_R_INVALID_POLICY_IDENTIFIER 134
#define X509V3_R_INVALID_PROXY_POLICY_SETTING 153 #define X509V3_R_INVALID_PROXY_POLICY_SETTING 153
#define X509V3_R_INVALID_PURPOSE 146 #define X509V3_R_INVALID_PURPOSE 146
#define X509V3_R_INVALID_SAFI 164 #define X509V3_R_INVALID_SAFI 164
#define X509V3_R_INVALID_SECTION 135 #define X509V3_R_INVALID_SECTION 135
#define X509V3_R_INVALID_SYNTAX 143 #define X509V3_R_INVALID_SYNTAX 143
#define X509V3_R_ISSUER_DECODE_ERROR 126 #define X509V3_R_ISSUER_DECODE_ERROR 126
#define X509V3_R_MISSING_VALUE 124 #define X509V3_R_MISSING_VALUE 124
#define X509V3_R_NEED_ORGANIZATION_AND_NUMBERS 142 #define X509V3_R_NEED_ORGANIZATION_AND_NUMBERS 142
#define X509V3_R_NO_CONFIG_DATABASE 136 #define X509V3_R_NO_CONFIG_DATABASE 136
#define X509V3_R_NO_ISSUER_CERTIFICATE 121 #define X509V3_R_NO_ISSUER_CERTIFICATE 121
#define X509V3_R_NO_ISSUER_DETAILS 127 #define X509V3_R_NO_ISSUER_DETAILS 127
#define X509V3_R_NO_POLICY_IDENTIFIER 139 #define X509V3_R_NO_POLICY_IDENTIFIER 139
#define X509V3_R_NO_PROXY_CERT_POLICY_LANGUAGE_DEFINED 154 #define X509V3_R_NO_PROXY_CERT_POLICY_LANGUAGE_DEFINED 154
#define X509V3_R_NO_PUBLIC_KEY 114 #define X509V3_R_NO_PUBLIC_KEY 114
#define X509V3_R_NO_SUBJECT_DETAILS 125 #define X509V3_R_NO_SUBJECT_DETAILS 125
#define X509V3_R_ODD_NUMBER_OF_DIGITS 112 #define X509V3_R_ODD_NUMBER_OF_DIGITS 112
#define X509V3_R_OPERATION_NOT_DEFINED 148 #define X509V3_R_OPERATION_NOT_DEFINED 148
#define X509V3_R_OTHERNAME_ERROR 147 #define X509V3_R_OTHERNAME_ERROR 147
#define X509V3_R_POLICY_LANGUAGE_ALREADTY_DEFINED 155 #define X509V3_R_POLICY_LANGUAGE_ALREADTY_DEFINED 155
#define X509V3_R_POLICY_PATH_LENGTH 156 #define X509V3_R_POLICY_PATH_LENGTH 156
#define X509V3_R_POLICY_PATH_LENGTH_ALREADTY_DEFINED 157 #define X509V3_R_POLICY_PATH_LENGTH_ALREADTY_DEFINED 157
#define X509V3_R_POLICY_SYNTAX_NOT_CURRENTLY_SUPPORTED 158 #define X509V3_R_POLICY_SYNTAX_NOT_CURRENTLY_SUPPORTED 158
#define X509V3_R_POLICY_WHEN_PROXY_LANGUAGE_REQUIRES_NO_POLICY 159 #define X509V3_R_POLICY_WHEN_PROXY_LANGUAGE_REQUIRES_NO_POLICY 159
#define X509V3_R_SECTION_NOT_FOUND 150 #define X509V3_R_SECTION_NOT_FOUND 150
#define X509V3_R_UNABLE_TO_GET_ISSUER_DETAILS 122 #define X509V3_R_UNABLE_TO_GET_ISSUER_DETAILS 122
#define X509V3_R_UNABLE_TO_GET_ISSUER_KEYID 123 #define X509V3_R_UNABLE_TO_GET_ISSUER_KEYID 123
#define X509V3_R_UNKNOWN_BIT_STRING_ARGUMENT 111 #define X509V3_R_UNKNOWN_BIT_STRING_ARGUMENT 111
#define X509V3_R_UNKNOWN_EXTENSION 129 #define X509V3_R_UNKNOWN_EXTENSION 129
#define X509V3_R_UNKNOWN_EXTENSION_NAME 130 #define X509V3_R_UNKNOWN_EXTENSION_NAME 130
#define X509V3_R_UNKNOWN_OPTION 120 #define X509V3_R_UNKNOWN_OPTION 120
#define X509V3_R_UNSUPPORTED_OPTION 117 #define X509V3_R_UNSUPPORTED_OPTION 117
#define X509V3_R_USER_TOO_LONG 132 #define X509V3_R_USER_TOO_LONG 132
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif #endif
dep/lib/win32_debug/libeay32.dll
BIN
View File
Binary file not shown.
dep/lib/win32_debug/libeay32.lib
BIN
View File
Binary file not shown.
dep/lib/win32_release/libeay32.dll
BIN
View File
Binary file not shown.
dep/lib/win32_release/libeay32.lib
BIN
View File
Binary file not shown.
dep/lib/x64_Debug/libeay32.dll
BIN
View File
Binary file not shown.
dep/lib/x64_Debug/libeay32.lib
BIN
View File
Binary file not shown.
dep/lib/x64_release/libeay32.dll
BIN
View File
Binary file not shown.
dep/lib/x64_release/libeay32.lib
BIN
View File
Binary file not shown.
src/game/Makefile.am
+256
View File
@@ -30,6 +30,7 @@ noinst_LIBRARIES = libmangosgame.a
# libmangossgame library will later be reused by ... # libmangossgame library will later be reused by ...
libmangosgame_a_SOURCES = \ libmangosgame_a_SOURCES = \
<<<<<<< HEAD:src/game/Makefile.am
AccountMgr.cpp \ AccountMgr.cpp \
AccountMgr.h \ AccountMgr.h \
AchievementMgr.h \ AchievementMgr.h \
@@ -309,6 +310,261 @@ libmangosgame_a_SOURCES = \
GroupReference.cpp \ GroupReference.cpp \
GroupReference.h \ GroupReference.h \
GroupRefManager.h GroupRefManager.h
=======
AccountMgr.cpp \
AccountMgr.h \
AchievementMgr.h \
AchievementMgr.cpp \
AggressorAI.cpp \
AggressorAI.h \
AnimalRandomMovementGenerator.h \
ArenaTeam.cpp \
ArenaTeam.h \
ArenaTeamHandler.cpp \
AuctionHouseHandler.cpp \
AuctionHouseMgr.cpp \
AuctionHouseMgr.h \
Bag.cpp \
Bag.h \
BattleGround.cpp \
BattleGroundAA.cpp \
BattleGroundAB.cpp \
BattleGroundAV.cpp \
BattleGroundBE.cpp \
BattleGroundDS.cpp \
BattleGroundEY.cpp \
BattleGroundNA.cpp \
BattleGroundRL.cpp \
BattleGroundRV.cpp \
BattleGroundSA.cpp \
BattleGroundWS.cpp \
BattleGround.h \
BattleGroundAA.h \
BattleGroundAB.h \
BattleGroundAV.h \
BattleGroundBE.h \
BattleGroundDS.h \
BattleGroundEY.h \
BattleGroundNA.h \
BattleGroundRL.h \
BattleGroundRV.h \
BattleGroundSA.h \
BattleGroundWS.h \
BattleGroundHandler.cpp \
BattleGroundMgr.cpp \
BattleGroundMgr.h \
Calendar.cpp \
Calendar.h \
CalendarHandler.cpp \
Cell.h \
CellImpl.h \
Channel.cpp \
Channel.h \
ChannelHandler.cpp \
ChannelMgr.h \
CharacterHandler.cpp \
Chat.cpp \
Chat.h \
ChatHandler.cpp \
CombatHandler.cpp \
ConfusedMovementGenerator.cpp \
ConfusedMovementGenerator.h \
Corpse.cpp \
Corpse.h \
CreatureAI.cpp \
CreatureAI.h \
CreatureAIImpl.h \
CreatureAIRegistry.cpp \
CreatureAIRegistry.h \
CreatureAISelector.cpp \
CreatureAISelector.h \
Creature.cpp \
Creature.h \
debugcmds.cpp \
DestinationHolder.cpp \
DestinationHolder.h \
DestinationHolderImp.h \
DuelHandler.cpp \
DynamicObject.cpp \
DynamicObject.h \
FleeingMovementGenerator.cpp \
FleeingMovementGenerator.h \
Formulas.h \
GameEventMgr.cpp \
GameEventMgr.h \
GameObject.cpp \
GameObject.h \
GlobalEvents.cpp \
GlobalEvents.h \
GMTicketHandler.cpp \
GMTicketMgr.cpp \
GMTicketMgr.h \
GossipDef.cpp \
GossipDef.h \
GridDefines.h \
GridNotifiers.cpp \
GridNotifiers.h \
GridNotifiersImpl.h \
GridStates.cpp \
GridStates.h \
Group.cpp \
Group.h \
GroupHandler.cpp \
GuardAI.cpp \
GuardAI.h \
Guild.cpp \
Guild.h \
GuildHandler.cpp \
HomeMovementGenerator.cpp \
HomeMovementGenerator.h \
HostilRefManager.cpp \
HostilRefManager.h \
IdleMovementGenerator.cpp \
IdleMovementGenerator.h \
InstanceData.cpp \
InstanceData.h \
InstanceSaveMgr.cpp \
InstanceSaveMgr.h \
Item.cpp \
Item.h \
ItemEnchantmentMgr.cpp \
ItemEnchantmentMgr.h \
ItemHandler.cpp \
ItemPrototype.h \
Language.h \
Level0.cpp \
Level1.cpp \
Level2.cpp \
Level3.cpp \
LFGHandler.cpp \
LootHandler.cpp \
LootMgr.cpp \
LootMgr.h \
Mail.cpp \
Mail.h \
Map.cpp \
Map.h \
MapInstanced.cpp \
MapInstanced.h \
MapManager.cpp \
MapManager.h \
MapReference.h \
MapRefManager.h \
MiscHandler.cpp \
MotionMaster.cpp \
MotionMaster.h \
MovementGenerator.cpp \
MovementGenerator.h \
MovementGeneratorImpl.h \
MovementHandler.cpp \
NPCHandler.cpp \
NPCHandler.h \
NullCreatureAI.cpp \
NullCreatureAI.h \
ObjectAccessor.cpp \
ObjectAccessor.h \
Object.cpp \
ObjectDefines.h \
ObjectGridLoader.cpp \
ObjectGridLoader.h \
Object.h \
ObjectMgr.cpp \
ObjectMgr.h \
ObjectPosSelector.cpp \
ObjectPosSelector.h \
Opcodes.cpp \
Opcodes.h \
Path.h \
PetAI.cpp \
PetAI.h \
Pet.cpp \
Pet.h \
PetHandler.cpp \
PetitionsHandler.cpp \
Player.cpp \
Player.h \
PlayerDump.cpp \
PlayerDump.h \
PointMovementGenerator.cpp \
PointMovementGenerator.h \
PoolHandler.cpp \
PoolHandler.h \
QueryHandler.cpp \
QuestDef.cpp \
QuestDef.h \
QuestHandler.cpp \
RandomMovementGenerator.cpp \
RandomMovementGenerator.h \
ReactorAI.cpp \
ReactorAI.h \
ScriptCalls.cpp \
ScriptCalls.h \
SharedDefines.h \
SkillHandler.cpp \
SpellAuraDefines.h \
SpellAuras.cpp \
SpellAuras.h \
Spell.cpp \
SpellEffects.cpp \
Spell.h \
SkillDiscovery.cpp \
SkillDiscovery.h \
SkillExtraItems.cpp \
SkillExtraItems.h \
SpellHandler.cpp \
SocialMgr.cpp \
SocialMgr.h \
SpellMgr.cpp \
SpellMgr.h \
StatSystem.cpp \
TargetedMovementGenerator.cpp \
TargetedMovementGenerator.h \
TaxiHandler.cpp \
TemporarySummon.cpp \
TemporarySummon.h \
TotemAI.cpp \
TotemAI.h \
Totem.cpp \
Totem.h \
TradeHandler.cpp \
Transports.cpp \
Transports.h \
ThreatManager.cpp \
ThreatManager.h \
Traveller.h \
Unit.cpp \
Unit.h \
UnitEvents.h \
UpdateData.cpp \
UpdateData.h \
UpdateFields.h \
UpdateMask.h \
Vehicle.cpp \
Vehicle.h \
VoiceChatHandler.cpp \
WaypointManager.cpp \
WaypointManager.h \
WaypointMovementGenerator.cpp \
WaypointMovementGenerator.h \
Weather.cpp \
Weather.h \
World.cpp \
World.h \
WorldLog.cpp \
WorldLog.h \
WorldSession.cpp \
WorldSession.h \
WorldSocket.cpp \
WorldSocket.h \
WorldSocketMgr.cpp \
WorldSocketMgr.h \
FollowerReference.cpp \
FollowerReference.h \
FollowerRefManager.h \
GroupReference.cpp \
GroupReference.h \
GroupRefManager.h
>>>>>>> 2429aaf2276d689e101ed88285f18449dbe4280d:src/game/Makefile.am
## Link against shared library ## Link against shared library
libmangosgame_a_LIBADD = ../shared/libmangosshared.a ../shared/Auth/libmangosauth.a ../shared/Config/libmangosconfig.a ../shared/Database/libmangosdatabase.a ../shared/vmap/libmangosvmaps.a libmangosgame_a_LIBADD = ../shared/libmangosshared.a ../shared/Auth/libmangosauth.a ../shared/Config/libmangosconfig.a ../shared/Database/libmangosdatabase.a ../shared/vmap/libmangosvmaps.a
src/game/World.cpp
+1
View File
@@ -265,6 +265,7 @@ World::AddSession_ (WorldSession* s)
packet << uint8 (s->Expansion()); // 0 - normal, 1 - TBC, must be set in database manually for each account packet << uint8 (s->Expansion()); // 0 - normal, 1 - TBC, must be set in database manually for each account
s->SendPacket (&packet); s->SendPacket (&packet);
s->SendAddonsInfo();
UpdateMaxSessionCounters (); UpdateMaxSessionCounters ();
// Updates the population // Updates the population
src/game/WorldSession.cpp
+119
View File
@@ -39,6 +39,7 @@
#include "OutdoorPvPMgr.h" #include "OutdoorPvPMgr.h"
//#include "Language.h" // for CMSG_CANCEL_MOUNT_AURA handler //#include "Language.h" // for CMSG_CANCEL_MOUNT_AURA handler
#include "SocialMgr.h" #include "SocialMgr.h"
#include "zlib/zlib.h"
/// WorldSession constructor /// WorldSession constructor
WorldSession::WorldSession(uint32 id, WorldSocket *sock, uint32 sec, uint8 expansion, time_t mute_time, LocaleConstant locale) : WorldSession::WorldSession(uint32 id, WorldSocket *sock, uint32 sec, uint8 expansion, time_t mute_time, LocaleConstant locale) :
@@ -615,3 +616,121 @@ void WorldSession::ReadMovementInfo(WorldPacket &data, MovementInfo *mi)
data >> mi->u_unk1; data >> mi->u_unk1;
} }
} }
void WorldSession::ReadAddonsInfo(WorldPacket &data)
{
uint32 size;
data >> size;
if(!size)
return;
uLongf uSize = size;
uint32 pos = data.rpos();
ByteBuffer addonInfo;
addonInfo.resize(size);
if (uncompress(const_cast<uint8*>(addonInfo.contents()), &uSize, const_cast<uint8*>(data.contents() + pos), data.size() - pos) == Z_OK)
{
uint32 addonsCount;
addonInfo >> addonsCount; // addons count
for(uint32 i = 0; i < addonsCount; ++i)
{
std::string addonName;
uint8 enabled;
uint32 crc, unk1;
// check next addon data format correctness
if(addonInfo.rpos()+1 > addonInfo.size())
return;
addonInfo >> addonName;
// recheck next addon data format correctness
if(addonInfo.rpos()+1+4+4 > addonInfo.size())
return;
addonInfo >> enabled >> crc >> unk1;
sLog.outDebug("ADDON: Name: %s, Enabled: 0x%x, CRC: 0x%x, Unknown2: 0x%x", addonName.c_str(), enabled, crc, unk1);
m_addonsList.push_back(AddonInfo(addonName, enabled, crc));
}
uint32 unk2;
addonInfo >> unk2;
if(addonInfo.rpos() != addonInfo.size())
sLog.outDebug("packet under read!");
}
else
sLog.outError("Addon packet uncompress error!");
}
void WorldSession::SendAddonsInfo()
{
unsigned char tdata[256] =
{
0xC3, 0x5B, 0x50, 0x84, 0xB9, 0x3E, 0x32, 0x42, 0x8C, 0xD0, 0xC7, 0x48, 0xFA, 0x0E, 0x5D, 0x54,
0x5A, 0xA3, 0x0E, 0x14, 0xBA, 0x9E, 0x0D, 0xB9, 0x5D, 0x8B, 0xEE, 0xB6, 0x84, 0x93, 0x45, 0x75,
0xFF, 0x31, 0xFE, 0x2F, 0x64, 0x3F, 0x3D, 0x6D, 0x07, 0xD9, 0x44, 0x9B, 0x40, 0x85, 0x59, 0x34,
0x4E, 0x10, 0xE1, 0xE7, 0x43, 0x69, 0xEF, 0x7C, 0x16, 0xFC, 0xB4, 0xED, 0x1B, 0x95, 0x28, 0xA8,
0x23, 0x76, 0x51, 0x31, 0x57, 0x30, 0x2B, 0x79, 0x08, 0x50, 0x10, 0x1C, 0x4A, 0x1A, 0x2C, 0xC8,
0x8B, 0x8F, 0x05, 0x2D, 0x22, 0x3D, 0xDB, 0x5A, 0x24, 0x7A, 0x0F, 0x13, 0x50, 0x37, 0x8F, 0x5A,
0xCC, 0x9E, 0x04, 0x44, 0x0E, 0x87, 0x01, 0xD4, 0xA3, 0x15, 0x94, 0x16, 0x34, 0xC6, 0xC2, 0xC3,
0xFB, 0x49, 0xFE, 0xE1, 0xF9, 0xDA, 0x8C, 0x50, 0x3C, 0xBE, 0x2C, 0xBB, 0x57, 0xED, 0x46, 0xB9,
0xAD, 0x8B, 0xC6, 0xDF, 0x0E, 0xD6, 0x0F, 0xBE, 0x80, 0xB3, 0x8B, 0x1E, 0x77, 0xCF, 0xAD, 0x22,
0xCF, 0xB7, 0x4B, 0xCF, 0xFB, 0xF0, 0x6B, 0x11, 0x45, 0x2D, 0x7A, 0x81, 0x18, 0xF2, 0x92, 0x7E,
0x98, 0x56, 0x5D, 0x5E, 0x69, 0x72, 0x0A, 0x0D, 0x03, 0x0A, 0x85, 0xA2, 0x85, 0x9C, 0xCB, 0xFB,
0x56, 0x6E, 0x8F, 0x44, 0xBB, 0x8F, 0x02, 0x22, 0x68, 0x63, 0x97, 0xBC, 0x85, 0xBA, 0xA8, 0xF7,
0xB5, 0x40, 0x68, 0x3C, 0x77, 0x86, 0x6F, 0x4B, 0xD7, 0x88, 0xCA, 0x8A, 0xD7, 0xCE, 0x36, 0xF0,
0x45, 0x6E, 0xD5, 0x64, 0x79, 0x0F, 0x17, 0xFC, 0x64, 0xDD, 0x10, 0x6F, 0xF3, 0xF5, 0xE0, 0xA6,
0xC3, 0xFB, 0x1B, 0x8C, 0x29, 0xEF, 0x8E, 0xE5, 0x34, 0xCB, 0xD1, 0x2A, 0xCE, 0x79, 0xC3, 0x9A,
0x0D, 0x36, 0xEA, 0x01, 0xE0, 0xAA, 0x91, 0x20, 0x54, 0xF0, 0x72, 0xD8, 0x1E, 0xC7, 0x89, 0xD2
};
WorldPacket data(SMSG_ADDON_INFO, 4);
for(AddonsList::iterator itr = m_addonsList.begin(); itr != m_addonsList.end(); ++itr)
{
uint8 state = (itr->Enabled ? 2 : 1);
data << uint8(state);
uint8 unk1 = (itr->Enabled ? 1 : 0);
data << uint8(unk1);
if (unk1)
{
uint8 unk2 = (itr->CRC != 0x4c1c776d); // If addon is Standard addon CRC
data << uint8(unk2);
if (unk2)
data.append(tdata, sizeof(tdata));
data << uint32(0);
}
uint8 unk3 = (itr->Enabled ? 0 : 1);
data << uint8(unk3);
if (unk3)
{
// String, 256 (null terminated?)
data << uint8(0);
}
}
m_addonsList.clear();
uint32 count = 0;
data << uint32(count);
/*for(uint32 i = 0; i < count; ++i)
{
uint32
string (16 bytes)
string (16 bytes)
uint32
}*/
SendPacket(&data);
}
src/game/WorldSession.h
+20
View File
@@ -58,6 +58,22 @@ struct AccountData
std::string Data; std::string Data;
}; };
struct AddonInfo
{
AddonInfo(std::string name, uint8 enabled, uint32 crc)
{
Name = name;
Enabled = enabled;
CRC = crc;
}
std::string Name;
uint8 Enabled;
uint32 CRC;
};
typedef std::list<AddonInfo> AddonsList;
enum PartyOperation enum PartyOperation
{ {
PARTY_OP_INVITE = 0, PARTY_OP_INVITE = 0,
@@ -92,6 +108,9 @@ class TRINITY_DLL_SPEC WorldSession
void SizeError(WorldPacket const& packet, uint32 size) const; void SizeError(WorldPacket const& packet, uint32 size) const;
void ReadAddonsInfo(WorldPacket &data);
void SendAddonsInfo();
void ReadMovementInfo(WorldPacket &data, MovementInfo *mi); void ReadMovementInfo(WorldPacket &data, MovementInfo *mi);
void SendPacket(WorldPacket const* packet); void SendPacket(WorldPacket const* packet);
@@ -698,6 +717,7 @@ class TRINITY_DLL_SPEC WorldSession
int m_sessionDbLocaleIndex; int m_sessionDbLocaleIndex;
uint32 m_latency; uint32 m_latency;
AccountData m_accountData[NUM_ACCOUNT_DATA_TYPES]; AccountData m_accountData[NUM_ACCOUNT_DATA_TYPES];
AddonsList m_addonsList;
ZThread::LockedQueue<WorldPacket*,ZThread::FastMutex> _recvQueue; ZThread::LockedQueue<WorldPacket*,ZThread::FastMutex> _recvQueue;
}; };
src/game/WorldSocket.cpp
+1
View File
@@ -1000,6 +1000,7 @@ int WorldSocket::HandleAuthSession (WorldPacket& recvPacket)
m_Crypt.Init (); m_Crypt.Init ();
m_Session->LoadAccountData(); m_Session->LoadAccountData();
m_Session->ReadAddonsInfo(recvPacket);
// In case needed sometime the second arg is in microseconds 1 000 000 = 1 sec // In case needed sometime the second arg is in microseconds 1 000 000 = 1 sec
ACE_OS::sleep (ACE_Time_Value (0, 10000)); ACE_OS::sleep (ACE_Time_Value (0, 10000));
win/VC71/game.vcproj
-8
View File
@@ -137,17 +137,9 @@
</File> </File>
<File <File
RelativePath="..\..\src\game\AchievementMgr.cpp"> RelativePath="..\..\src\game\AchievementMgr.cpp">
</File> </File>
<File <File
RelativePath="..\..\src\game\AchievementMgr.h"> RelativePath="..\..\src\game\AchievementMgr.h">
</File>
<File
RelativePath="..\..\src\game\AddonHandler.cpp">
</File>
<File
RelativePath="..\..\src\game\AddonHandler.h">
</File> </File>
<File <File
RelativePath="..\..\src\game\ArenaTeamHandler.cpp"> RelativePath="..\..\src\game\ArenaTeamHandler.cpp">
win/VC80/game.vcproj
-8
View File
@@ -362,14 +362,6 @@
RelativePath="..\..\src\game\AchievementMgr.h" RelativePath="..\..\src\game\AchievementMgr.h"
> >
</File> </File>
<File
RelativePath="..\..\src\game\AddonHandler.cpp"
>
</File>
<File
RelativePath="..\..\src\game\AddonHandler.h"
>
</File>
<File <File
RelativePath="..\..\src\game\ArenaTeamHandler.cpp" RelativePath="..\..\src\game\ArenaTeamHandler.cpp"
> >
win/VC90/game.vcproj
-8
View File
@@ -364,14 +364,6 @@
RelativePath="..\..\src\game\AchievementMgr.h" RelativePath="..\..\src\game\AchievementMgr.h"
> >
</File> </File>
<File
RelativePath="..\..\src\game\AddonHandler.cpp"
>
</File>
<File
RelativePath="..\..\src\game\AddonHandler.h"
>
</File>
<File <File
RelativePath="..\..\src\game\ArenaTeamHandler.cpp" RelativePath="..\..\src\game\ArenaTeamHandler.cpp"
> >