Hi all,
These changes where necessary to build openssl static (dll link failes
anyway, but I don't have time to try to fix that) with VC++ 6.0, W2K,
options "nasm -DNO_KRB5" and using ms\32all.bat. Note that there's some
type casting to get rid of warings about converting `long� to something
smaller size; maybe some funamental change is needed, I don't know. I'm
sure the core folks won't just blindly commit this... :-)
(Lines will be wrapped, but maybe it's preffered over an attached file?)
diff -ur openssl-SNAP-20001219.orig/apps/engine.c
openssl-SNAP-20001219/apps/engine.c
--- openssl-SNAP-20001219.orig/apps/engine.c Tue Nov 07 00:00:18 2000
+++ openssl-SNAP-20001219/apps/engine.c Wed Dec 20 09:18:14 2000
@@ -83,7 +83,7 @@
return;
}
-static int append_buf(char **buf, char *s, int *size, int step)
+static int append_buf(char **buf, char *s, unsigned int *size, int
step)
{
int l = strlen(s);
@@ -203,7 +203,7 @@
}
if (list_cap)
{
- int cap_size = 256;
+ unsigned int cap_size = 256;
char *cap_buf = NULL;
if (ENGINE_get_RSA(e) != NULL
diff -ur openssl-SNAP-20001219.orig/crypto/asn1/tasn_dec.c
openssl-SNAP-20001219/crypto/asn1/tasn_dec.c
--- openssl-SNAP-20001219.orig/crypto/asn1/tasn_dec.c Fri Dec 08
20:07:06 2000
+++ openssl-SNAP-20001219/crypto/asn1/tasn_dec.c Wed Dec 20 08:12:18
2000
@@ -58,6 +58,9 @@
#include <stddef.h>
+#ifdef WIN32
+#include <memory.h>
+#endif /* WIN32 */
#include <openssl/asn1.h>
#include <openssl/asn1t.h>
#include <openssl/objects.h>
@@ -201,7 +204,7 @@
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);
@@ -315,7 +318,7 @@
* 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) {
diff -ur openssl-SNAP-20001219.orig/crypto/asn1/tasn_enc.c
openssl-SNAP-20001219/crypto/asn1/tasn_enc.c
--- openssl-SNAP-20001219.orig/crypto/asn1/tasn_enc.c Thu Dec 14
01:00:18 2000
+++ openssl-SNAP-20001219/crypto/asn1/tasn_enc.c Wed Dec 20 08:08:26
2000
@@ -58,6 +58,9 @@
#include <stddef.h>
+#ifdef WIN32
+#include <memory.h>
+#endif /* WIN32 */
#include <openssl/asn1.h>
#include <openssl/asn1t.h>
#include <openssl/objects.h>
diff -ur openssl-SNAP-20001219.orig/crypto/asn1/tasn_new.c
openssl-SNAP-20001219/crypto/asn1/tasn_new.c
--- openssl-SNAP-20001219.orig/crypto/asn1/tasn_new.c Fri Dec 08
20:07:06 2000
+++ openssl-SNAP-20001219/crypto/asn1/tasn_new.c Wed Dec 20 08:07:51
2000
@@ -58,6 +58,9 @@
#include <stddef.h>
+#ifdef WIN32
+#include <memory.h>
+#endif /* WIN32 */
#include <openssl/asn1.h>
#include <openssl/objects.h>
#include <openssl/err.h>
diff -ur openssl-SNAP-20001219.orig/crypto/asn1/tasn_utl.c
openssl-SNAP-20001219/crypto/asn1/tasn_utl.c
--- openssl-SNAP-20001219.orig/crypto/asn1/tasn_utl.c Fri Dec 08
20:07:08 2000
+++ openssl-SNAP-20001219/crypto/asn1/tasn_utl.c Wed Dec 20 08:12:58
2000
@@ -58,6 +58,9 @@
#include <stddef.h>
+#ifdef WIN32
+#include <memory.h>
+#endif /* WIN32 */
#include <openssl/asn1.h>
#include <openssl/asn1t.h>
#include <openssl/objects.h>
diff -ur openssl-SNAP-20001219.orig/crypto/objects/o_names.c
openssl-SNAP-20001219/crypto/objects/o_names.c
--- openssl-SNAP-20001219.orig/crypto/objects/o_names.c Wed Dec 13
19:00:34 2000
+++ openssl-SNAP-20001219/crypto/objects/o_names.c Wed Dec 20 08:04:10
2000
@@ -295,12 +295,12 @@
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);
- OPENSSL_free(d.names);
+ OPENSSL_free((void *)d.names);
}
static int free_type;
----------------------------------------------------------------
Peter "Luna" Runestig (fd. Altberg), Sweden <[EMAIL PROTECTED]>
PGP Key ID: 0xD07BBE13
Fingerprint: 7B5C 1F48 2997 C061 DE4B 42EA CB99 A35C D07B BE13
AOL Instant Messenger Screenname: PRunestig
______________________________________________________________________
OpenSSL Project http://www.openssl.org
Development Mailing List [EMAIL PROTECTED]
Automated List Manager [EMAIL PROTECTED]
