A couple of functions are prototyped static but not declared as such.

And there are a few places where variables are "unsigned char *" when
they should be "char *" or vice versa, causing warnings from the compiler.
One warning in evp_pbe.c was caused by a needless EVIL cast! ;)

BTW, function PKCS12_decrypt_d2i in file p12_decr.c returns char *.
The actual value returned is either a char * from d2i() or a STACK *
returned from d2i_ASN1_SET() and cast to char *.  Is that right?
It seems strange to return such dissimilar structures.


Index: crypto/evp/e_cbc_r2.c
===================================================================
RCS file: /CVS/openssl/crypto/evp/e_cbc_r2.c,v
retrieving revision 1.1.1.3
diff -C1 -r1.1.1.3 e_cbc_r2.c
*** e_cbc_r2.c  1998/12/21 10:59:23     1.1.1.3
--- e_cbc_r2.c  1999/04/16 15:01:59
***************
*** 194,196 ****
  
! int rc2_get_asn1_type_and_iv(c,type)
  EVP_CIPHER_CTX *c;
--- 194,196 ----
  
! static int rc2_get_asn1_type_and_iv(c,type)
  EVP_CIPHER_CTX *c;

Index: crypto/x509v3/v3_skey.c
===================================================================
RCS file: /CVS/openssl/crypto/x509v3/v3_skey.c,v
retrieving revision 1.4
diff -C1 -r1.4 v3_skey.c
*** v3_skey.c   1999/03/14 13:31:42     1.4
--- v3_skey.c   1999/04/16 15:13:44
***************
*** 117,119 ****
  
! ASN1_OCTET_STRING *s2i_skey_id(method, ctx, str)
  X509V3_EXT_METHOD *method;
--- 117,119 ----
  
! static ASN1_OCTET_STRING *s2i_skey_id(method, ctx, str)
  X509V3_EXT_METHOD *method;

Index: crypto/asn1/asn_pack.c
===================================================================
RCS file: /CVS/openssl/crypto/asn1/asn_pack.c,v
retrieving revision 1.1
diff -C1 -r1.1 asn_pack.c
*** asn_pack.c  1999/03/28 17:46:01     1.1
--- asn_pack.c  1999/04/16 15:09:10
***************
*** 116,118 ****
  {
!       unsigned char *p, *ret;
        p = oct->data;
--- 116,119 ----
  {
!       unsigned char *p;
!       char *ret;
        p = oct->data;

Index: crypto/evp/evp_pbe.c
===================================================================
RCS file: /CVS/openssl/crypto/evp/evp_pbe.c,v
retrieving revision 1.2
diff -C1 -r1.2 evp_pbe.c
*** evp_pbe.c   1999/03/29 17:50:16     1.2
--- evp_pbe.c   1999/04/16 15:07:32
***************
*** 126,128 ****
        /* Extract useful info from algor */
!       pbuf = (char *) algor->parameter->value.sequence->data;
        if (!(pbe = d2i_PBEPARAM (NULL, &pbuf,
--- 126,128 ----
        /* Extract useful info from algor */
!       pbuf = algor->parameter->value.sequence->data;
        if (!(pbe = d2i_PBEPARAM (NULL, &pbuf,

Index: crypto/pkcs12/p12_decr.c
===================================================================
RCS file: /CVS/openssl/crypto/pkcs12/p12_decr.c,v
retrieving revision 1.2
diff -C1 -r1.2 p12_decr.c
*** p12_decr.c  1999/03/29 17:50:18     1.2
--- p12_decr.c  1999/04/16 15:20:59
***************
*** 124,126 ****
  {
!       unsigned char *out, *p, *ret;
        int outlen;
--- 124,127 ----
  {
!       unsigned char *out, *p;
!       char *ret;
        int outlen;

Index: ssl/ssl_sess.c
===================================================================
RCS file: /CVS/openssl/ssl/ssl_sess.c,v
retrieving revision 1.7
diff -C1 -r1.7 ssl_sess.c
*** ssl_sess.c  1999/04/12 17:23:47     1.7
--- ssl_sess.c  1999/04/16 15:36:21
***************
*** 253,255 ****
                {
!               char buf[5],*p;
                unsigned long l;
--- 253,255 ----
                {
!               unsigned char buf[5],*p;
                unsigned long l;
______________________________________________________________________
OpenSSL Project                                 http://www.openssl.org
Development Mailing List                       [EMAIL PROTECTED]
Automated List Manager                           [EMAIL PROTECTED]

Reply via email to