Various Win32 related fixes. Doesn't compile yet on

Win32 but it is getting there...

Update mkdef.pl to handle ASN1_ANY and fix headers.

Stop various VC++ warnings.

Include some fixes from "Peter 'Luna' Runestig"
<peter@runestig.com>

Remove external declaration for des_set_weak_key_flag:
it doesn't exist.

diff --git a/crypto/asn1/asn1.h b/crypto/asn1/asn1.h
index 060395a9ec0350215b6865f93f7add1ad9f845a3..080bf713c097bb3e8cda038fc2bcee9e1abece17 100644 (file)
--- a/crypto/asn1/asn1.h
+++ b/crypto/asn1/asn1.h
@@ -292,12 +292,17 @@ typedef struct ASN1_VALUE_st ASN1_VALUE;
 #define DECLARE_ASN1_FUNCTIONS_name(type, name) \
        type *name##_new(void); \
        void name##_free(type *a); \
 #define DECLARE_ASN1_FUNCTIONS_name(type, name) \
        type *name##_new(void); \
        void name##_free(type *a); \

-       DECLARE_ASN1_ENCODE_FUNCTIONS(type, name)
+       DECLARE_ASN1_ENCODE_FUNCTIONS(type, name, name)

 
 

-#define        DECLARE_ASN1_ENCODE_FUNCTIONS(type, name) \
+#define DECLARE_ASN1_FUNCTIONS_fname(type, itname, name) \
+       type *name##_new(void); \
+       void name##_free(type *a); \
+       DECLARE_ASN1_ENCODE_FUNCTIONS(type, itname, name)
+
+#define        DECLARE_ASN1_ENCODE_FUNCTIONS(type, itname, name) \

        type *d2i_##name(type **a, unsigned char **in, long len); \
        int i2d_##name(type *a, unsigned char **out); \
        type *d2i_##name(type **a, unsigned char **in, long len); \
        int i2d_##name(type *a, unsigned char **out); \

-       extern const ASN1_ITEM name##_it;
+       extern const ASN1_ITEM itname##_it;

 
 #define        DECLARE_ASN1_ENCODE_FUNCTIONS_const(type, name) \
        type *d2i_##name(type **a, const unsigned char **in, long len); \
 
 #define        DECLARE_ASN1_ENCODE_FUNCTIONS_const(type, name) \
        type *d2i_##name(type **a, const unsigned char **in, long len); \


@@ -641,7 +646,7 @@ typedef struct BIT_STRING_BITNAME_st {
 #define IS_SEQUENCE    0
 #define IS_SET         1
 
 #define IS_SEQUENCE    0
 #define IS_SET         1
 

-DECLARE_ASN1_FUNCTIONS(ASN1_TYPE)
+DECLARE_ASN1_FUNCTIONS_fname(ASN1_TYPE, ASN1_ANY, ASN1_TYPE)

 
 int ASN1_TYPE_get(ASN1_TYPE *a);
 void ASN1_TYPE_set(ASN1_TYPE *a, int type, void *value);
 
 int ASN1_TYPE_get(ASN1_TYPE *a);
 void ASN1_TYPE_set(ASN1_TYPE *a, int type, void *value);

diff --git a/crypto/asn1/tasn_dec.c b/crypto/asn1/tasn_dec.c
index 0caa8f6bd347e67e765fbbe3427de321cd582a3b..940e6af6b3cd7606822243cafdef98ed41ca1797 100644 (file)
--- a/crypto/asn1/tasn_dec.c
+++ b/crypto/asn1/tasn_dec.c
@@ -201,7 +201,7 @@ int ASN1_item_ex_d2i(ASN1_VALUE **pval, unsigned char **in, long len, const ASN1
                if(tag != -1) {
                        p = *in;
                        imphack = *p;
                if(tag != -1) {
                        p = *in;
                        imphack = *p;

-                       *p = (*p & V_ASN1_CONSTRUCTED) | it->utype;
+                       *p = (unsigned char)((*p & V_ASN1_CONSTRUCTED) | it->utype);

                }
 
                ptmpval = cf->asn1_d2i(pval, in, len);
                }
 
                ptmpval = cf->asn1_d2i(pval, in, len);


@@ -315,7 +315,7 @@ int ASN1_item_ex_d2i(ASN1_VALUE **pval, unsigned char **in, long len, const ASN1
                         * it increases efficiency in some cases.
                         */
                        if(i == (it->tcount - 1)) isopt = 0;
                         * it increases efficiency in some cases.
                         */
                        if(i == (it->tcount - 1)) isopt = 0;

-                       else isopt = seqtt->flags & ASN1_TFLG_OPTIONAL;
+                       else isopt = (char)(seqtt->flags & ASN1_TFLG_OPTIONAL);

                        /* attempt to read in field, allowing each to be OPTIONAL */
                        ret = asn1_template_ex_d2i(pseqval, &p, len, seqtt, isopt, ctx);
                        if(!ret) {
                        /* attempt to read in field, allowing each to be OPTIONAL */
                        ret = asn1_template_ex_d2i(pseqval, &p, len, seqtt, isopt, ctx);
                        if(!ret) {

diff --git a/crypto/des/des.h b/crypto/des/des.h
index 2db9748cb410fc5c4b4ca3ba906b8df753104580..10c04912bbb09481ad8af9926182723d9b0da7f0 100644 (file)
--- a/crypto/des/des.h
+++ b/crypto/des/des.h
@@ -113,7 +113,6 @@ typedef struct des_ks_struct
 
 OPENSSL_EXTERN int des_check_key;      /* defaults to false */
 OPENSSL_EXTERN int des_rw_mode;                /* defaults to DES_PCBC_MODE */
 
 OPENSSL_EXTERN int des_check_key;      /* defaults to false */
 OPENSSL_EXTERN int des_rw_mode;                /* defaults to DES_PCBC_MODE */

-OPENSSL_EXTERN int des_set_weak_key_flag; /* set the weak key flag */

 
 const char *des_options(void);
 void des_ecb3_encrypt(const_des_cblock *input, des_cblock *output,
 
 const char *des_options(void);
 void des_ecb3_encrypt(const_des_cblock *input, des_cblock *output,

diff --git a/crypto/objects/o_names.c b/crypto/objects/o_names.c
index 367ee2bdef69ac4aa203ced7347f7fd20cb93157..2cc1a6794aafcf660afd1236d08665b72bb596a5 100644 (file)
--- a/crypto/objects/o_names.c
+++ b/crypto/objects/o_names.c
@@ -295,12 +295,12 @@ void OBJ_NAME_do_all_sorted(int type,void (*fn)(const OBJ_NAME *,void *arg),
        d.n=0;
        OBJ_NAME_do_all(type,do_all_sorted_fn,&d);
 
        d.n=0;
        OBJ_NAME_do_all(type,do_all_sorted_fn,&d);
 

-       qsort(d.names,d.n,sizeof *d.names,do_all_sorted_cmp);
+       qsort((void *)d.names,d.n,sizeof *d.names,do_all_sorted_cmp);

 
        for(n=0 ; n < d.n ; ++n)
                fn(d.names[n],arg);
 
 
        for(n=0 ; n < d.n ; ++n)
                fn(d.names[n],arg);
 

-       OPENSSL_free(d.names);
+       OPENSSL_free((void *)d.names);

        }
 
 static int free_type;
        }
 
 static int free_type;

diff --git a/crypto/ocsp/ocsp_asn.c b/crypto/ocsp/ocsp_asn.c
index 336d5e396b9097af7b09c529d1bd3bc0e536d3ef..76ad805bf12a86d3fc52883563232daf65458790 100644 (file)
--- a/crypto/ocsp/ocsp_asn.c
+++ b/crypto/ocsp/ocsp_asn.c
@@ -120,6 +120,8 @@ ASN1_CHOICE(OCSP_RESPID) = {
           ASN1_IMP(OCSP_RESPID, value.byKey, ASN1_OCTET_STRING, 2)
 } ASN1_CHOICE_END(OCSP_RESPID);
 
           ASN1_IMP(OCSP_RESPID, value.byKey, ASN1_OCTET_STRING, 2)
 } ASN1_CHOICE_END(OCSP_RESPID);
 

+IMPLEMENT_ASN1_FUNCTIONS(OCSP_RESPID)
+

 ASN1_SEQUENCE(OCSP_REVOKEDINFO) = {
        ASN1_SIMPLE(OCSP_REVOKEDINFO, revocationTime, ASN1_GENERALIZEDTIME),
        ASN1_EXP_OPT(OCSP_REVOKEDINFO, revocationReason, ASN1_ENUMERATED, 0)
 ASN1_SEQUENCE(OCSP_REVOKEDINFO) = {
        ASN1_SIMPLE(OCSP_REVOKEDINFO, revocationTime, ASN1_GENERALIZEDTIME),
        ASN1_EXP_OPT(OCSP_REVOKEDINFO, revocationReason, ASN1_ENUMERATED, 0)

diff --git a/crypto/pkcs7/pk7_asn1.c b/crypto/pkcs7/pk7_asn1.c
index 192890d6c6d38e8c0e249cc8397032347771ba76..8d06c0b6800e7e5aa382bd33cb0fa9efb3b538b2 100644 (file)
--- a/crypto/pkcs7/pk7_asn1.c
+++ b/crypto/pkcs7/pk7_asn1.c
@@ -176,3 +176,5 @@ ASN1_SEQUENCE(PKCS7_DIGEST) = {
        ASN1_SIMPLE(PKCS7_DIGEST, contents, PKCS7),
        ASN1_SIMPLE(PKCS7_DIGEST, digest, ASN1_OCTET_STRING)
 } ASN1_SEQUENCE_END(PKCS7_DIGEST);
        ASN1_SIMPLE(PKCS7_DIGEST, contents, PKCS7),
        ASN1_SIMPLE(PKCS7_DIGEST, digest, ASN1_OCTET_STRING)
 } ASN1_SEQUENCE_END(PKCS7_DIGEST);

+
+IMPLEMENT_ASN1_FUNCTIONS(PKCS7_DIGEST)

diff --git a/util/mkdef.pl b/util/mkdef.pl
index 6ffbbe431eed74300d66b2873815580576602afb..dc21310e47b00ab75089442cfc07f98813e96582 100755 (executable)
--- a/util/mkdef.pl
+++ b/util/mkdef.pl
@@ -377,6 +377,13 @@ sub do_defs
                        }
                        if (/^\s*DECLARE_STACK_OF\s*\(\s*(\w*)\s*\)/) {
                                next;
                        }
                        if (/^\s*DECLARE_STACK_OF\s*\(\s*(\w*)\s*\)/) {
                                next;

+                       } elsif (/^\s*DECLARE_ASN1_FUNCTIONS_fname\s*\(\s*(\w*)\s*,\s*(\w*)\s*,\s*(\w*)\s*\)/) {
+                               $syms{"d2i_$3"} = 1;
+                               $syms{"i2d_$3"} = 1;
+                               $syms{"$3_new"} = 1;
+                               $syms{"$3_free"} = 1;
+                               $syms{"$2_it"} = 1;
+                               $kind{"$2_it"} = "VARIABLE";

                        } elsif (/^\s*DECLARE_ASN1_FUNCTIONS\s*\(\s*(\w*)\s*\)/) {
                                $syms{"d2i_$1"} = 1;
                                $syms{"i2d_$1"} = 1;
                        } elsif (/^\s*DECLARE_ASN1_FUNCTIONS\s*\(\s*(\w*)\s*\)/) {
                                $syms{"d2i_$1"} = 1;
                                $syms{"i2d_$1"} = 1;