Hmm. Seems to have gotten lost on the way. Resending.

//oscar
--- Begin Message ---
Please find attached the patches required to get the trunk (as of last
night) to compile with visual c++ using the standard build procedure.

Best regards,

//oscar
Index: crypto/aes/Makefile.ssl
===================================================================
RCS file: /usr/local/cvsroot/libraries/openssl/crypto/aes/Makefile.ssl,v
retrieving revision 1.1
diff -u -r1.1 Makefile.ssl
--- crypto/aes/Makefile.ssl     2 Jan 2002 16:55:27 -0000       1.1
+++ crypto/aes/Makefile.ssl     13 Jan 2002 14:52:42 -0000
@@ -21,7 +21,6 @@
 CFLAGS= $(INCLUDES) $(CFLAG)
 
 GENERAL=Makefile
-TEST=aestest.c
 APPS=
 
 LIB=$(TOP)/libcrypto.a
@@ -53,7 +52,6 @@
 links:
        @$(TOP)/util/point.sh Makefile.ssl Makefile
        @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)
-       @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
        @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
 
 install: installs
Index: crypto/bio/bss_conn.c
===================================================================
RCS file: /usr/local/cvsroot/libraries/openssl/crypto/bio/bss_conn.c,v
retrieving revision 1.21
diff -u -r1.21 bss_conn.c
--- crypto/bio/bss_conn.c       12 Jan 2002 15:56:07 -0000      1.21
+++ crypto/bio/bss_conn.c       13 Jan 2002 14:52:42 -0000
@@ -614,7 +614,7 @@
                {
        case BIO_CTRL_SET_CALLBACK:
                {
-               data->info_callback=(int (*)())fp;
+               data->info_callback=(int (*)(const struct bio_st *, int, int))fp;
                }
                break;
        default:
Index: crypto/ec/ec_mult.c
===================================================================
RCS file: /usr/local/cvsroot/libraries/openssl/crypto/ec/ec_mult.c,v
retrieving revision 1.17
diff -u -r1.17 ec_mult.c
--- crypto/ec/ec_mult.c 22 Nov 2001 11:08:38 -0000      1.17
+++ crypto/ec/ec_mult.c 13 Jan 2002 14:52:43 -0000
@@ -336,7 +336,7 @@
                
                for (i = 0; i < totalnum; i++)
                        {
-                       if (wNAF_len[i] > k)
+                       if (wNAF_len[i] > (size_t)k)
                                {
                                int digit = wNAF[i][k];
                                int is_neg;
Index: util/libeay.num
===================================================================
RCS file: /usr/local/cvsroot/libraries/openssl/util/libeay.num,v
retrieving revision 1.169
diff -u -r1.169 libeay.num
--- util/libeay.num     4 Jan 2002 15:03:25 -0000       1.169
+++ util/libeay.num     13 Jan 2002 14:52:45 -0000
@@ -2766,3 +2766,18 @@
 ASN1_OBJECT_it                          3180   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
 OCSP_crlID_new                          3181   EXIST:!VMS,!WIN16:FUNCTION:
 OCSP_crlID2_new                         3181   EXIST:VMS,WIN16:FUNCTION:
+ASN1_add_oid_module                    3182    EXIST::FUNCTION:
+CONF_imodule_get_flags                 3183    EXIST::FUNCTION:
+CONF_imodule_get_module                        3184    EXIST::FUNCTION:
+CONF_imodule_get_name                  3185    EXIST::FUNCTION:
+CONF_imodule_get_usr_data              3186    EXIST::FUNCTION:
+CONF_imodule_get_value                 3187    EXIST::FUNCTION:
+CONF_imodule_set_flags                 3188    EXIST::FUNCTION:
+CONF_imodule_set_usr_data              3189    EXIST::FUNCTION:
+CONF_module_add                                3190    EXIST::FUNCTION:
+CONF_module_get_usr_data               3191    EXIST::FUNCTION:
+CONF_module_set_usr_data               3192    EXIST::FUNCTION:
+CONF_modules_finish                    3193    EXIST::FUNCTION:
+CONF_modules_load                      3194    EXIST::FUNCTION:
+CONF_modules_load_file                 3195    EXIST::FUNCTION:
+CONF_modules_unload                    3196    EXIST::FUNCTION:
--- End Message ---

Reply via email to