OpenSSL CVS Repository
http://cvs.openssl.org/
____________________________________________________________
________________
Server: cvs.openssl.org Name: Geoff
Thorpe
Root: /v/openssl/cvs Email: geoff openssl.org
Module: openssl Date:
16-Mar-2008 22:05:47
Branch: HEAD Handle:
2008031621053511
Modified files:
openssl/apps ocsp.c s_client.c ts.c
openssl/crypto/asn1 a_object.c
openssl/crypto/bio bss_mem.c
openssl/crypto/cms cms_asn1.c cms_dd.c cms_enc.c
cms_env.c cms_lib.c
cms_sd.c
openssl/crypto/dh dh_ameth.c dh_pmeth.c
openssl/crypto/dsa dsa_ameth.c dsa_pmeth.c
openssl/crypto/ec ec_ameth.c eck_prn.c
openssl/crypto/engine tb_asnmth.c tb_pkmeth.c
openssl/crypto/evp e_rc2.c pmeth_gn.c
openssl/crypto/objects obj_dat.c
openssl/crypto/pem pvkfmt.c
openssl/crypto/rsa rsa_ameth.c rsa_pmeth.c
openssl/crypto/ts ts_conf.c
openssl/engines/ccgost gost_ameth.c gost_ctl.c
gost_eng.c
openssl/ssl d1_clnt.c d1_srvr.c t1_lib.c
openssl/test igetest.c
Log:
Fix a variety of warnings generated by some elevated
compiler-fascism,
OPENSSL_NO_DEPRECATED, etc. Steve, please double-check
the CMS stuff...
Summary:
Revision Changes Path
1.50 +3 -0 openssl/apps/ocsp.c
1.111 +1 -0 openssl/apps/s_client.c
1.5 +1 -0 openssl/apps/ts.c
1.25 +1 -0 openssl/crypto/asn1/a_object.c
1.15 +1 -1 openssl/crypto/bio/bss_mem.c
1.5 +1 -1 openssl/crypto/cms/cms_asn1.c
1.3 +1 -1 openssl/crypto/cms/cms_dd.c
1.8 +2 -2 openssl/crypto/cms/cms_enc.c
1.4 +2 -1 openssl/crypto/cms/cms_env.c
1.6 +2 -2 openssl/crypto/cms/cms_lib.c
1.3 +4 -4 openssl/crypto/cms/cms_sd.c
1.13 +1 -0 openssl/crypto/dh/dh_ameth.c
1.8 +2 -0 openssl/crypto/dh/dh_pmeth.c
1.24 +1 -0 openssl/crypto/dsa/dsa_ameth.c
1.11 +1 -0 openssl/crypto/dsa/dsa_pmeth.c
1.18 +1 -0 openssl/crypto/ec/ec_ameth.c
1.3 +1 -0 openssl/crypto/ec/eck_prn.c
1.6 +1 -0
openssl/crypto/engine/tb_asnmth.c
1.4 +1 -0
openssl/crypto/engine/tb_pkmeth.c
1.13 +1 -1 openssl/crypto/evp/e_rc2.c
1.5 +1 -0 openssl/crypto/evp/pmeth_gn.c
1.42 +1 -0
openssl/crypto/objects/obj_dat.c
1.4 +3 -0 openssl/crypto/pem/pvkfmt.c
1.16 +1 -0 openssl/crypto/rsa/rsa_ameth.c
1.32 +1 -0 openssl/crypto/rsa/rsa_pmeth.c
1.2 +2 -0 openssl/crypto/ts/ts_conf.c
1.9 +3 -1
openssl/engines/ccgost/gost_ameth.c
1.4 +2 -0
openssl/engines/ccgost/gost_ctl.c
1.10 +2 -0
openssl/engines/ccgost/gost_eng.c
1.15 +1 -0 openssl/ssl/d1_clnt.c
1.19 +1 -0 openssl/ssl/d1_srvr.c
1.52 +5 -2 openssl/ssl/t1_lib.c
1.6 +2 -2 openssl/test/igetest.c
____________________________________________________________
________________
patch -p0 <<' .'
Index: openssl/apps/ocsp.c
============================================================
================
$ cvs diff -u -r1.49 -r1.50 ocsp.c
--- openssl/apps/ocsp.c 5 Jan 2008 21:32:29 -0000 1.49
+++ openssl/apps/ocsp.c 16 Mar 2008 21:05:35 -0000 1.50
-63,8 +63,11
#include <time.h>
#include "apps.h" /* needs to be included
before the openssl headers! */
#include <openssl/e_os2.h>
+#include <openssl/crypto.h>
+#include <openssl/err.h>
#include <openssl/ssl.h>
#include <openssl/evp.h>
+#include <openssl/bn.h>
#if defined(NETWARE_CLIB)
# ifdef NETWARE_BSDSOCK
.
patch -p0 <<' .'
Index: openssl/apps/s_client.c
============================================================
================
$ cvs diff -u -r1.110 -r1.111 s_client.c
--- openssl/apps/s_client.c 26 Oct 2007 12:06:31
-0000 1.110
+++ openssl/apps/s_client.c 16 Mar 2008 21:05:35
-0000 1.111
-162,6 +162,7
#include <openssl/pem.h>
#include <openssl/rand.h>
#include <openssl/ocsp.h>
+#include <openssl/bn.h>
#include "s_apps.h"
#include "timeouts.h"
.
patch -p0 <<' .'
Index: openssl/apps/ts.c
============================================================
================
$ cvs diff -u -r1.4 -r1.5 ts.c
--- openssl/apps/ts.c 18 Mar 2006 14:27:41 -0000 1.4
+++ openssl/apps/ts.c 16 Mar 2008 21:05:35 -0000 1.5
-65,6 +65,7
#include <openssl/pem.h>
#include <openssl/rand.h>
#include <openssl/ts.h>
+#include <openssl/bn.h>
#undef PROG
#define PROG ts_main
.
patch -p0 <<' .'
Index: openssl/crypto/asn1/a_object.c
============================================================
================
$ cvs diff -u -r1.24 -r1.25 a_object.c
--- openssl/crypto/asn1/a_object.c 18 Sep 2007 22:15:22
-0000 1.24
+++ openssl/crypto/asn1/a_object.c 16 Mar 2008 21:05:36
-0000 1.25
-62,6 +62,7
#include <openssl/buffer.h>
#include <openssl/asn1.h>
#include <openssl/objects.h>
+#include <openssl/bn.h>
int i2d_ASN1_OBJECT(ASN1_OBJECT *a, unsigned char **pp)
{
.
patch -p0 <<' .'
Index: openssl/crypto/bio/bss_mem.c
============================================================
================
$ cvs diff -u -r1.14 -r1.15 bss_mem.c
--- openssl/crypto/bio/bss_mem.c 13 Oct 2007 15:51:29
-0000 1.14
+++ openssl/crypto/bio/bss_mem.c 16 Mar 2008 21:05:36
-0000 1.15
-100,7 +100,7
BIOerr(BIO_F_BIO_NEW_MEM_BUF,BIO_R_NULL_PARAMETER);
return NULL;
}
- sz = (len<0) ? strlen(buf) : len;
+ sz = (len<0) ? strlen(buf) : (size_t)len;
if(!(ret = BIO_new(BIO_s_mem())) ) return NULL;
b = (BUF_MEM *)ret->ptr;
b->data = buf;
.
patch -p0 <<' .'
Index: openssl/crypto/cms/cms_asn1.c
============================================================
================
$ cvs diff -u -r1.4 -r1.5 cms_asn1.c
--- openssl/crypto/cms/cms_asn1.c 16 Mar 2008 20:59:09
-0000 1.4
+++ openssl/crypto/cms/cms_asn1.c 16 Mar 2008 21:05:37
-0000 1.5
-306,7 +306,7
void *exarg)
{
ASN1_STREAM_ARG *sarg = exarg;
- CMS_ContentInfo *cms;
+ CMS_ContentInfo *cms = NULL;
if (pval)
cms = (CMS_ContentInfo *)*pval;
else
.
patch -p0 <<' .'
Index: openssl/crypto/cms/cms_dd.c
============================================================
================
$ cvs diff -u -r1.2 -r1.3 cms_dd.c
--- openssl/crypto/cms/cms_dd.c 15 Mar 2008 23:21:31
-0000 1.2
+++ openssl/crypto/cms/cms_dd.c 16 Mar 2008 21:05:37
-0000 1.3
-121,7 +121,7
if (verify)
{
- if (mdlen != dd->digest->length)
+ if (mdlen != (unsigned int)dd->digest->length)
{
CMSerr(CMS_F_CMS_DIGESTEDDATA_DO_FINAL,
CMS_R_MESSAGEDIGEST_WRONG_LENGTH);
.
patch -p0 <<' .'
Index: openssl/crypto/cms/cms_enc.c
============================================================
================
$ cvs diff -u -r1.7 -r1.8 cms_enc.c
--- openssl/crypto/cms/cms_enc.c 16 Mar 2008 13:05:03
-0000 1.7
+++ openssl/crypto/cms/cms_enc.c 16 Mar 2008 21:05:37
-0000 1.8
-151,7 +151,7
goto err;
keep_key = 1;
}
- else if (ec->keylen !=
EVP_CIPHER_CTX_key_length(ctx))
+ else if (ec->keylen != (unsigned
int)EVP_CIPHER_CTX_key_length(ctx))
{
/* If necessary set key length */
if (EVP_CIPHER_CTX_set_key_length(ctx, ec->keylen)
<= 0)
-200,7 +200,7
return NULL;
}
-int cms_EncryptedContent_init(CMS_EncryptedContentInfo
*ec,
+static int
cms_EncryptedContent_init(CMS_EncryptedContentInfo *ec,
const EVP_CIPHER *cipher,
const unsigned char *key, size_t keylen)
{
.
patch -p0 <<' .'
Index: openssl/crypto/cms/cms_env.c
============================================================
================
$ cvs diff -u -r1.3 -r1.4 cms_env.c
--- openssl/crypto/cms/cms_env.c 15 Mar 2008 23:21:31
-0000 1.3
+++ openssl/crypto/cms/cms_env.c 16 Mar 2008 21:05:37
-0000 1.4
-118,7 +118,7
/* Add a recipient certificate. For now only handle key
transport.
* If we ever handle key agreement will need updating.
*/
-
+#if 0 /* currently unused/undeclared */
CMS_RecipientInfo
*CMS_add1_recipient_cert(CMS_ContentInfo *cms,
X509 *recip, unsigned int flags)
{
-208,6 +208,7
return NULL;
}
+#endif
int CMS_RecipientInfo_ktri_get0_algs(CMS_RecipientInfo
*ri,
EVP_PKEY **pk, X509 **recip,
.
patch -p0 <<' .'
Index: openssl/crypto/cms/cms_lib.c
============================================================
================
$ cvs diff -u -r1.5 -r1.6 cms_lib.c
--- openssl/crypto/cms/cms_lib.c 15 Mar 2008 23:21:31
-0000 1.5
+++ openssl/crypto/cms/cms_lib.c 16 Mar 2008 21:05:37
-0000 1.6
-414,7 +414,7
}
}
-STACK_OF(CMS_CertificateChoices)
**cms_get0_certificate_choices(CMS_ContentInfo *cms)
+static STACK_OF(CMS_CertificateChoices)
**cms_get0_certificate_choices(CMS_ContentInfo *cms)
{
switch (OBJ_obj2nid(cms->contentType))
{
-492,7 +492,7
return r;
}
-STACK_OF(CMS_RevocationInfoChoice)
**cms_get0_revocation_choices(CMS_ContentInfo *cms)
+static STACK_OF(CMS_RevocationInfoChoice)
**cms_get0_revocation_choices(CMS_ContentInfo *cms)
{
switch (OBJ_obj2nid(cms->contentType))
{
.
patch -p0 <<' .'
Index: openssl/crypto/cms/cms_sd.c
============================================================
================
$ cvs diff -u -r1.2 -r1.3 cms_sd.c
--- openssl/crypto/cms/cms_sd.c 15 Mar 2008 23:21:31
-0000 1.2
+++ openssl/crypto/cms/cms_sd.c 16 Mar 2008 21:05:37
-0000 1.3
-451,7 +451,7
}
-int CMS_add1_signingTime(CMS_SignerInfo *si, ASN1_TIME
*t)
+static int cms_add1_signingTime(CMS_SignerInfo *si,
ASN1_TIME *t)
{
ASN1_TIME *tt;
int r = 0;
-608,7 +608,7
*psig = si->signatureAlgorithm;
}
-int cms_SignerInfo_content_sign(CMS_SignerInfo *si, BIO
*chain)
+static int cms_SignerInfo_content_sign(CMS_SignerInfo
*si, BIO *chain)
{
EVP_MD_CTX mctx;
int r = 0;
-699,7 +699,7
if (CMS_signed_get_attr_by_NID(si,
NID_pkcs9_signingTime, -1) < 0)
{
- if (!CMS_add1_signingTime(si, NULL))
+ if (!cms_add1_signingTime(si, NULL))
goto err;
}
-856,7 +856,7
CMS_R_UNABLE_TO_FINALIZE_CONTEXT);
goto err;
}
- if (mlen != os->length)
+ if (mlen != (unsigned int)os->length)
{
CMSerr(CMS_F_CMS_SIGNERINFO_VERIFY_CONTENT,
CMS_R_MESSAGEDIGEST_ATTRIBUTE_WRONG_LENGTH);
.
patch -p0 <<' .'
Index: openssl/crypto/dh/dh_ameth.c
============================================================
================
$ cvs diff -u -r1.12 -r1.13 dh_ameth.c
--- openssl/crypto/dh/dh_ameth.c 2 Apr 2007 20:29:39
-0000 1.12
+++ openssl/crypto/dh/dh_ameth.c 16 Mar 2008 21:05:38
-0000 1.13
-60,6 +60,7
#include <openssl/x509.h>
#include <openssl/asn1.h>
#include <openssl/dh.h>
+#include <openssl/bn.h>
#include "asn1_locl.h"
static void int_dh_free(EVP_PKEY *pkey)
.
patch -p0 <<' .'
Index: openssl/crypto/dh/dh_pmeth.c
============================================================
================
$ cvs diff -u -r1.7 -r1.8 dh_pmeth.c
--- openssl/crypto/dh/dh_pmeth.c 24 May 2006 23:49:24
-0000 1.7
+++ openssl/crypto/dh/dh_pmeth.c 16 Mar 2008 21:05:38
-0000 1.8
-61,6 +61,8
#include <openssl/x509.h>
#include <openssl/rsa.h>
#include <openssl/evp.h>
+#include <openssl/dh.h>
+#include <openssl/bn.h>
#include "evp_locl.h"
/* DH pkey context structure */
.
patch -p0 <<' .'
Index: openssl/crypto/dsa/dsa_ameth.c
============================================================
================
$ cvs diff -u -r1.23 -r1.24 dsa_ameth.c
--- openssl/crypto/dsa/dsa_ameth.c 12 Mar 2008 21:14:22
-0000 1.23
+++ openssl/crypto/dsa/dsa_ameth.c 16 Mar 2008 21:05:39
-0000 1.24
-60,6 +60,7
#include <openssl/x509.h>
#include <openssl/asn1.h>
#include <openssl/dsa.h>
+#include <openssl/bn.h>
#ifndef OPENSSL_NO_CMS
#include <openssl/cms.h>
#endif
.
patch -p0 <<' .'
Index: openssl/crypto/dsa/dsa_pmeth.c
============================================================
================
$ cvs diff -u -r1.10 -r1.11 dsa_pmeth.c
--- openssl/crypto/dsa/dsa_pmeth.c 12 Mar 2008 21:14:22
-0000 1.10
+++ openssl/crypto/dsa/dsa_pmeth.c 16 Mar 2008 21:05:39
-0000 1.11
-60,6 +60,7
#include <openssl/asn1t.h>
#include <openssl/x509.h>
#include <openssl/evp.h>
+#include <openssl/bn.h>
#include "evp_locl.h"
#include "dsa_locl.h"
.
patch -p0 <<' .'
Index: openssl/crypto/ec/ec_ameth.c
============================================================
================
$ cvs diff -u -r1.17 -r1.18 ec_ameth.c
--- openssl/crypto/ec/ec_ameth.c 12 Mar 2008 21:14:23
-0000 1.17
+++ openssl/crypto/ec/ec_ameth.c 16 Mar 2008 21:05:40
-0000 1.18
-59,6 +59,7
#include "cryptlib.h"
#include <openssl/x509.h>
#include <openssl/ec.h>
+#include <openssl/bn.h>
#ifndef OPENSSL_NO_CMS
#include <openssl/cms.h>
#endif
.
patch -p0 <<' .'
Index: openssl/crypto/ec/eck_prn.c
============================================================
================
$ cvs diff -u -r1.2 -r1.3 eck_prn.c
--- openssl/crypto/ec/eck_prn.c 24 Apr 2006 00:07:26
-0000 1.2
+++ openssl/crypto/ec/eck_prn.c 16 Mar 2008 21:05:40
-0000 1.3
-65,6 +65,7
#include "cryptlib.h"
#include <openssl/evp.h>
#include <openssl/ec.h>
+#include <openssl/bn.h>
#ifndef OPENSSL_NO_FP_API
int ECPKParameters_print_fp(FILE *fp, const EC_GROUP *x,
int off)
.
patch -p0 <<' .'
Index: openssl/crypto/engine/tb_asnmth.c
============================================================
================
$ cvs diff -u -r1.5 -r1.6 tb_asnmth.c
--- openssl/crypto/engine/tb_asnmth.c 21 Nov 2007 17:25:58
-0000 1.5
+++ openssl/crypto/engine/tb_asnmth.c 16 Mar 2008 21:05:40
-0000 1.6
-54,6 +54,7
#include "eng_int.h"
#include "asn1_locl.h"
+#include <openssl/evp.h>
/* If this symbol is defined then
ENGINE_get_pkey_asn1_meth_engine(), the
* function that is used by EVP to hook in pkey_asn1_meth
code and cache
.
patch -p0 <<' .'
Index: openssl/crypto/engine/tb_pkmeth.c
============================================================
================
$ cvs diff -u -r1.3 -r1.4 tb_pkmeth.c
--- openssl/crypto/engine/tb_pkmeth.c 2 Jun 2006 17:09:17
-0000 1.3
+++ openssl/crypto/engine/tb_pkmeth.c 16 Mar 2008 21:05:40
-0000 1.4
-53,6 +53,7
*/
#include "eng_int.h"
+#include <openssl/evp.h>
/* If this symbol is defined then
ENGINE_get_pkey_meth_engine(), the function
* that is used by EVP to hook in pkey_meth code and
cache defaults (etc), will
.
patch -p0 <<' .'
Index: openssl/crypto/evp/e_rc2.c
============================================================
================
$ cvs diff -u -r1.12 -r1.13 e_rc2.c
--- openssl/crypto/evp/e_rc2.c 15 May 2006 18:35:13
-0000 1.12
+++ openssl/crypto/evp/e_rc2.c 16 Mar 2008 21:05:41
-0000 1.13
-223,7 +223,7
return 1;
}
return 0;
-#if PBE_PRF_TEST
+#ifdef PBE_PRF_TEST
case EVP_CTRL_PBE_PRF_NID:
*(int *)ptr = NID_hmacWithMD5;
return 1;
.
patch -p0 <<' .'
Index: openssl/crypto/evp/pmeth_gn.c
============================================================
================
$ cvs diff -u -r1.4 -r1.5 pmeth_gn.c
--- openssl/crypto/evp/pmeth_gn.c 11 Apr 2007 17:20:40
-0000 1.4
+++ openssl/crypto/evp/pmeth_gn.c 16 Mar 2008 21:05:41
-0000 1.5
-61,6 +61,7
#include "cryptlib.h"
#include <openssl/objects.h>
#include <openssl/evp.h>
+#include <openssl/bn.h>
#include "evp_locl.h"
int EVP_PKEY_paramgen_init(EVP_PKEY_CTX *ctx)
.
patch -p0 <<' .'
Index: openssl/crypto/objects/obj_dat.c
============================================================
================
$ cvs diff -u -r1.41 -r1.42 obj_dat.c
--- openssl/crypto/objects/obj_dat.c 18 Sep 2007 21:05:19
-0000 1.41
+++ openssl/crypto/objects/obj_dat.c 16 Mar 2008 21:05:42
-0000 1.42
-63,6 +63,7
#include <openssl/lhash.h>
#include <openssl/asn1.h>
#include <openssl/objects.h>
+#include <openssl/bn.h>
/* obj_dat.h is generated from objects.h by obj_dat.pl
*/
#ifndef OPENSSL_NO_OBJECT
.
patch -p0 <<' .'
Index: openssl/crypto/pem/pvkfmt.c
============================================================
================
$ cvs diff -u -r1.3 -r1.4 pvkfmt.c
--- openssl/crypto/pem/pvkfmt.c 24 May 2006 13:29:30
-0000 1.3
+++ openssl/crypto/pem/pvkfmt.c 16 Mar 2008 21:05:42
-0000 1.4
-62,6 +62,9
#include "cryptlib.h"
#include <openssl/pem.h>
#include <openssl/rand.h>
+#include <openssl/bn.h>
+#include <openssl/dsa.h>
+#include <openssl/rsa.h>
/* Utility function: read a DWORD (4 byte unsigned
integer) in little endian
* format
.
patch -p0 <<' .'
Index: openssl/crypto/rsa/rsa_ameth.c
============================================================
================
$ cvs diff -u -r1.15 -r1.16 rsa_ameth.c
--- openssl/crypto/rsa/rsa_ameth.c 15 Mar 2008 23:21:32
-0000 1.15
+++ openssl/crypto/rsa/rsa_ameth.c 16 Mar 2008 21:05:43
-0000 1.16
-61,6 +61,7
#include <openssl/asn1t.h>
#include <openssl/x509.h>
#include <openssl/rsa.h>
+#include <openssl/bn.h>
#ifndef OPENSSL_NO_CMS
#include <openssl/cms.h>
#endif
.
patch -p0 <<' .'
Index: openssl/crypto/rsa/rsa_pmeth.c
============================================================
================
$ cvs diff -u -r1.31 -r1.32 rsa_pmeth.c
--- openssl/crypto/rsa/rsa_pmeth.c 15 Mar 2008 23:21:33
-0000 1.31
+++ openssl/crypto/rsa/rsa_pmeth.c 16 Mar 2008 21:05:43
-0000 1.32
-61,6 +61,7
#include <openssl/asn1t.h>
#include <openssl/x509.h>
#include <openssl/rsa.h>
+#include <openssl/bn.h>
#include <openssl/evp.h>
#include "evp_locl.h"
#include "rsa_locl.h"
.
patch -p0 <<' .'
Index: openssl/crypto/ts/ts_conf.c
============================================================
================
$ cvs diff -u -r1.1 -r1.2 ts_conf.c
--- openssl/crypto/ts/ts_conf.c 12 Feb 2006 23:11:39
-0000 1.1
+++ openssl/crypto/ts/ts_conf.c 16 Mar 2008 21:05:44
-0000 1.2
-58,6 +58,8
#include <string.h>
+#include <openssl/crypto.h>
+#include "cryptlib.h"
#include <openssl/pem.h>
#include <openssl/engine.h>
#include <openssl/ts.h>
.
patch -p0 <<' .'
Index: openssl/engines/ccgost/gost_ameth.c
============================================================
================
$ cvs diff -u -r1.8 -r1.9 gost_ameth.c
--- openssl/engines/ccgost/gost_ameth.c 28 Feb 2008
13:45:05 -0000 1.8
+++ openssl/engines/ccgost/gost_ameth.c 16 Mar 2008
21:05:44 -0000 1.9
-7,10 +7,12
* for OpenSSL
*
* Requires OpenSSL 0.9.9 for compilation
*
************************************************************
**********/
+#include <string.h>
+#include <openssl/crypto.h>
+#include <openssl/err.h>
#include <openssl/engine.h>
#include <openssl/evp.h>
#include <openssl/asn1.h>
-#include <string.h>
#include "gost_params.h"
#include "gost_lcl.h"
#include "e_gost_err.h"
.
patch -p0 <<' .'
Index: openssl/engines/ccgost/gost_ctl.c
============================================================
================
$ cvs diff -u -r1.3 -r1.4 gost_ctl.c
--- openssl/engines/ccgost/gost_ctl.c 26 Oct 2007 12:06:33
-0000 1.3
+++ openssl/engines/ccgost/gost_ctl.c 16 Mar 2008 21:05:44
-0000 1.4
-8,6 +8,8
************************************************************
**********/
#include <stdlib.h>
#include <string.h>
+#include <openssl/crypto.h>
+#include <openssl/err.h>
#include <openssl/engine.h>
#include <openssl/buffer.h>
#include "gost_lcl.h"
.
patch -p0 <<' .'
Index: openssl/engines/ccgost/gost_eng.c
============================================================
================
$ cvs diff -u -r1.9 -r1.10 gost_eng.c
--- openssl/engines/ccgost/gost_eng.c 26 Oct 2007 12:06:33
-0000 1.9
+++ openssl/engines/ccgost/gost_eng.c 16 Mar 2008 21:05:44
-0000 1.10
-8,6 +8,8
* Requires OpenSSL 0.9.9 for compilation
*
************************************************************
**********/
#include <string.h>
+#include <openssl/crypto.h>
+#include <openssl/err.h>
#include <openssl/evp.h>
#include <openssl/engine.h>
#include <openssl/obj_mac.h>
.
patch -p0 <<' .'
Index: openssl/ssl/d1_clnt.c
============================================================
================
$ cvs diff -u -r1.14 -r1.15 d1_clnt.c
--- openssl/ssl/d1_clnt.c 30 Sep 2007 19:34:36 -0000 1.14
+++ openssl/ssl/d1_clnt.c 16 Mar 2008 21:05:45 -0000 1.15
-120,6 +120,7
#include <openssl/objects.h>
#include <openssl/evp.h>
#include <openssl/md5.h>
+#include <openssl/bn.h>
#ifndef OPENSSL_NO_DH
#include <openssl/dh.h>
#endif
.
patch -p0 <<' .'
Index: openssl/ssl/d1_srvr.c
============================================================
================
$ cvs diff -u -r1.18 -r1.19 d1_srvr.c
--- openssl/ssl/d1_srvr.c 9 Oct 2007 19:31:18 -0000 1.18
+++ openssl/ssl/d1_srvr.c 16 Mar 2008 21:05:45 -0000 1.19
-121,6 +121,7
#include <openssl/evp.h>
#include <openssl/x509.h>
#include <openssl/md5.h>
+#include <openssl/bn.h>
#ifndef OPENSSL_NO_DH
#include <openssl/dh.h>
#endif
.
patch -p0 <<' .'
Index: openssl/ssl/t1_lib.c
============================================================
================
$ cvs diff -u -r1.51 -r1.52 t1_lib.c
--- openssl/ssl/t1_lib.c 26 Oct 2007 12:06:35 -0000 1.51
+++ openssl/ssl/t1_lib.c 16 Mar 2008 21:05:45 -0000 1.52
-196,7 +196,9
int tls1_ec_curve_id2nid(int curve_id)
{
/* ECC curves from draft-ietf-tls-ecc-12.txt (Oct. 17,
2005) */
- if ((curve_id < 1) || (curve_id >
sizeof(nid_list)/sizeof(nid_list[0]))) return 0;
+ if ((curve_id < 1) || ((unsigned int)curve_id >
+ sizeof(nid_list)/sizeof(nid_list[0])))
+ return 0;
return nid_list[curve_id-1];
}
-1058,7 +1060,8
SSLerr(SSL_F_SSL_PREPARE_CLIENTHELLO_TLSEXT,ERR_R_MALLOC_
FAILURE);
return -1;
}
- for (i = 1, j = s->tlsext_ellipticcurvelist; i <=
sizeof(nid_list)/sizeof(nid_list[0]); i++)
+ for (i = 1, j = s->tlsext_ellipticcurvelist;
(unsigned int)i <=
+ sizeof(nid_list)/sizeof(nid_list[0]); i++)
s2n(i,j);
}
#endif /* OPENSSL_NO_EC */
.
patch -p0 <<' .'
Index: openssl/test/igetest.c
============================================================
================
$ cvs diff -u -r1.5 -r1.6 igetest.c
--- openssl/test/igetest.c 15 May 2007 23:50:55 -0000 1.5
+++ openssl/test/igetest.c 16 Mar 2008 21:05:46 -0000 1.6
-190,7 +190,7
static int run_test_vectors(void)
{
- int n;
+ unsigned int n;
int errs = 0;
for(n=0 ; n <
sizeof(ige_test_vectors)/sizeof(ige_test_vectors[0]) ; ++n)
-292,7 +292,7
unsigned char iv[AES_BLOCK_SIZE*4];
unsigned char saved_iv[AES_BLOCK_SIZE*4];
int err = 0;
- int n;
+ unsigned int n;
unsigned matches;
assert(BIG_TEST_SIZE >= TEST_SIZE);
.
____________________________________________________________
__________
OpenSSL Project http://www.openssl.org
CVS Repository Commit List
openssl-cvsopenssl.org
Automated List Manager
majordomoopenssl.org
|
