Most of them resolve unsigned vs. non-unsigned issues or function
declaration. I had to do some casts (Ben, forgive me, I didn't dare
to go deeper. I might dare more tomorrow...). And, uhmmm, remove a
few CR's :-)...
And now I've fixed my software so it won't make garbage of this
mail...
Index: CHANGES
===================================================================
RCS file: /src/packages/openssl/repository//openssl/CHANGES,v
retrieving revision 1.125
diff -u -r1.125 CHANGES
--- CHANGES 1999/03/07 15:21:08 1.125
+++ CHANGES 1999/03/08 16:54:33
@@ -5,6 +5,95 @@
Changes between 0.9.1c and 0.9.2
+ *) Added inclusion of string.h apps/nseq.c so strcmp would get correctly
+ declared.
+ [Richard Levitte <[EMAIL PROTECTED]>]
+
+ *) In apps/ca.c, make sure conf.h gets included before x509v3.h, or some
+ functions will not be declared.
+ [Richard Levitte <[EMAIL PROTECTED]>]
+
+ *) In apps/req.c:make_REQ(), change `unsigned char *p, *q' to `char *',
+ to avoid complaints from the compiler.
+ [Richard Levitte <[EMAIL PROTECTED]>]
+
+ *) In apps/s_socket.c:nbio_sock_error() and
+ crypto/bio/b_sock.c:BIO_sock_error(), make sure size is an unsigned
+ int, or the compiler may complain about the call to getsockopt(),
+ which should take an unsigned int as last argument. For similar
+ reasons, make len in apps/s_socket.c:do_accept() and in
+ crypto/bio/b_sock.c:BIO_accept() an unsigned int.
+ [Richard Levitte <[EMAIL PROTECTED]>]
+
+ *) In crypto/conf/test.c, make sure the ERR_xxx functions are properly
+ declared by including err.h.
+ [Richard Levitte <[EMAIL PROTECTED]>]
+
+ *) In crypto/des/destest.c, I can't understand why cbc_data isn't
+ unsigned. Changed.
+ [Richard Levitte <[EMAIL PROTECTED]>]
+
+ *) In crypto/des/enc_read.c:des_enc_read(), made unnet and tmpbuf
+ unsigned, because the compiler complained again. A couple of
+ casts (are they necessary) for malloc() were changed, and buf
+ is cast (unsigned char *) when given to des_pcbc_encrypt() and
+ des_cbc_encrypt(), because I don't dare changed the type for
+ buf just yet. Similar things have been done with outbuf, shortbuf,
+ p and cp in crypto/des/enc_writ.c:des_enc_write().
+ [Richard Levitte <[EMAIL PROTECTED]>]
+
+ *) It's a good thing for printf() if stdlib.h gets included in
+ crypto/des/rpw.c, as well as in crypto/pem/ctx_size.c.
+ [Richard Levitte <[EMAIL PROTECTED]>]
+
+ *) I added some casts in crypto/des/str2key.c. Please forgive me,
+ but my compiler won't stop complaining otherwise.
+ [Richard Levitte <[EMAIL PROTECTED]>]
+
+ *) Added a bunch of casts in crypto/evp/bio_ok.c. They were needed
+ to get the compiler happy about the calls to EVP_DigestUpdate().
+ [Richard Levitte <[EMAIL PROTECTED]>]
+
+ *) Changed md_len in crypto/pkcs7/pk7_doit.c from int to unsigned int.
+ [Richard Levitte <[EMAIL PROTECTED]>]
+
+ *) Added inclusion of string.h in crypto/rsa/rsa_oaep_test.c so memcpy
+ and memcmp would get correctly declared.
+ [Richard Levitte <[EMAIL PROTECTED]>]
+
+ *) Make sure Makefile.org and crypto/Makefile.ssl defines CC when
+ making links in the subdirectories. This ensures we use the
+ same compiler to compile crypto/pem/ctx_size.c as for all the rest.
+ [Richard Levitte <[EMAIL PROTECTED]>]
+
+ *) In crypto/x509/by_dir.c:add_cert_dir(), there's a bug that can cause
+ a segment violation or something similar if the directory spec. didn't
+ end with a LIST_SEPARATOR_CHAR. When that happens, we're done and
+ simply break out of the loop.
+ [Richard Levitte <[EMAIL PROTECTED]>]
+
+ *) In crypto/x509v3/v3_alt.c:v2i_GENERAL_NAME() and
+ crypto/x509v3/v3_ia5.c:s2i_ASN1_IA5STRING(), we need a cast on the
+ second argument to ASN1_STRING_set().
+ [Richard Levitte <[EMAIL PROTECTED]>]
+
+ *) In crypto/x509v3/v3_conf.c:do_ext_conf(), ext_der and p change
+ type from char * to unsigned char *. Same things happens to p
+ in crypto/x509v3/v3_prn.c:X509V3_EXT_print().
+ [Richard Levitte <[EMAIL PROTECTED]>]
+
+ *) In crypto/x509v3/v3_skey.c:s2i_skey_id(), diglen is cast to unsigned
+ int when sent to EVP_DigestFinal. I blame my compiler or the ASN1
+ function API :-).
+ [Richard Levitte <[EMAIL PROTECTED]>]
+
+ *) OK, my compiler is picky... It commented about the CR's it found in
+ ssl/ssl_ciph.c... Go figure...
+ [Richard Levitte <[EMAIL PROTECTED]>]
+
+ *) In ssl/ssl_sess.c:ssl_get_prev_session(), buf and p are made unsigned.
+ [Richard Levitte <[EMAIL PROTECTED]>]
+
*) Fix the generation of two part addresses in perl.
[Kenji Miyake <[EMAIL PROTECTED]>, integrated by Ben Laurie]
Index: Makefile.org
===================================================================
RCS file: /src/packages/openssl/repository//openssl/Makefile.org,v
retrieving revision 1.14
diff -u -r1.14 Makefile.org
--- Makefile.org 1999/03/07 14:01:55 1.14
+++ Makefile.org 1999/03/08 14:09:40
@@ -238,7 +238,7 @@
@$(TOP)/util/mklink.sh include $(EXHEADER)
@for i in $(DIRS); do \
(cd $$i && echo "making links in $$i..." && \
- $(MAKE) SDIRS='${SDIRS}' links ) || exit 1; \
+ $(MAKE) SDIRS='${SDIRS}' CC='$(CC)' links ) || exit 1; \
done;
@(OPENSSL="`pwd`/apps/openssl"; export OPENSSL; sh tools/c_rehash certs)
Index: apps/ca.c
===================================================================
RCS file: /src/packages/openssl/repository//openssl/apps/ca.c,v
retrieving revision 1.17
diff -u -r1.17 ca.c
--- apps/ca.c 1999/03/06 19:33:24 1.17
+++ apps/ca.c 1999/03/08 14:59:17
@@ -64,6 +64,7 @@
#include <sys/types.h>
#include <sys/stat.h>
#include "apps.h"
+#include "conf.h"
#include "bio.h"
#include "err.h"
#include "bn.h"
@@ -73,7 +74,6 @@
#include "x509v3.h"
#include "objects.h"
#include "pem.h"
-#include "conf.h"
#ifndef W_OK
#include <sys/file.h>
Index: apps/nseq.c
===================================================================
RCS file: /src/packages/openssl/repository//openssl/apps/nseq.c,v
retrieving revision 1.2
diff -u -r1.2 nseq.c
--- apps/nseq.c 1999/01/31 11:19:17 1.2
+++ apps/nseq.c 1999/03/08 14:58:07
@@ -57,6 +57,7 @@
*/
#include <stdio.h>
+#include <string.h>
#include "pem.h"
#include "err.h"
#include "apps.h"
Index: apps/req.c
===================================================================
RCS file: /src/packages/openssl/repository//openssl/apps/req.c,v
retrieving revision 1.15
diff -u -r1.15 req.c
--- apps/req.c 1999/03/06 19:33:24 1.15
+++ apps/req.c 1999/03/08 15:01:26
@@ -831,7 +831,7 @@
int attribs;
{
int ret=0,i;
- unsigned char *p,*q;
+ char *p,*q;
X509_REQ_INFO *ri;
char buf[100];
int nid,min,max;
Index: apps/s_socket.c
===================================================================
RCS file: /src/packages/openssl/repository//openssl/apps/s_socket.c,v
retrieving revision 1.2
diff -u -r1.2 s_socket.c
--- apps/s_socket.c 1998/12/22 15:59:55 1.2
+++ apps/s_socket.c 1999/03/08 15:06:47
@@ -218,7 +218,8 @@
int nbio_sock_error(sock)
int sock;
{
- int j,i,size;
+ int j,i;
+ unsigned int size;
size=sizeof(int);
i=getsockopt(sock,SOL_SOCKET,SO_ERROR,(char *)&j,&size);
@@ -376,7 +377,7 @@
int ret,i;
struct hostent *h1,*h2;
static struct sockaddr_in from;
- int len;
+ unsigned int len;
/* struct linger ling; */
if (!sock_init()) return(0);
Index: crypto/Makefile.ssl
===================================================================
RCS file: /src/packages/openssl/repository//openssl/crypto/Makefile.ssl,v
retrieving revision 1.12
diff -u -r1.12 Makefile.ssl
--- crypto/Makefile.ssl 1999/03/06 14:32:14 1.12
+++ crypto/Makefile.ssl 1999/03/08 14:12:57
@@ -75,7 +75,7 @@
@$(TOP)/util/point.sh Makefile.ssl Makefile
@for i in $(SDIRS); do \
(cd $$i; echo "making links in crypto/$$i..."; \
- $(MAKE) links ); \
+ $(MAKE) CC='$(CC)' links ); \
done;
lib: $(LIBOBJ)
Index: crypto/bio/b_sock.c
===================================================================
RCS file: /src/packages/openssl/repository//openssl/crypto/bio/b_sock.c,v
retrieving revision 1.3
diff -u -r1.3 b_sock.c
--- crypto/bio/b_sock.c 1999/02/25 10:54:27 1.3
+++ crypto/bio/b_sock.c 1999/03/08 15:13:17
@@ -200,7 +200,8 @@
int BIO_sock_error(sock)
int sock;
{
- int j,i,size;
+ int j,i;
+ unsigned int size;
size=sizeof(int);
@@ -611,7 +612,7 @@
static struct sockaddr_in from;
unsigned long l;
unsigned short port;
- int len;
+ unsigned int len;
char *p;
memset((char *)&from,0,sizeof(from));
Index: crypto/conf/test.c
===================================================================
RCS file: /src/packages/openssl/repository//openssl/crypto/conf/test.c,v
retrieving revision 1.2
diff -u -r1.2 test.c
--- crypto/conf/test.c 1999/01/02 15:05:08 1.2
+++ crypto/conf/test.c 1999/03/08 15:16:48
@@ -59,6 +59,7 @@
#include <stdio.h>
#include <stdlib.h>
#include "conf.h"
+#include "err.h"
main()
{
Index: crypto/des/destest.c
===================================================================
RCS file: /src/packages/openssl/repository//openssl/crypto/des/destest.c,v
retrieving revision 1.4
diff -u -r1.4 destest.c
--- crypto/des/destest.c 1999/02/13 19:03:14 1.4
+++ crypto/des/destest.c 1999/03/08 15:19:01
@@ -229,7 +229,7 @@
/* Changed the following text constant to binary so it will work on ebcdic
* machines :-) */
/* static char cbc_data[40]="7654321 Now is the time for \0001"; */
-static char cbc_data[40]={
+static unsigned char cbc_data[40]={
0x37,0x36,0x35,0x34,0x33,0x32,0x31,0x20,
0x4E,0x6F,0x77,0x20,0x69,0x73,0x20,0x74,
0x68,0x65,0x20,0x74,0x69,0x6D,0x65,0x20,
Index: crypto/des/enc_read.c
===================================================================
RCS file: /src/packages/openssl/repository//openssl/crypto/des/enc_read.c,v
retrieving revision 1.2
diff -u -r1.2 enc_read.c
--- crypto/des/enc_read.c 1999/02/13 18:52:20 1.2
+++ crypto/des/enc_read.c 1999/03/08 15:25:09
@@ -77,17 +77,17 @@
/* extra unencrypted data
* for when a block of 100 comes in but is des_read one byte at
* a time. */
- static char *unnet=NULL;
+ static unsigned char *unnet=NULL;
static int unnet_start=0;
static int unnet_left=0;
- static char *tmpbuf=NULL;
+ static unsigned char *tmpbuf=NULL;
int i;
long num=0,rnum;
unsigned char *p;
if (tmpbuf == NULL)
{
- tmpbuf=(char *)malloc(BSIZE);
+ tmpbuf=(unsigned char *)malloc(BSIZE);
if (tmpbuf == NULL) return(-1);
}
if (net == NULL)
@@ -97,7 +97,7 @@
}
if (unnet == NULL)
{
- unnet=(char *)malloc(BSIZE);
+ unnet=(unsigned char *)malloc(BSIZE);
if (unnet == NULL) return(-1);
}
/* left over data from last decrypt */
@@ -200,10 +200,12 @@
else
{
if (des_rw_mode & DES_PCBC_MODE)
- des_pcbc_encrypt(net,buf,num,sched,iv,
+ des_pcbc_encrypt(net,(unsigned char *)buf,num,
+ sched,iv,
DES_DECRYPT);
else
- des_cbc_encrypt(net,buf,num,sched,iv,
+ des_cbc_encrypt(net,(unsigned char *)buf,num,
+ sched,iv,
DES_DECRYPT);
}
}
Index: crypto/des/enc_writ.c
===================================================================
RCS file: /src/packages/openssl/repository//openssl/crypto/des/enc_writ.c,v
retrieving revision 1.2
diff -u -r1.2 enc_writ.c
--- crypto/des/enc_writ.c 1999/02/13 18:52:20 1.2
+++ crypto/des/enc_writ.c 1999/03/08 15:27:38
@@ -76,15 +76,15 @@
long rnum;
int i,j,k,outnum;
- static char *outbuf=NULL;
- char shortbuf[8];
- char *p;
- const char *cp;
+ static unsigned char *outbuf=NULL;
+ unsigned char shortbuf[8];
+ unsigned char *p;
+ const unsigned char *cp;
static int start=1;
if (outbuf == NULL)
{
- outbuf=(char *)malloc(BSIZE+HDRSIZE);
+ outbuf=(unsigned char *)malloc(BSIZE+HDRSIZE);
if (outbuf == NULL) return(-1);
}
/* If we are sending less than 8 bytes, the same char will look
@@ -126,7 +126,7 @@
}
else
{
- cp=buf;
+ cp=(unsigned char *)buf;
rnum=((len+7)/8*8); /* round up to nearest eight */
}
Index: crypto/des/rpw.c
===================================================================
RCS file: /src/packages/openssl/repository//openssl/crypto/des/rpw.c,v
retrieving revision 1.1.1.2
diff -u -r1.1.1.2 rpw.c
--- crypto/des/rpw.c 1998/12/21 10:55:03 1.1.1.2
+++ crypto/des/rpw.c 1999/03/08 15:29:35
@@ -57,6 +57,7 @@
*/
#include <stdio.h>
+#include <stdlib.h>
#include "des.h"
int main(argc,argv)
Index: crypto/des/str2key.c
===================================================================
RCS file: /src/packages/openssl/repository//openssl/crypto/des/str2key.c,v
retrieving revision 1.2
diff -u -r1.2 str2key.c
--- crypto/des/str2key.c 1999/02/13 18:52:21 1.2
+++ crypto/des/str2key.c 1999/03/08 15:32:12
@@ -94,7 +94,7 @@
des_check_key=0;
des_set_key(key,ks);
des_check_key=i;
- des_cbc_cksum(str,key,length,ks,key);
+ des_cbc_cksum((unsigned char *)str,key,length,ks,key);
memset(ks,0,sizeof(ks));
des_set_odd_parity(key);
}
@@ -158,9 +158,9 @@
i=des_check_key;
des_check_key=0;
des_set_key(key1,ks);
- des_cbc_cksum(str,key1,length,ks,key1);
+ des_cbc_cksum((unsigned char *)str,key1,length,ks,key1);
des_set_key(key2,ks);
- des_cbc_cksum(str,key2,length,ks,key2);
+ des_cbc_cksum((unsigned char *)str,key2,length,ks,key2);
des_check_key=i;
memset(ks,0,sizeof(ks));
des_set_odd_parity(key1);
Index: crypto/evp/bio_ok.c
===================================================================
RCS file: /src/packages/openssl/repository//openssl/crypto/evp/bio_ok.c,v
retrieving revision 1.2
diff -u -r1.2 bio_ok.c
--- crypto/evp/bio_ok.c 1999/03/03 02:01:19 1.2
+++ crypto/evp/bio_ok.c 1999/03/08 16:52:20
@@ -480,7 +480,7 @@
longswap(&(ctx->buf[ctx->buf_len]), md->digest->md_size);
ctx->buf_len+= md->digest->md_size;
- EVP_DigestUpdate(md, WELLKNOWN, strlen(WELLKNOWN));
+ EVP_DigestUpdate(md, (unsigned char *)WELLKNOWN, strlen(WELLKNOWN));
md->digest->final(&(ctx->buf[ctx->buf_len]), &(md->md.base[0]));
ctx->buf_len+= md->digest->md_size;
ctx->blockout= 1;
@@ -504,7 +504,7 @@
longswap(&(md->md.base[0]), md->digest->md_size);
ctx->buf_off+= md->digest->md_size;
- EVP_DigestUpdate(md, WELLKNOWN, strlen(WELLKNOWN));
+ EVP_DigestUpdate(md, (unsigned char *)WELLKNOWN, strlen(WELLKNOWN));
md->digest->final(tmp, &(md->md.base[0]));
ret= memcmp(&(ctx->buf[ctx->buf_off]), tmp, md->digest->md_size) == 0;
ctx->buf_off+= md->digest->md_size;
@@ -537,7 +537,7 @@
tl= swapem(tl);
memcpy(ctx->buf, &tl, OK_BLOCK_BLOCK);
tl= swapem(tl);
- EVP_DigestUpdate(md, &(ctx->buf[OK_BLOCK_BLOCK]), tl);
+ EVP_DigestUpdate(md, (unsigned char *)&(ctx->buf[OK_BLOCK_BLOCK]), tl);
md->digest->final(&(ctx->buf[ctx->buf_len]), &(md->md.base[0]));
ctx->buf_len+= md->digest->md_size;
ctx->blockout= 1;
@@ -557,7 +557,7 @@
tl= swapem(tl);
if (ctx->buf_len < tl+ OK_BLOCK_BLOCK+ md->digest->md_size) return;
- EVP_DigestUpdate(md, &(ctx->buf[OK_BLOCK_BLOCK]), tl);
+ EVP_DigestUpdate(md, (unsigned char *)&(ctx->buf[OK_BLOCK_BLOCK]), tl);
md->digest->final(tmp, &(md->md.base[0]));
if(memcmp(&(ctx->buf[tl+ OK_BLOCK_BLOCK]), tmp, md->digest->md_size) == 0)
{
Index: crypto/pem/ctx_size.c
===================================================================
RCS file: /src/packages/openssl/repository//openssl/crypto/pem/ctx_size.c,v
retrieving revision 1.2
diff -u -r1.2 ctx_size.c
--- crypto/pem/ctx_size.c 1999/01/31 15:00:12 1.2
+++ crypto/pem/ctx_size.c 1999/03/08 15:41:21
@@ -57,6 +57,7 @@
*/
#include <stdio.h>
+#include <stdlib.h>
#include <string.h>
#include "evp.h"
Index: crypto/pkcs7/pk7_doit.c
===================================================================
RCS file: /src/packages/openssl/repository//openssl/crypto/pkcs7/pk7_doit.c,v
retrieving revision 1.6
diff -u -r1.6 pk7_doit.c
--- crypto/pkcs7/pk7_doit.c 1999/03/05 02:05:15 1.6
+++ crypto/pkcs7/pk7_doit.c 1999/03/08 15:48:58
@@ -721,7 +721,7 @@
if ((sk != NULL) && (sk_num(sk) != 0))
{
unsigned char md_dat[EVP_MAX_MD_SIZE];
- int md_len;
+ unsigned int md_len;
ASN1_OCTET_STRING *message_digest;
EVP_DigestFinal(&mdc_tmp,md_dat,&md_len);
Index: crypto/rsa/rsa_oaep_test.c
===================================================================
RCS file: /src/packages/openssl/repository//openssl/crypto/rsa/rsa_oaep_test.c,v
retrieving revision 1.3
diff -u -r1.3 rsa_oaep_test.c
--- crypto/rsa/rsa_oaep_test.c 1999/02/23 07:47:30 1.3
+++ crypto/rsa/rsa_oaep_test.c 1999/03/08 15:55:07
@@ -1,6 +1,7 @@
/* test vectors from p1ovect1.txt */
#include <stdio.h>
+#include <string.h>
#include "e_os.h"
#include "rsa.h"
Index: crypto/x509/by_dir.c
===================================================================
RCS file: /src/packages/openssl/repository//openssl/crypto/x509/by_dir.c,v
retrieving revision 1.3
diff -u -r1.3 by_dir.c
--- crypto/x509/by_dir.c 1999/01/30 14:05:52 1.3
+++ crypto/x509/by_dir.c 1999/03/08 16:04:52
@@ -206,7 +206,12 @@
ss=s;
s=p+1;
len=(int)(p-ss);
- if (len == 0) continue;
+ if (len == 0)
+ {
+ if (ss == p)
+ break;
+ continue;
+ }
for (j=0; j<ctx->num_dirs; j++)
if (strncmp(ctx->dirs[j],ss,(unsigned int)len) == 0)
continue;
Index: crypto/x509v3/v3_alt.c
===================================================================
RCS file: /src/packages/openssl/repository//openssl/crypto/x509v3/v3_alt.c,v
retrieving revision 1.8
diff -u -r1.8 v3_alt.c
--- crypto/x509v3/v3_alt.c 1999/03/06 02:34:07 1.8
+++ crypto/x509v3/v3_alt.c 1999/03/08 16:09:38
@@ -408,7 +408,8 @@
if(is_string) {
if(!(gen->d.ia5 = ASN1_IA5STRING_new()) ||
- !ASN1_STRING_set(gen->d.ia5, value, strlen(value))) {
+ !ASN1_STRING_set(gen->d.ia5, (unsigned char *)value,
+ strlen(value))) {
X509V3err(X509V3_F_V2I_GENERAL_NAME,ERR_R_MALLOC_FAILURE);
goto err;
}
Index: crypto/x509v3/v3_conf.c
===================================================================
RCS file: /src/packages/openssl/repository//openssl/crypto/x509v3/v3_conf.c,v
retrieving revision 1.6
diff -u -r1.6 v3_conf.c
--- crypto/x509v3/v3_conf.c 1999/03/06 19:33:28 1.6
+++ crypto/x509v3/v3_conf.c 1999/03/08 16:10:08
@@ -124,7 +124,7 @@
X509V3_EXT_METHOD *method;
STACK *nval;
char *ext_struc;
- char *ext_der, *p;
+ unsigned char *ext_der, *p;
int ext_len;
ASN1_OCTET_STRING *ext_oct;
if(ext_nid == NID_undef) {
Index: crypto/x509v3/v3_ia5.c
===================================================================
RCS file: /src/packages/openssl/repository//openssl/crypto/x509v3/v3_ia5.c,v
retrieving revision 1.2
diff -u -r1.2 v3_ia5.c
--- crypto/x509v3/v3_ia5.c 1999/02/22 01:26:29 1.2
+++ crypto/x509v3/v3_ia5.c 1999/03/08 16:13:30
@@ -113,7 +113,8 @@
return NULL;
}
if(!(ia5 = ASN1_IA5STRING_new())) goto err;
- if(!ASN1_STRING_set((ASN1_STRING *)ia5, str, strlen(str))) {
+ if(!ASN1_STRING_set((ASN1_STRING *)ia5, (unsigned char *)str,
+ strlen(str))) {
ASN1_IA5STRING_free(ia5);
goto err;
}
Index: crypto/x509v3/v3_prn.c
===================================================================
RCS file: /src/packages/openssl/repository//openssl/crypto/x509v3/v3_prn.c,v
retrieving revision 1.3
diff -u -r1.3 v3_prn.c
--- crypto/x509v3/v3_prn.c 1999/02/22 01:26:29 1.3
+++ crypto/x509v3/v3_prn.c 1999/03/08 16:14:27
@@ -89,7 +89,8 @@
X509_EXTENSION *ext;
int flag;
{
- char *ext_str = NULL, *p, *value = NULL;
+ char *ext_str = NULL, *value = NULL;
+ unsigned char *p;
X509V3_EXT_METHOD *method;
STACK *nval = NULL;
int ok = 1;
Index: crypto/x509v3/v3_skey.c
===================================================================
RCS file: /src/packages/openssl/repository//openssl/crypto/x509v3/v3_skey.c,v
retrieving revision 1.3
diff -u -r1.3 v3_skey.c
--- crypto/x509v3/v3_skey.c 1999/03/06 02:34:07 1.3
+++ crypto/x509v3/v3_skey.c 1999/03/08 16:19:46
@@ -151,7 +151,7 @@
EVP_DigestInit(&md, EVP_sha1());
EVP_DigestUpdate(&md, pk->data, pk->length);
- EVP_DigestFinal(&md, pkey_dig, &diglen);
+ EVP_DigestFinal(&md, pkey_dig, (unsigned int *)&diglen);
if(!ASN1_OCTET_STRING_set(oct, pkey_dig, diglen)) {
X509V3err(X509V3_F_S2I_S2I_SKEY_ID,ERR_R_MALLOC_FAILURE);
Index: ssl/ssl_ciph.c
===================================================================
RCS file: /src/packages/openssl/repository//openssl/ssl/ssl_ciph.c,v
retrieving revision 1.6
diff -u -r1.6 ssl_ciph.c
--- ssl/ssl_ciph.c 1999/03/06 12:09:36 1.6
+++ ssl/ssl_ciph.c 1999/03/08 16:20:06
@@ -616,7 +616,7 @@
char *buf;
int len;
{
- int is_export,pkl,kl;
+ int is_export,pkl,kl;
char *ver,*exp;
char *kx,*au,*enc,*mac;
unsigned long alg,alg2;
@@ -625,10 +625,10 @@
alg=cipher->algorithms;
alg2=cipher->algorithm2;
- is_export=SSL_IS_EXPORT(alg);
+ is_export=SSL_IS_EXPORT(alg);
pkl=SSL_EXPORT_PKEYLENGTH(alg);
kl=SSL_EXPORT_KEYLENGTH(alg);
- exp=is_export?" export":"";
+ exp=is_export?" export":"";
if (alg & SSL_SSLV2)
ver="SSLv2";
@@ -640,7 +640,7 @@
switch (alg&SSL_MKEY_MASK)
{
case SSL_kRSA:
- kx=is_export?(pkl == 512 ? "RSA(512)" : "RSA(1024)"):"RSA";
+ kx=is_export?(pkl == 512 ? "RSA(512)" : "RSA(1024)"):"RSA";
break;
case SSL_kDHr:
kx="DH/RSA";
@@ -652,7 +652,7 @@
kx="Fortezza";
break;
case SSL_kEDH:
- kx=is_export?(pkl == 512 ? "DH(512)" : "DH(1024)"):"DH";
+ kx=is_export?(pkl == 512 ? "DH(512)" : "DH(1024)"):"DH";
break;
default:
kx="unknown";
@@ -681,17 +681,17 @@
switch (alg&SSL_ENC_MASK)
{
case SSL_DES:
- enc=(is_export && kl == 5)?"DES(40)":"DES(56)";
+ enc=(is_export && kl == 5)?"DES(40)":"DES(56)";
break;
case SSL_3DES:
enc="3DES(168)";
break;
case SSL_RC4:
- enc=is_export?(kl == 5 ? "RC4(40)" : "RC4(56)")
+ enc=is_export?(kl == 5 ? "RC4(40)" : "RC4(56)")
:((alg2&SSL2_CF_8_BYTE_ENC)?"RC4(64)":"RC4(128)");
break;
case SSL_RC2:
- enc=is_export?(kl == 5 ? "RC2(40)" : "RC2(56)"):"RC2(128)";
+ enc=is_export?(kl == 5 ? "RC2(40)" : "RC2(56)"):"RC2(128)";
break;
case SSL_IDEA:
enc="IDEA(128)";
Index: ssl/ssl_sess.c
===================================================================
RCS file: /src/packages/openssl/repository//openssl/ssl/ssl_sess.c,v
retrieving revision 1.4
diff -u -r1.4 ssl_sess.c
--- ssl/ssl_sess.c 1999/02/21 20:03:24 1.4
+++ ssl/ssl_sess.c 1999/03/08 16:20:39
@@ -241,7 +241,7 @@
if (ret->cipher == NULL)
{
- char buf[5],*p;
+ unsigned char buf[5],*p;
unsigned long l;
p=buf;
--
Richard Levitte \ Spannv�gen 38, II \ [EMAIL PROTECTED]
Redakteur@Stacken \ S-161 43 BROMMA \ T: +46-8-26 52 47
\ SWEDEN \ or +46-708-26 53 44
Procurator Odiosus Ex Infernis -- [EMAIL PROTECTED]
Unsolicited commercial email is subject to an archival fee of $400.
See <http://www.stacken.kth.se/~levitte/mail/> for more info.
______________________________________________________________________
OpenSSL Project http://www.openssl.org
Development Mailing List [EMAIL PROTECTED]
Automated List Manager [EMAIL PROTECTED]
