OpenSSL CVS Repository
http://cvs.openssl.org/
____________________________________________________________
________________
Server: cvs.openssl.org Name: Dr.
Stephen Henson
Root: /v/openssl/cvs Email: steve openssl.org
Module: openssl Date:
17-Apr-2006 14:08:22
Branch: HEAD Handle:
2006041713081705
Modified files:
openssl/crypto/asn1 Makefile ameth_lib.c
openssl/crypto/dh dh_ameth.c
openssl/crypto/dsa dsa_ameth.c
openssl/crypto/evp Makefile pmeth_fn.c pmeth_gn.c
pmeth_lib.c
openssl/crypto/rsa rsa_ameth.c
openssl/ssl s3_lib.c
openssl/util libeay.num mkdef.pl ssleay.num
Log:
Fix (most) WIN32 warnings and errors.
Summary:
Revision Changes Path
1.12 +1 -1 openssl/crypto/asn1/Makefile
1.12 +1 -1 openssl/crypto/asn1/ameth_lib.c
1.10 +1 -1 openssl/crypto/dh/dh_ameth.c
1.13 +1 -1 openssl/crypto/dsa/dsa_ameth.c
1.13 +1 -1 openssl/crypto/evp/Makefile
1.8 +1 -1 openssl/crypto/evp/pmeth_fn.c
1.2 +1 -1 openssl/crypto/evp/pmeth_gn.c
1.18 +1 -1 openssl/crypto/evp/pmeth_lib.c
1.8 +1 -1 openssl/crypto/rsa/rsa_ameth.c
1.97 +2 -1 openssl/ssl/s3_lib.c
1.263 +72 -0 openssl/util/libeay.num
1.101 +6 -0 openssl/util/mkdef.pl
1.47 +6 -4 openssl/util/ssleay.num
____________________________________________________________
________________
patch -p0 <<' .'
Index: openssl/crypto/asn1/Makefile
============================================================
================
$ cvs diff -u -r1.11 -r1.12 Makefile
--- openssl/crypto/asn1/Makefile 8 Apr 2006 00:15:04
-0000 1.11
+++ openssl/crypto/asn1/Makefile 17 Apr 2006 12:08:17
-0000 1.12
-47,7 +47,7
SRC= $(LIBSRC)
EXHEADER= asn1.h asn1_mac.h asn1t.h
-HEADER= $(EXHEADER)
+HEADER= $(EXHEADER) asn1_locl.h
ALL= $(GENERAL) $(SRC) $(HEADER)
.
patch -p0 <<' .'
Index: openssl/crypto/asn1/ameth_lib.c
============================================================
================
$ cvs diff -u -r1.11 -r1.12 ameth_lib.c
--- openssl/crypto/asn1/ameth_lib.c 11 Apr 2006 13:28:51
-0000 1.11
+++ openssl/crypto/asn1/ameth_lib.c 17 Apr 2006 12:08:17
-0000 1.12
-167,7 +167,7
ameth = EVP_PKEY_asn1_get0(i);
if (ameth->pkey_flags & ASN1_PKEY_ALIAS)
continue;
- if ((strlen(ameth->pem_str) == len) &&
+ if (((int)strlen(ameth->pem_str) == len) &&
!strncasecmp(ameth->pem_str, str, len))
return ameth;
}
.
patch -p0 <<' .'
Index: openssl/crypto/dh/dh_ameth.c
============================================================
================
$ cvs diff -u -r1.9 -r1.10 dh_ameth.c
--- openssl/crypto/dh/dh_ameth.c 13 Apr 2006 20:16:53
-0000 1.9
+++ openssl/crypto/dh/dh_ameth.c 17 Apr 2006 12:08:17
-0000 1.10
-287,7 +287,7
static void update_buflen(const BIGNUM *b, size_t
*pbuflen)
{
- int i;
+ size_t i;
if (!b)
return;
if (*pbuflen < (i = (size_t)BN_num_bytes(b)))
.
patch -p0 <<' .'
Index: openssl/crypto/dsa/dsa_ameth.c
============================================================
================
$ cvs diff -u -r1.12 -r1.13 dsa_ameth.c
--- openssl/crypto/dsa/dsa_ameth.c 12 Apr 2006 23:38:45
-0000 1.12
+++ openssl/crypto/dsa/dsa_ameth.c 17 Apr 2006 12:08:18
-0000 1.13
-400,7 +400,7
static void update_buflen(const BIGNUM *b, size_t
*pbuflen)
{
- int i;
+ size_t i;
if (!b)
return;
if (*pbuflen < (i = (size_t)BN_num_bytes(b)))
.
patch -p0 <<' .'
Index: openssl/crypto/evp/Makefile
============================================================
================
$ cvs diff -u -r1.12 -r1.13 Makefile
--- openssl/crypto/evp/Makefile 13 Apr 2006 13:00:45
-0000 1.12
+++ openssl/crypto/evp/Makefile 17 Apr 2006 12:08:18
-0000 1.13
-45,7 +45,7
SRC= $(LIBSRC)
EXHEADER= evp.h
-HEADER= $(EXHEADER)
+HEADER= evp_locl.h $(EXHEADER)
ALL= $(GENERAL) $(SRC) $(HEADER)
.
patch -p0 <<' .'
Index: openssl/crypto/evp/pmeth_fn.c
============================================================
================
$ cvs diff -u -r1.7 -r1.8 pmeth_fn.c
--- openssl/crypto/evp/pmeth_fn.c 15 Apr 2006 18:50:56
-0000 1.7
+++ openssl/crypto/evp/pmeth_fn.c 17 Apr 2006 12:08:18
-0000 1.8
-58,8 +58,8
#include <stdio.h>
#include <stdlib.h>
-#include <openssl/objects.h>
#include "cryptlib.h"
+#include <openssl/objects.h>
#include <openssl/evp.h>
#include "evp_locl.h"
.
patch -p0 <<' .'
Index: openssl/crypto/evp/pmeth_gn.c
============================================================
================
$ cvs diff -u -r1.1 -r1.2 pmeth_gn.c
--- openssl/crypto/evp/pmeth_gn.c 11 Apr 2006 13:28:52
-0000 1.1
+++ openssl/crypto/evp/pmeth_gn.c 17 Apr 2006 12:08:18
-0000 1.2
-58,8 +58,8
#include <stdio.h>
#include <stdlib.h>
-#include <openssl/objects.h>
#include "cryptlib.h"
+#include <openssl/objects.h>
#include <openssl/evp.h>
#include "evp_locl.h"
.
patch -p0 <<' .'
Index: openssl/crypto/evp/pmeth_lib.c
============================================================
================
$ cvs diff -u -r1.17 -r1.18 pmeth_lib.c
--- openssl/crypto/evp/pmeth_lib.c 16 Apr 2006 16:15:59
-0000 1.17
+++ openssl/crypto/evp/pmeth_lib.c 17 Apr 2006 12:08:18
-0000 1.18
-58,8 +58,8
#include <stdio.h>
#include <stdlib.h>
-#include <openssl/objects.h>
#include "cryptlib.h"
+#include <openssl/objects.h>
#include <openssl/evp.h>
#include "asn1_locl.h"
#include "evp_locl.h"
.
patch -p0 <<' .'
Index: openssl/crypto/rsa/rsa_ameth.c
============================================================
================
$ cvs diff -u -r1.7 -r1.8 rsa_ameth.c
--- openssl/crypto/rsa/rsa_ameth.c 14 Apr 2006 17:36:18
-0000 1.7
+++ openssl/crypto/rsa/rsa_ameth.c 17 Apr 2006 12:08:19
-0000 1.8
-169,7 +169,7
static void update_buflen(const BIGNUM *b, size_t
*pbuflen)
{
- int i;
+ size_t i;
if (!b)
return;
if (*pbuflen < (i = (size_t)BN_num_bytes(b)))
.
patch -p0 <<' .'
Index: openssl/ssl/s3_lib.c
============================================================
================
$ cvs diff -u -r1.96 -r1.97 s3_lib.c
--- openssl/ssl/s3_lib.c 4 Apr 2006 18:11:49 -0000 1.96
+++ openssl/ssl/s3_lib.c 17 Apr 2006 12:08:20 -0000 1.97
-2043,7 +2043,8
{
SSL_CIPHER *c,*ret=NULL;
STACK_OF(SSL_CIPHER) *prio, *allow;
- int i,j,ok;
+ int i,ok;
+ unsigned int j;
#ifndef OPENSSL_NO_TLSEXT
#ifndef OPENSSL_NO_EC
int ec_ok, ec_nid;
.
patch -p0 <<' .'
Index: openssl/util/libeay.num
============================================================
================
$ cvs diff -u -r1.262 -r1.263 libeay.num
--- openssl/util/libeay.num 10 Mar 2006 23:08:31
-0000 1.262
+++ openssl/util/libeay.num 17 Apr 2006 12:08:20
-0000 1.263
-3611,3 +3611,75
TS_TST_INFO_get_ext_by_critical
4007 EXIST::FUNCTION:
TS_REQ_get_ext_by_OBJ
4008 EXIST::FUNCTION:
TS_CONF_set_signer_cert
4009 EXIST::FUNCTION:
+EVP_PKEY_print_public
4010 EXIST::FUNCTION:
+EVP_PKEY_CTX_new
4011 EXIST::FUNCTION:
+EVP_PKEY_asn1_find
4012 EXIST::FUNCTION:
+DSO_METHOD_beos
4013 EXIST::FUNCTION:
+EVP_PKEY_sign_init
4014 EXIST::FUNCTION:
+EVP_PKEY_asn1_add0
4015 EXIST::FUNCTION:
+EVP_PKEY_meth_set_decrypt
4016 EXIST::FUNCTION:
+EVP_PKEY_CTX_get_keygen_info
4017 EXIST::FUNCTION:
+EVP_PKEY_keygen
4018 EXIST::FUNCTION:
+EVP_PKEY_asn1_new
4019 EXIST::FUNCTION:
+EVP_PKEY_encrypt_old
4020 EXIST::FUNCTION:
+EVP_PKEY_encrypt_init
4021 EXIST::FUNCTION:
+EVP_PKEY_asn1_set_public
4022 EXIST::FUNCTION:
+EVP_PKEY_asn1_set_free
4023 EXIST::FUNCTION:
+EVP_PKEY_verify_recover_init
4024 EXIST::FUNCTION:
+EVP_PKEY_CTX_set_data
4025 EXIST::FUNCTION:
+EVP_PKEY_keygen_init
4026 EXIST::FUNCTION:
+EVP_PKEY_CTX_ctrl_str
4027 EXIST::FUNCTION:
+BN_asc2bn
4028 EXIST::FUNCTION:
+X509_ALGOR_get0
4029 EXIST::FUNCTION:
+EVP_PKEY_print_params
4030 EXIST::FUNCTION:
+X509_PUBKEY_set0_param
4031 EXIST::FUNCTION:
+X509_ALGOR_set0
4032 EXIST::FUNCTION:
+EVP_PKEY_CTX_get_data
4033 EXIST::FUNCTION:
+EVP_PKEY_derive_init
4034 EXIST::FUNCTION:
+EVP_PKEY_asn1_add_alias
4035 EXIST::FUNCTION:
+EVP_PKEY_CTX_ctrl
4036 EXIST::FUNCTION:
+EVP_PKEY_meth_set_ctrl
4037 EXIST::FUNCTION:
+EVP_PKEY_meth_set_sign
4038 EXIST::FUNCTION:
+EVP_PKEY_decrypt_init
4039 EXIST::FUNCTION:
+EVP_PKEY_print_private
4040 EXIST::FUNCTION:
+PKCS8_pkey_get0
4041 EXIST::FUNCTION:
+EVP_PKEY_asn1_get0
4042 EXIST::FUNCTION:
+EVP_PKEY_paramgen_init
4043 EXIST::FUNCTION:
+EVP_PKEY_sign
4044 EXIST::FUNCTION:
+EVP_PKEY_meth_set_init
4045 EXIST::FUNCTION:
+EVP_PKEY_meth_set_verify_recover
4046 EXIST::FUNCTION:
+EVP_PKEY_CTX_set_cb
4047 EXIST::FUNCTION:
+EVP_PKEY_meth_set_derive
4048 EXIST::FUNCTION:
+BUF_reverse
4049 EXIST::FUNCTION:
+ASN1_bn_print
4050 EXIST::FUNCTION:BIO
+EVP_PKEY_asn1_get_count
4051 EXIST::FUNCTION:
+PKCS8_pkey_set0
4052 EXIST::FUNCTION:
+EVP_PKEY_asn1_set_private
4053 EXIST::FUNCTION:
+EVP_PKEY_meth_set_verify
4054 EXIST::FUNCTION:
+EVP_PKEY_asn1_get0_info
4055 EXIST::FUNCTION:
+EVP_PKEY_CTX_set_app_data
4056 EXIST::FUNCTION:
+EVP_PKEY_meth_set_verifyctx
4057 EXIST::FUNCTION:
+EVP_PKEY_CTX_get_app_data
4058 EXIST::FUNCTION:
+X509_PUBKEY_get0_param
4059 EXIST::FUNCTION:
+EVP_PKEY_asn1_set_param
4060 EXIST::FUNCTION:
+EVP_PKEY_meth_set_encrypt
4061 EXIST::FUNCTION:
+EVP_PKEY_verify
4062 EXIST::FUNCTION:
+EVP_PKEY_decrypt_old
4063 EXIST::FUNCTION:
+EVP_PKEY_asn1_find_str
4064 EXIST::FUNCTION:
+EVP_PKEY_derive
4065 EXIST::FUNCTION:
+PEM_write_bio_Parameters
4066 EXIST::FUNCTION:
+EVP_PKEY_meth_set_signctx
4067 EXIST::FUNCTION:
+EVP_PKEY_CTX_free
4068 EXIST::FUNCTION:
+EVP_PKEY_get0
4069 EXIST::FUNCTION:
+EVP_PKEY_meth_find
4070 EXIST::FUNCTION:
+EVP_PKEY_verify_init
4071 EXIST::FUNCTION:
+EVP_PKEY_derive_set_peer
4072 EXIST::FUNCTION:
+PEM_read_bio_Parameters
4073 EXIST::FUNCTION:
+EVP_PKEY_meth_set_cleanup
4074 EXIST::FUNCTION:
+EVP_PKEY_asn1_free
4075 EXIST::FUNCTION:
+EVP_PKEY_meth_set_keygen
4076 EXIST::FUNCTION:
+EVP_PKEY_paramgen
4077 EXIST::FUNCTION:
+EVP_PKEY_meth_set_paramgen
4078 EXIST::FUNCTION:
+EVP_PKEY_verify_recover
4079 EXIST::FUNCTION:
+EVP_PKEY_asn1_set_ctrl
4080 EXIST::FUNCTION:
+EVP_PKEY_CTX_new_id
4081 EXIST::FUNCTION:
.
patch -p0 <<' .'
Index: openssl/util/mkdef.pl
============================================================
================
$ cvs diff -u -r1.100 -r1.101 mkdef.pl
--- openssl/util/mkdef.pl 12 Feb 2006 23:11:55 -0000 1.100
+++ openssl/util/mkdef.pl 17 Apr 2006 12:08:21 -0000 1.101
-95,6 +95,8
"FP_API", "STDIO",
"SOCK", "KRB5", "DGRAM",
# Engines
"STATIC_ENGINE", "ENGINE",
"HW", "GMP",
+ # TLS
+ "TLSEXT", "PSK",
# Deprecated functions
"DEPRECATED" );
-114,6 +116,7
my $no_rsa; my $no_dsa; my $no_dh; my $no_hmac=0; my
$no_aes; my $no_krb5;
my $no_ec; my $no_ecdsa; my $no_ecdh; my $no_engine; my
$no_hw;
my $no_fp_api; my $no_static_engine=1; my $no_gmp; my
$no_deprecated;
+my $no_psk; my $no_tlsext;
foreach (ARGV, split(/ /, $options))
-225,6 +228,7
my $ssl="ssl/ssl.h";
$ssl.=" ssl/kssl.h";
+$ssl.=" ssl/tls1.h";
my $crypto ="crypto/crypto.h";
$crypto.=" crypto/o_dir.h";
-1107,6 +1111,8
if ($keyword eq "FP_API" &&
$no_fp_api) { return 0; }
if ($keyword eq "STATIC_ENGINE" &&
$no_static_engine) { return 0; }
if ($keyword eq "GMP" && $no_gmp)
{ return 0; }
+ if ($keyword eq "TLSEXT" &&
$no_tlsext) { return 0; }
+ if ($keyword eq "PSK" && $no_psk)
{ return 0; }
if ($keyword eq "DEPRECATED" &&
$no_deprecated) { return 0; }
# Nothing recognise as true
.
patch -p0 <<' .'
Index: openssl/util/ssleay.num
============================================================
================
$ cvs diff -u -r1.46 -r1.47 ssleay.num
--- openssl/util/ssleay.num 10 Mar 2006 23:08:31
-0000 1.46
+++ openssl/util/ssleay.num 17 Apr 2006 12:08:22
-0000 1.47
-227,7 +227,9
SSL_COMP_get_compress_methods
276 EXIST:VMS:FUNCTION:COMP
SSL_SESSION_get_id
277 EXIST::FUNCTION:
SSL_set_SSL_CTX
278 EXIST::FUNCTION:
-SSL_CTX_use_psk_identity_hint
279 EXIST::FUNCTION:
-SSL_get_psk_identity_hint
280 EXIST::FUNCTION:
-SSL_get_psk_identity
281 EXIST::FUNCTION:
-SSL_use_psk_identity_hint
282 EXIST::FUNCTION:
+SSL_CTX_use_psk_identity_hint
279 EXIST::FUNCTION:PSK
+SSL_get_psk_identity_hint
280 EXIST::FUNCTION:PSK
+SSL_get_psk_identity
281 EXIST::FUNCTION:PSK
+SSL_use_psk_identity_hint
282 EXIST::FUNCTION:PSK
+SSL_get_servername
283 EXIST::FUNCTION:TLSEXT
+SSL_get_servername_type
284 EXIST::FUNCTION:TLSEXT
.
____________________________________________________________
__________
OpenSSL Project http://www.openssl.org
CVS Repository Commit List
openssl-cvsopenssl.org
Automated List Manager
majordomoopenssl.org
|