Skip to content

T
Third Party Openssl

OpenHarmony / Third Party Openssl
1 年多 前同步成功

通知 9
Star 18
Fork 1
T
Third Party Openssl
提交 b4cadc6e 编写于 作者: B Ben Laurie
浏览文件
操作

Fix security hole.

上级 0f423567
展开全部 隐藏空白更改
内联 并排
Showing with 878 addition and 680 deletion
CHANGES
浏览文件 @ b4cadc6e
......@@ -5,6 +5,16 @@
Changes between 0.9.1c and 0.9.2
*) Make SSL_get_peer_cert_chain() work in servers. Unfortunately, it still
doesn't work when the session is reused. Coming soon!
[Ben Laurie]
*) Fix a security hole, that allows sessions to be reused in the wrong
context thus bypassing client cert protection! All software that uses
client certs and session caches in multiple contexts NEEDS PATCHING to
allow session reuse! A fuller solution is in the works.
[Ben Laurie, problem pointed out by Holger Reif, Bodo Moeller (and ???)]
*) Some more source tree cleanups (removed obsolete files
crypto/bf/asm/bf586.pl, test/test.txt and crypto/sha/asm/f.s; changed
permission on "config" script to be executable) and a fix for the INSTALL
......
README
浏览文件 @ b4cadc6e
OpenSSL 0.9.2 06-Mar-1999
OpenSSL 0.9.2b 22 Mar 1999
Copyright (c) 1998-1999 The OpenSSL Project
Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson
......
apps/Makefile.ssl
浏览文件 @ b4cadc6e
此差异已折叠。
apps/s_apps.h
浏览文件 @ b4cadc6e
......@@ -62,7 +62,7 @@
#ifndef NOPROTO
int do_accept(int acc_sock, int *sock, char **host);
int do_server(int port, int *ret, int (*cb) ());
int do_server(int port, int *ret, int (*cb) (), char *context);
#ifdef HEADER_X509_H
int MS_CALLBACK verify_callback(int ok, X509_STORE_CTX *ctx);
#else
......
apps/s_server.c
浏览文件 @ b4cadc6e
......@@ -76,8 +76,8 @@
#ifndef NOPROTO
static RSA MS_CALLBACK *tmp_rsa_cb(SSL *s, int export,int keylength);
static int sv_body(char *hostname, int s);
static int www_body(char *hostname, int s);
static int sv_body(char *hostname, int s, char *context);
static int www_body(char *hostname, int s, char *context);
static void close_accept_socket(void );
static void sv_usage(void);
static int init_ssl_connection(SSL *s);
......@@ -190,6 +190,7 @@ static void sv_usage()
BIO_printf(bio_err,"usage: s_server [args ...]\n");
BIO_printf(bio_err,"\n");
BIO_printf(bio_err," -accept arg - port to accept on (default is %d)\n",PORT);
BIO_printf(bio_err," -context arg - set session ID context\n");
BIO_printf(bio_err," -verify arg - turn on peer certificate verification\n");
BIO_printf(bio_err," -Verify arg - turn on peer certificate verification, must have a cert.\n");
BIO_printf(bio_err," -cert arg - certificate file to use, PEM format assumed\n");
......@@ -231,6 +232,7 @@ char *argv[];
{
short port=PORT;
char *CApath=NULL,*CAfile=NULL;
char *context = NULL;
int badop=0,bugs=0;
int ret=1;
int off=0;
......@@ -292,6 +294,11 @@ char *argv[];
verify_depth=atoi(*(++argv));
BIO_printf(bio_err,"verify depth is %d, must return a certificate\n",verify_depth);
}
else if (strcmp(*argv,"-context") == 0)
{
if (--argc < 1) goto bad;
context= *(++argv);
}
else if (strcmp(*argv,"-cert") == 0)
{
if (--argc < 1) goto bad;
......@@ -511,9 +518,9 @@ bad:
BIO_printf(bio_s_out,"ACCEPT\n");
if (www)
do_server(port,&accept_socket,www_body);
do_server(port,&accept_socket,www_body, context);
else
do_server(port,&accept_socket,sv_body);
do_server(port,&accept_socket,sv_body, context);
print_stats(bio_s_out,ctx);
ret=0;
end:
......@@ -553,9 +560,10 @@ SSL_CTX *ssl_ctx;
SSL_CTX_sess_get_cache_size(ssl_ctx));
}
static int sv_body(hostname, s)
static int sv_body(hostname, s, context)
char *hostname;
int s;
char *context;
{
char *buf=NULL;
fd_set readfds;
......@@ -582,8 +590,11 @@ int s;
}
#endif
if (con == NULL)
if (con == NULL) {
con=(SSL *)SSL_new(ctx);
if(context)
SSL_set_session_id_context(con, context, strlen(context));
}
SSL_clear(con);
sbio=BIO_new_socket(s,BIO_NOCLOSE);
......@@ -870,9 +881,10 @@ char *file;
}
#endif
static int www_body(hostname, s)
static int www_body(hostname, s, context)
char *hostname;
int s;
char *context;
{
char *buf=NULL;
int ret=1;
......@@ -905,6 +917,7 @@ int s;
if (!BIO_set_write_buffer_size(io,bufsize)) goto err;
if ((con=(SSL *)SSL_new(ctx)) == NULL) goto err;
if(context) SSL_set_session_id_context(con, context, strlen(context));
sbio=BIO_new_socket(s,BIO_NOCLOSE);
if (s_nbio_test)
......
apps/s_socket.c
浏览文件 @ b4cadc6e
......@@ -280,10 +280,11 @@ int port;
return(1);
}
int do_server(port, ret, cb)
int do_server(port, ret, cb, context)
int port;
int *ret;
int (*cb)();
char *context;
{
int sock;
char *name;
......@@ -304,7 +305,7 @@ int (*cb)();
SHUTDOWN(accept_socket);
return(0);
}
i=(*cb)(name,sock);
i=(*cb)(name,sock, context);
if (name != NULL) Free(name);
SHUTDOWN2(sock);
if (i < 0)
......
apps/sess_id.c
浏览文件 @ b4cadc6e
......@@ -79,6 +79,7 @@ static char *sess_id_usage[]={
" -text - print ssl session id details\n",
" -cert - output certificate \n",
" -noout - no CRL output\n",
" -context arg - set the session ID context\n",
NULL
};
......@@ -96,7 +97,7 @@ char **argv;
int ret=1,i,num,badops=0;
BIO *out=NULL;
int informat,outformat;
char *infile=NULL,*outfile=NULL;
char *infile=NULL,*outfile=NULL,*context=NULL;
int cert=0,noout=0,text=0;
char **pp;
......@@ -140,6 +141,11 @@ char **argv;
cert= ++num;
else if (strcmp(*argv,"-noout") == 0)
noout= ++num;
else if (strcmp(*argv,"-context") == 0)
{
if(--argc < 1) goto bad;
context=*++argv;
}
else
{
BIO_printf(bio_err,"unknown option %s\n",*argv);
......@@ -162,6 +168,17 @@ bad:
x=load_sess_id(infile,informat);
if (x == NULL) { goto end; }
if(context)
{
x->sid_ctx_length=strlen(context);
if(x->sid_ctx_length > SSL_MAX_SID_CTX_LENGTH)
{
BIO_printf(bio_err,"Context too long\n");
goto end;
}
memcpy(x->sid_ctx,context,x->sid_ctx_length);
}
#ifdef undef
/* just testing for memory leaks :-) */
{
......
crypto/Makefile.ssl
浏览文件 @ b4cadc6e
......@@ -39,7 +39,7 @@ LIBOBJ= cryptlib.o mem.o cversion.o ex_data.o tmdiff.o $(ERRC).o
SRC= $(LIBSRC)
EXHEADER= crypto.h cryptall.h tmdiff.h
EXHEADER= crypto.h cryptall.h tmdiff.h opensslv.h
HEADER= cryptlib.h date.h $(EXHEADER)
ALL= $(GENERAL) $(SRC) $(HEADER)
......@@ -158,15 +158,18 @@ errgen:
# DO NOT DELETE THIS LINE -- make depend depends on it.
cpt_err.o: ../include/err.h ../include/stack.h crypto.h
cpt_err.o: ../include/err.h ../include/stack.h crypto.h opensslv.h
cryptlib.o: ../include/bio.h ../include/buffer.h ../include/e_os.h
cryptlib.o: ../include/err.h ../include/stack.h cryptlib.h crypto.h date.h
cryptlib.o: opensslv.h
cversion.o: ../include/bio.h ../include/buffer.h ../include/e_os.h
cversion.o: ../include/err.h ../include/stack.h cryptlib.h crypto.h date.h
cversion.o: opensslv.h
ex_data.o: ../include/bio.h ../include/buffer.h ../include/e_os.h
ex_data.o: ../include/err.h ../include/lhash.h ../include/stack.h cryptlib.h
ex_data.o: crypto.h
ex_data.o: crypto.h opensslv.h
mem.o: ../include/bio.h ../include/buffer.h ../include/e_os.h ../include/err.h
mem.o: ../include/lhash.h ../include/stack.h cryptlib.h crypto.h
mem.o: ../include/lhash.h ../include/stack.h cryptlib.h crypto.h opensslv.h
tmdiff.o: ../include/bio.h ../include/buffer.h ../include/e_os.h
tmdiff.o: ../include/err.h ../include/stack.h cryptlib.h crypto.h tmdiff.h
tmdiff.o: ../include/err.h ../include/stack.h cryptlib.h crypto.h opensslv.h
tmdiff.o: tmdiff.h
crypto/asn1/Makefile.ssl
浏览文件 @ b4cadc6e
此差异已折叠。
crypto/asn1/asn1_lib.c
浏览文件 @ b4cadc6e
......@@ -69,7 +69,7 @@ static int asn1_get_length();
static void asn1_put_length();
#endif
char *ASN1_version="ASN.1 part of OpenSSL 0.9.2 31-Dec-1998";
char *ASN1_version="ASN.1" OPENSSL_VERSION_PTEXT;
int ASN1_check_infinite_end(p,len)
unsigned char **p;
......
crypto/bf/Makefile.ssl
浏览文件 @ b4cadc6e
......@@ -106,7 +106,7 @@ errors:
# DO NOT DELETE THIS LINE -- make depend depends on it.
bf_cfb64.o: bf_locl.h blowfish.h
bf_ecb.o: bf_locl.h blowfish.h
bf_ecb.o: ../opensslv.h bf_locl.h blowfish.h
bf_enc.o: bf_locl.h blowfish.h
bf_ofb64.o: bf_locl.h blowfish.h
bf_skey.o: bf_locl.h bf_pi.h blowfish.h
crypto/bf/bf_ecb.c
浏览文件 @ b4cadc6e
......@@ -58,13 +58,14 @@
#include "blowfish.h"
#include "bf_locl.h"
#include "opensslv.h"
/* Blowfish as implemented from 'Blowfish: Springer-Verlag paper'
* (From LECTURE NOTES IN COIMPUTER SCIENCE 809, FAST SOFTWARE ENCRYPTION,
* CAMBRIDGE SECURITY WORKSHOP, CAMBRIDGE, U.K., DECEMBER 9-11, 1993)
*/
char *BF_version="BlowFish part of OpenSSL 0.9.2 31-Dec-1998";
char *BF_version="BlowFish" OPENSSL_VERSION_PTEXT;
char *BF_options()
{
......
crypto/bio/Makefile.ssl
浏览文件 @ b4cadc6e
......@@ -93,11 +93,11 @@ $(ERRC).c: $(ERR).err
# DO NOT DELETE THIS LINE -- make depend depends on it.
b_dump.o: ../../include/buffer.h ../../include/e_os.h ../../include/err.h
b_dump.o: ../../include/stack.h ../cryptlib.h ../crypto.h bio.h
b_dump.o: ../../include/stack.h ../cryptlib.h ../crypto.h ../opensslv.h bio.h
b_print.o: ../../include/buffer.h ../../include/e_os.h ../../include/err.h
b_print.o: ../../include/stack.h ../cryptlib.h ../crypto.h bio.h
b_print.o: ../../include/stack.h ../cryptlib.h ../crypto.h ../opensslv.h bio.h
b_sock.o: ../../include/buffer.h ../../include/e_os.h ../../include/err.h
b_sock.o: ../../include/stack.h ../cryptlib.h ../crypto.h bio.h
b_sock.o: ../../include/stack.h ../cryptlib.h ../crypto.h ../opensslv.h bio.h
bf_buff.o: ../../include/asn1.h ../../include/blowfish.h ../../include/bn.h
bf_buff.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
bf_buff.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
......@@ -106,7 +106,7 @@ bf_buff.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
bf_buff.o: ../../include/objects.h ../../include/rc2.h ../../include/rc4.h
bf_buff.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h
bf_buff.o: ../../include/sha.h ../../include/stack.h ../cryptlib.h ../crypto.h
bf_buff.o: bio.h
bf_buff.o: ../opensslv.h bio.h
bf_nbio.o: ../../include/asn1.h ../../include/blowfish.h ../../include/bn.h
bf_nbio.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
bf_nbio.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
......@@ -115,7 +115,7 @@ bf_nbio.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
bf_nbio.o: ../../include/objects.h ../../include/rand.h ../../include/rc2.h
bf_nbio.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
bf_nbio.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
bf_nbio.o: ../cryptlib.h ../crypto.h bio.h
bf_nbio.o: ../cryptlib.h ../crypto.h ../opensslv.h bio.h
bf_null.o: ../../include/asn1.h ../../include/blowfish.h ../../include/bn.h
bf_null.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
bf_null.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
......@@ -124,25 +124,27 @@ bf_null.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
bf_null.o: ../../include/objects.h ../../include/rc2.h ../../include/rc4.h
bf_null.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h
bf_null.o: ../../include/sha.h ../../include/stack.h ../cryptlib.h ../crypto.h
bf_null.o: bio.h
bf_null.o: ../opensslv.h bio.h
bio_cb.o: ../../include/buffer.h ../../include/e_os.h ../../include/err.h
bio_cb.o: ../../include/stack.h ../cryptlib.h ../crypto.h bio.h
bio_err.o: ../../include/err.h ../../include/stack.h ../crypto.h bio.h
bio_cb.o: ../../include/stack.h ../cryptlib.h ../crypto.h ../opensslv.h bio.h
bio_err.o: ../../include/err.h ../../include/stack.h ../crypto.h ../opensslv.h
bio_err.o: bio.h
bio_lib.o: ../../include/buffer.h ../../include/e_os.h ../../include/err.h
bio_lib.o: ../../include/stack.h ../cryptlib.h ../crypto.h bio.h
bio_lib.o: ../../include/stack.h ../cryptlib.h ../crypto.h ../opensslv.h bio.h
bss_acpt.o: ../../include/buffer.h ../../include/e_os.h ../../include/err.h
bss_acpt.o: ../../include/stack.h ../cryptlib.h ../crypto.h bio.h
bss_acpt.o: ../../include/stack.h ../cryptlib.h ../crypto.h ../opensslv.h bio.h
bss_conn.o: ../../include/buffer.h ../../include/e_os.h ../../include/err.h
bss_conn.o: ../../include/stack.h ../cryptlib.h ../crypto.h bio.h
bss_conn.o: ../../include/stack.h ../cryptlib.h ../crypto.h ../opensslv.h bio.h
bss_fd.o: ../../include/buffer.h ../../include/e_os.h ../../include/err.h
bss_fd.o: ../../include/stack.h ../cryptlib.h ../crypto.h bio.h bss_sock.c
bss_fd.o: ../../include/stack.h ../cryptlib.h ../crypto.h ../opensslv.h bio.h
bss_fd.o: bss_sock.c
bss_file.o: ../../include/buffer.h ../../include/e_os.h ../../include/err.h
bss_file.o: ../../include/stack.h ../cryptlib.h ../crypto.h bio.h
bss_file.o: ../../include/stack.h ../cryptlib.h ../crypto.h ../opensslv.h bio.h
bss_log.o: ../../include/buffer.h ../../include/e_os.h ../../include/err.h
bss_log.o: ../../include/stack.h ../cryptlib.h ../crypto.h bio.h
bss_log.o: ../../include/stack.h ../cryptlib.h ../crypto.h ../opensslv.h bio.h
bss_mem.o: ../../include/buffer.h ../../include/e_os.h ../../include/err.h
bss_mem.o: ../../include/stack.h ../cryptlib.h ../crypto.h bio.h
bss_mem.o: ../../include/stack.h ../cryptlib.h ../crypto.h ../opensslv.h bio.h
bss_null.o: ../../include/buffer.h ../../include/e_os.h ../../include/err.h
bss_null.o: ../../include/stack.h ../cryptlib.h ../crypto.h bio.h
bss_null.o: ../../include/stack.h ../cryptlib.h ../crypto.h ../opensslv.h bio.h
bss_sock.o: ../../include/buffer.h ../../include/e_os.h ../../include/err.h
bss_sock.o: ../../include/stack.h ../cryptlib.h ../crypto.h bio.h
bss_sock.o: ../../include/stack.h ../cryptlib.h ../crypto.h ../opensslv.h bio.h
crypto/bn/Makefile.ssl
浏览文件 @ b4cadc6e
......@@ -159,56 +159,56 @@ $(ERRC).c: $(ERR).err
bn_add.o: ../../include/bio.h ../../include/buffer.h ../../include/e_os.h
bn_add.o: ../../include/err.h ../../include/stack.h ../cryptlib.h ../crypto.h
bn_add.o: bn.h bn_lcl.h
bn_add.o: ../opensslv.h bn.h bn_lcl.h
bn_asm.o: ../../include/bio.h ../../include/buffer.h ../../include/e_os.h
bn_asm.o: ../../include/err.h ../../include/stack.h ../cryptlib.h ../crypto.h
bn_asm.o: bn.h bn_lcl.h
bn_asm.o: ../opensslv.h bn.h bn_lcl.h
bn_blind.o: ../../include/bio.h ../../include/buffer.h ../../include/e_os.h
bn_blind.o: ../../include/err.h ../../include/stack.h ../cryptlib.h ../crypto.h
bn_blind.o: bn.h bn_lcl.h
bn_blind.o: ../opensslv.h bn.h bn_lcl.h
bn_div.o: ../../include/bio.h ../../include/buffer.h ../../include/e_os.h
bn_div.o: ../../include/err.h ../../include/stack.h ../cryptlib.h ../crypto.h
bn_div.o: bn.h bn_lcl.h
bn_div.o: ../opensslv.h bn.h bn_lcl.h
bn_err.o: ../../include/err.h bn.h
bn_exp.o: ../../include/bio.h ../../include/buffer.h ../../include/e_os.h
bn_exp.o: ../../include/err.h ../../include/stack.h ../cryptlib.h ../crypto.h
bn_exp.o: bn.h bn_lcl.h
bn_exp.o: ../opensslv.h bn.h bn_lcl.h
bn_exp2.o: ../../include/bio.h ../../include/buffer.h ../../include/e_os.h
bn_exp2.o: ../../include/err.h ../../include/stack.h ../cryptlib.h ../crypto.h
bn_exp2.o: bn.h bn_lcl.h
bn_exp2.o: ../opensslv.h bn.h bn_lcl.h
bn_gcd.o: ../../include/bio.h ../../include/buffer.h ../../include/e_os.h
bn_gcd.o: ../../include/err.h ../../include/stack.h ../cryptlib.h ../crypto.h
bn_gcd.o: bn.h bn_lcl.h
bn_gcd.o: ../opensslv.h bn.h bn_lcl.h
bn_lib.o: ../../include/bio.h ../../include/buffer.h ../../include/e_os.h
bn_lib.o: ../../include/err.h ../../include/stack.h ../cryptlib.h ../crypto.h
bn_lib.o: bn.h bn_lcl.h
bn_lib.o: ../opensslv.h bn.h bn_lcl.h
bn_mont.o: ../../include/bio.h ../../include/buffer.h ../../include/e_os.h
bn_mont.o: ../../include/err.h ../../include/stack.h ../cryptlib.h ../crypto.h
bn_mont.o: bn.h bn_lcl.h
bn_mont.o: ../opensslv.h bn.h bn_lcl.h
bn_mpi.o: ../../include/bio.h ../../include/buffer.h ../../include/e_os.h
bn_mpi.o: ../../include/err.h ../../include/stack.h ../cryptlib.h ../crypto.h
bn_mpi.o: bn.h bn_lcl.h
bn_mpi.o: ../opensslv.h bn.h bn_lcl.h
bn_mul.o: ../../include/bio.h ../../include/buffer.h ../../include/e_os.h
bn_mul.o: ../../include/err.h ../../include/stack.h ../cryptlib.h ../crypto.h
bn_mul.o: bn.h bn_lcl.h
bn_mul.o: ../opensslv.h bn.h bn_lcl.h
bn_prime.o: ../../include/bio.h ../../include/buffer.h ../../include/e_os.h
bn_prime.o: ../../include/err.h ../../include/rand.h ../../include/stack.h
bn_prime.o: ../cryptlib.h ../crypto.h bn.h bn_lcl.h bn_prime.h
bn_prime.o: ../cryptlib.h ../crypto.h ../opensslv.h bn.h bn_lcl.h bn_prime.h
bn_print.o: ../../include/bio.h ../../include/buffer.h ../../include/e_os.h
bn_print.o: ../../include/err.h ../../include/stack.h ../cryptlib.h ../crypto.h
bn_print.o: bn.h bn_lcl.h
bn_print.o: ../opensslv.h bn.h bn_lcl.h
bn_rand.o: ../../include/bio.h ../../include/buffer.h ../../include/e_os.h
bn_rand.o: ../../include/err.h ../../include/rand.h ../../include/stack.h
bn_rand.o: ../cryptlib.h ../crypto.h bn.h bn_lcl.h
bn_rand.o: ../cryptlib.h ../crypto.h ../opensslv.h bn.h bn_lcl.h
bn_recp.o: ../../include/bio.h ../../include/buffer.h ../../include/e_os.h
bn_recp.o: ../../include/err.h ../../include/stack.h ../cryptlib.h ../crypto.h
bn_recp.o: bn.h bn_lcl.h
bn_recp.o: ../opensslv.h bn.h bn_lcl.h
bn_shift.o: ../../include/bio.h ../../include/buffer.h ../../include/e_os.h
bn_shift.o: ../../include/err.h ../../include/stack.h ../cryptlib.h ../crypto.h
bn_shift.o: bn.h bn_lcl.h
bn_shift.o: ../opensslv.h bn.h bn_lcl.h
bn_sqr.o: ../../include/bio.h ../../include/buffer.h ../../include/e_os.h
bn_sqr.o: ../../include/err.h ../../include/stack.h ../cryptlib.h ../crypto.h
bn_sqr.o: bn.h bn_lcl.h
bn_sqr.o: ../opensslv.h bn.h bn_lcl.h
bn_word.o: ../../include/bio.h ../../include/buffer.h ../../include/e_os.h
bn_word.o: ../../include/err.h ../../include/stack.h ../cryptlib.h ../crypto.h
bn_word.o: bn.h bn_lcl.h
bn_word.o: ../opensslv.h bn.h bn_lcl.h
crypto/bn/bn_lib.c
浏览文件 @ b4cadc6e
......@@ -60,7 +60,7 @@
#include "cryptlib.h"
#include "bn_lcl.h"
char *BN_version="Big Number part of OpenSSL 0.9.2 31-Dec-1998";
char *BN_version="Big Number" OPENSSL_VERSION_PTEXT;
/* For a 32 bit machine
* 2 - 4 == 128
......
crypto/buffer/Makefile.ssl
浏览文件 @ b4cadc6e
......@@ -86,4 +86,5 @@ $(ERRC).c: $(ERR).err
buf_err.o: ../../include/err.h buffer.h
buffer.o: ../../include/bio.h ../../include/e_os.h ../../include/err.h
buffer.o: ../../include/stack.h ../cryptlib.h ../crypto.h buffer.h
buffer.o: ../../include/stack.h ../cryptlib.h ../crypto.h ../opensslv.h
buffer.o: buffer.h
crypto/cast/Makefile.ssl
浏览文件 @ b4cadc6e
......@@ -108,7 +108,7 @@ errors:
# DO NOT DELETE THIS LINE -- make depend depends on it.
c_cfb64.o: cast.h cast_lcl.h
c_ecb.o: cast.h cast_lcl.h
c_ecb.o: ../opensslv.h cast.h cast_lcl.h
c_enc.o: cast.h cast_lcl.h
c_ofb64.o: cast.h cast_lcl.h
c_skey.o: cast.h cast_lcl.h cast_s.h
crypto/cast/c_ecb.c
浏览文件 @ b4cadc6e
......@@ -58,8 +58,9 @@
#include "cast.h"
#include "cast_lcl.h"
#include "opensslv.h"
char *CAST_version="CAST part of OpenSSL 0.9.2 31-Dec-1998";
char *CAST_version="CAST" OPENSSL_VERSION_PTEXT;
void CAST_ecb_encrypt(in, out, ks, encrypt)
unsigned char *in;
......
crypto/comp/Makefile.ssl
浏览文件 @ b4cadc6e
......@@ -94,11 +94,11 @@ $(ERRC).c: $(ERR).err
# DO NOT DELETE THIS LINE -- make depend depends on it.
c_rle.o: ../../include/asn1.h ../../include/bio.h ../../include/bn.h
c_rle.o: ../../include/crypto.h ../../include/objects.h ../../include/stack.h
c_rle.o: comp.h
c_rle.o: ../../include/crypto.h ../../include/objects.h
c_rle.o: ../../include/opensslv.h ../../include/stack.h comp.h
c_zlib.o: ../../include/asn1.h ../../include/bio.h ../../include/bn.h
c_zlib.o: ../../include/crypto.h ../../include/objects.h ../../include/stack.h
c_zlib.o: comp.h
c_zlib.o: ../../include/crypto.h ../../include/objects.h
c_zlib.o: ../../include/opensslv.h ../../include/stack.h comp.h
comp_lib.o: ../../include/asn1.h ../../include/bio.h ../../include/bn.h
comp_lib.o: ../../include/crypto.h ../../include/objects.h
comp_lib.o: ../../include/stack.h comp.h
comp_lib.o: ../../include/opensslv.h ../../include/stack.h comp.h
crypto/conf/Makefile.ssl
浏览文件 @ b4cadc6e
......@@ -87,6 +87,6 @@ $(ERRC).c: $(ERR).err
conf.o: ../../include/bio.h ../../include/buffer.h ../../include/e_os.h
conf.o: ../../include/err.h ../../include/lhash.h ../../include/stack.h
conf.o: ../cryptlib.h ../crypto.h conf.h conf_lcl.h
conf.o: ../cryptlib.h ../crypto.h ../opensslv.h conf.h conf_lcl.h
conf_err.o: ../../include/err.h ../../include/lhash.h ../../include/stack.h
conf_err.o: conf.h
crypto/conf/conf.c
浏览文件 @ b4cadc6e
......@@ -95,7 +95,7 @@ static CONF_VALUE *get_section();
#define scan_esc(p) ((((p)[1] == '\0')?(p++):(p+=2)),p)
char *CONF_version="CONF part of OpenSSL 0.9.2 31-Dec-1998";
char *CONF_version="CONF" OPENSSL_VERSION_PTEXT;
LHASH *CONF_load(h,file,line)
LHASH *h;
......
crypto/crypto.h
浏览文件 @ b4cadc6e
......@@ -64,8 +64,7 @@ extern "C" {
#endif
#include "stack.h"
#define OPENSSL_VERSION_NUMBER 0x0920 /* Version 0.9.1c is 0913 */
#include "opensslv.h"
/* Backward compatibility to SSLeay */
/* This is more to be used to check the correct DLL is being used
......
crypto/cversion.c
浏览文件 @ b4cadc6e
......@@ -66,7 +66,7 @@ char *SSLeay_version(t)
int t;
{
if (t == SSLEAY_VERSION)
return("OpenSSL 0.9.2 31-Dec-1998");
return OPENSSL_VERSION_TEXT;
if (t == SSLEAY_BUILT_ON)
{
#ifdef DATE
......
crypto/des/Makefile.ssl
浏览文件 @ b4cadc6e
......@@ -143,10 +143,14 @@ cfb64enc.o: des.h des_locl.h
cfb_enc.o: des.h des_locl.h
des_enc.o: des.h des_locl.h
ecb3_enc.o: des.h des_locl.h
ecb_enc.o: des.h des_locl.h spr.h
ecb_enc.o: ../opensslv.h des.h des_locl.h spr.h
ede_cbcm_enc.o: des.h des_locl.h
enc_read.o: des.h des_locl.h
enc_writ.o: des.h des_locl.h
enc_read.o: ../../include/bio.h ../../include/buffer.h ../../include/e_os.h
enc_read.o: ../../include/err.h ../../include/stack.h ../cryptlib.h ../crypto.h
enc_read.o: ../opensslv.h des.h des_locl.h
enc_writ.o: ../../include/bio.h ../../include/buffer.h ../../include/e_os.h
enc_writ.o: ../../include/err.h ../../include/stack.h ../cryptlib.h ../crypto.h
enc_writ.o: ../opensslv.h des.h des_locl.h
fcrypt.o: des.h des.h des_locl.h des_locl.h
fcrypt_b.o: des.h des_locl.h
ofb64ede.o: des.h des_locl.h
......@@ -158,7 +162,7 @@ rand_key.o: des.h des_locl.h
read2pwd.o: des.h des_locl.h
read_pwd.o: ../../include/bio.h ../../include/buffer.h ../../include/e_os.h
read_pwd.o: ../../include/err.h ../../include/stack.h ../cryptlib.h ../crypto.h
read_pwd.o: des.h des_locl.h
read_pwd.o: ../opensslv.h des.h des_locl.h
rpc_enc.o: des.h des_locl.h des_ver.h rpc_des.h
set_key.o: des.h des_locl.h podd.h sk.h
str2key.o: des.h des_locl.h
......
crypto/des/ecb_enc.c
浏览文件 @ b4cadc6e
......@@ -58,9 +58,10 @@
#include "des_locl.h"
#include "spr.h"
#include "opensslv.h"
char *libdes_version="libdes v 3.24 - 20-Apr-1996 - eay";
char *DES_version="DES part of OpenSSL 0.9.2 31-Dec-1998";
char *DES_version="DES" OPENSSL_VERSION_PTEXT;
char *des_options()
{
......
crypto/dh/Makefile.ssl
浏览文件 @ b4cadc6e
......@@ -86,14 +86,14 @@ $(ERRC).c: $(ERR).err
dh_check.o: ../../include/bio.h ../../include/bn.h ../../include/buffer.h
dh_check.o: ../../include/e_os.h ../../include/err.h ../../include/stack.h
dh_check.o: ../cryptlib.h ../crypto.h dh.h
dh_check.o: ../cryptlib.h ../crypto.h ../opensslv.h dh.h
dh_err.o: ../../include/err.h dh.h
dh_gen.o: ../../include/bio.h ../../include/bn.h ../../include/buffer.h
dh_gen.o: ../../include/e_os.h ../../include/err.h ../../include/stack.h
dh_gen.o: ../cryptlib.h ../crypto.h dh.h
dh_gen.o: ../cryptlib.h ../crypto.h ../opensslv.h dh.h
dh_key.o: ../../include/bio.h ../../include/bn.h ../../include/buffer.h
dh_key.o: ../../include/e_os.h ../../include/err.h ../../include/rand.h
dh_key.o: ../../include/stack.h ../cryptlib.h ../crypto.h dh.h
dh_key.o: ../../include/stack.h ../cryptlib.h ../crypto.h ../opensslv.h dh.h
dh_lib.o: ../../include/bio.h ../../include/bn.h ../../include/buffer.h
dh_lib.o: ../../include/e_os.h ../../include/err.h ../../include/stack.h
dh_lib.o: ../cryptlib.h ../crypto.h dh.h
dh_lib.o: ../cryptlib.h ../crypto.h ../opensslv.h dh.h
crypto/dh/dh_lib.c
浏览文件 @ b4cadc6e
......@@ -61,7 +61,7 @@
#include "bn.h"
#include "dh.h"
char *DH_version="Diffie-Hellman part of OpenSSL 0.9.2 31-Dec-1998";
char *DH_version="Diffie-Hellman" OPENSSL_VERSION_PTEXT;
DH *DH_new()
{
......
crypto/dsa/Makefile.ssl
浏览文件 @ b4cadc6e
......@@ -88,18 +88,18 @@ dsa_err.o: ../../include/bn.h ../../include/err.h dsa.h
dsa_gen.o: ../../include/bio.h ../../include/bn.h ../../include/buffer.h
dsa_gen.o: ../../include/e_os.h ../../include/err.h ../../include/rand.h
dsa_gen.o: ../../include/sha.h ../../include/stack.h ../cryptlib.h ../crypto.h
dsa_gen.o: dsa.h
dsa_gen.o: ../opensslv.h dsa.h
dsa_key.o: ../../include/bio.h ../../include/bn.h ../../include/buffer.h
dsa_key.o: ../../include/e_os.h ../../include/err.h ../../include/rand.h
dsa_key.o: ../../include/sha.h ../../include/stack.h ../cryptlib.h ../crypto.h
dsa_key.o: dsa.h
dsa_key.o: ../opensslv.h dsa.h
dsa_lib.o: ../../include/asn1.h ../../include/bio.h ../../include/bn.h
dsa_lib.o: ../../include/buffer.h ../../include/e_os.h ../../include/err.h
dsa_lib.o: ../../include/stack.h ../cryptlib.h ../crypto.h dsa.h
dsa_lib.o: ../../include/stack.h ../cryptlib.h ../crypto.h ../opensslv.h dsa.h
dsa_sign.o: ../../include/asn1.h ../../include/bio.h ../../include/bn.h
dsa_sign.o: ../../include/buffer.h ../../include/e_os.h ../../include/err.h
dsa_sign.o: ../../include/rand.h ../../include/stack.h ../cryptlib.h
dsa_sign.o: ../crypto.h dsa.h
dsa_sign.o: ../crypto.h ../opensslv.h dsa.h
dsa_vrf.o: ../../include/asn1.h ../../include/asn1_mac.h ../../include/bio.h
dsa_vrf.o: ../../include/blowfish.h ../../include/bn.h ../../include/buffer.h
dsa_vrf.o: ../../include/cast.h ../../include/des.h ../../include/dh.h
......@@ -109,4 +109,5 @@ dsa_vrf.o: ../../include/mdc2.h ../../include/objects.h ../../include/pkcs7.h
dsa_vrf.o: ../../include/rand.h ../../include/rc2.h ../../include/rc4.h
dsa_vrf.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h
dsa_vrf.o: ../../include/sha.h ../../include/stack.h ../../include/x509.h
dsa_vrf.o: ../../include/x509_vfy.h ../cryptlib.h ../crypto.h dsa.h
dsa_vrf.o: ../../include/x509_vfy.h ../cryptlib.h ../crypto.h ../opensslv.h
dsa_vrf.o: dsa.h
crypto/dsa/dsa_lib.c
浏览文件 @ b4cadc6e
......@@ -64,7 +64,7 @@
#include "dsa.h"
#include "asn1.h"
char *DSA_version="DSA part of OpenSSL 0.9.2 31-Dec-1998";
char *DSA_version="DSA" OPENSSL_VERSION_PTEXT;
DSA *DSA_new()
{
......
crypto/err/Makefile.ssl
浏览文件 @ b4cadc6e
......@@ -80,7 +80,7 @@ errors:
err.o: ../../include/bio.h ../../include/buffer.h ../../include/e_os.h
err.o: ../../include/lhash.h ../../include/stack.h ../cryptlib.h ../crypto.h
err.o: err.h
err.o: ../opensslv.h err.h
err_all.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
err_all.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
err_all.o: ../../include/conf.h ../../include/des.h ../../include/dh.h
......@@ -90,7 +90,8 @@ err_all.o: ../../include/mdc2.h ../../include/objects.h ../../include/pem2.h
err_all.o: ../../include/pkcs7.h ../../include/rc2.h ../../include/rc4.h
err_all.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h
err_all.o: ../../include/sha.h ../../include/stack.h ../../include/x509.h
err_all.o: ../../include/x509_vfy.h ../../include/x509v3.h ../crypto.h err.h
err_all.o: ../../include/x509_vfy.h ../../include/x509v3.h ../crypto.h
err_all.o: ../opensslv.h err.h
err_prn.o: ../../include/bio.h ../../include/buffer.h ../../include/e_os.h
err_prn.o: ../../include/lhash.h ../../include/stack.h ../cryptlib.h
err_prn.o: ../crypto.h err.h
err_prn.o: ../crypto.h ../opensslv.h err.h
crypto/evp/Makefile.ssl
浏览文件 @ b4cadc6e
此差异已折叠。
crypto/evp/evp_enc.c
浏览文件 @ b4cadc6e
......@@ -60,7 +60,7 @@
#include "cryptlib.h"
#include "evp.h"
char *EVP_version="EVP part of OpenSSL 0.9.2 31-Dec-1998";
char *EVP_version="EVP" OPENSSL_VERSION_PTEXT;
void EVP_CIPHER_CTX_init(ctx)
EVP_CIPHER_CTX *ctx;
......
crypto/hmac/Makefile.ssl
浏览文件 @ b4cadc6e
......@@ -83,6 +83,6 @@ hmac.o: ../../include/bn.h ../../include/cast.h ../../include/crypto.h
hmac.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
hmac.o: ../../include/evp.h ../../include/idea.h ../../include/md2.h
hmac.o: ../../include/md5.h ../../include/mdc2.h ../../include/objects.h
hmac.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h
hmac.o: ../../include/ripemd.h ../../include/rsa.h ../../include/sha.h
hmac.o: ../../include/stack.h hmac.h
hmac.o: ../../include/opensslv.h ../../include/rc2.h ../../include/rc4.h
hmac.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h
hmac.o: ../../include/sha.h ../../include/stack.h hmac.h
crypto/idea/Makefile.ssl
浏览文件 @ b4cadc6e
......@@ -80,6 +80,6 @@ errors:
i_cbc.o: idea.h idea_lcl.h
i_cfb64.o: idea.h idea_lcl.h
i_ecb.o: idea.h idea_lcl.h
i_ecb.o: ../opensslv.h idea.h idea_lcl.h
i_ofb64.o: idea.h idea_lcl.h
i_skey.o: idea.h idea_lcl.h
crypto/idea/i_ecb.c
浏览文件 @ b4cadc6e
......@@ -58,8 +58,9 @@
#include "idea.h"
#include "idea_lcl.h"
#include "opensslv.h"
char *IDEA_version="IDEA part of OpenSSL 0.9.2 31-Dec-1998";
char *IDEA_version="IDEA" OPENSSL_VERSION_PTEXT;
char *idea_options()
{
......
crypto/lhash/Makefile.ssl
浏览文件 @ b4cadc6e
......@@ -80,5 +80,5 @@ errors:
lh_stats.o: ../../include/bio.h ../../include/buffer.h ../../include/e_os.h
lh_stats.o: ../../include/err.h ../../include/stack.h ../cryptlib.h ../crypto.h
lh_stats.o: lhash.h
lhash.o: ../../include/stack.h ../crypto.h lhash.h
lh_stats.o: ../opensslv.h lhash.h
lhash.o: ../../include/stack.h ../crypto.h ../opensslv.h lhash.h
crypto/lhash/lhash.c
浏览文件 @ b4cadc6e
......@@ -56,8 +56,6 @@
* [including the GNU Public Licence.]
*/
char *lh_version="lhash part of OpenSSL 0.9.2 31-Dec-1998";
/* Code for dynamic hash table routines
* Author - Eric Young v 2.0
*
......@@ -102,6 +100,8 @@ char *lh_version="lhash part of OpenSSL 0.9.2 31-Dec-1998";
#include "crypto.h"
#include "lhash.h"
char *lh_version="lhash" OPENSSL_VERSION_PTEXT;
#undef MIN_NODES
#define MIN_NODES 16
#define UP_LOAD (2*LH_LOAD_MULT) /* load times 256 (default 2) */
......
crypto/md2/Makefile.ssl
浏览文件 @ b4cadc6e
......@@ -78,7 +78,7 @@ errors:
# DO NOT DELETE THIS LINE -- make depend depends on it.
md2_dgst.o: md2.h
md2_dgst.o: ../opensslv.h md2.h
md2_one.o: ../../include/bio.h ../../include/buffer.h ../../include/e_os.h
md2_one.o: ../../include/err.h ../../include/stack.h ../cryptlib.h ../crypto.h
md2_one.o: md2.h
md2_one.o: ../opensslv.h md2.h
crypto/md2/md2_dgst.c
浏览文件 @ b4cadc6e
......@@ -60,8 +60,9 @@
#include <stdlib.h>
#include <string.h>
#include "md2.h"
#include "opensslv.h"
char *MD2_version="MD2 part of OpenSSL 0.9.2 31-Dec-1998";
char *MD2_version="MD2" OPENSSL_VERSION_PTEXT;
/* Implemented from RFC1319 The MD2 Message-Digest Algorithm
*/
......
crypto/md5/Makefile.ssl
浏览文件 @ b4cadc6e
......@@ -102,5 +102,5 @@ errors:
# DO NOT DELETE THIS LINE -- make depend depends on it.
md5_dgst.o: md5.h md5_locl.h
md5_dgst.o: ../opensslv.h md5.h md5_locl.h
md5_one.o: md5.h md5_locl.h
crypto/md5/md5_dgst.c
浏览文件 @ b4cadc6e
......@@ -58,8 +58,9 @@
#include <stdio.h>
#include "md5_locl.h"
#include "opensslv.h"
char *MD5_version="MD5 part of OpenSSL 0.9.2 31-Dec-1998";
char *MD5_version="MD5" OPENSSL_VERSION_PTEXT;
/* Implemented from RFC1321 The MD5 Message-Digest Algorithm
*/
......
crypto/mdc2/Makefile.ssl
浏览文件 @ b4cadc6e
......@@ -80,5 +80,5 @@ errors:
mdc2_one.o: ../../include/bio.h ../../include/buffer.h ../../include/des.h
mdc2_one.o: ../../include/e_os.h ../../include/err.h ../../include/stack.h
mdc2_one.o: ../cryptlib.h ../crypto.h mdc2.h
mdc2_one.o: ../cryptlib.h ../crypto.h ../opensslv.h mdc2.h
mdc2dgst.o: ../../include/des.h mdc2.h
crypto/objects/Makefile.ssl
浏览文件 @ b4cadc6e
......@@ -88,16 +88,16 @@ $(ERRC).c: $(ERR).err
# DO NOT DELETE THIS LINE -- make depend depends on it.
o_names.o: ../../include/asn1.h ../../include/bio.h ../../include/bn.h
o_names.o: ../../include/crypto.h ../../include/lhash.h ../../include/stack.h
o_names.o: objects.h
o_names.o: ../../include/crypto.h ../../include/lhash.h
o_names.o: ../../include/opensslv.h ../../include/stack.h objects.h
obj_dat.o: ../../include/asn1.h ../../include/bio.h ../../include/bn.h
obj_dat.o: ../../include/buffer.h ../../include/crypto.h ../../include/e_os.h
obj_dat.o: ../../include/err.h ../../include/lhash.h ../../include/stack.h
obj_dat.o: ../cryptlib.h obj_dat.h objects.h
obj_dat.o: ../../include/err.h ../../include/lhash.h ../../include/opensslv.h
obj_dat.o: ../../include/stack.h ../cryptlib.h obj_dat.h objects.h
obj_err.o: ../../include/asn1.h ../../include/bio.h ../../include/bn.h
obj_err.o: ../../include/crypto.h ../../include/err.h ../../include/stack.h
obj_err.o: objects.h
obj_err.o: ../../include/crypto.h ../../include/err.h ../../include/opensslv.h
obj_err.o: ../../include/stack.h objects.h
obj_lib.o: ../../include/asn1.h ../../include/bio.h ../../include/bn.h
obj_lib.o: ../../include/buffer.h ../../include/crypto.h ../../include/e_os.h
obj_lib.o: ../../include/err.h ../../include/lhash.h ../../include/stack.h
obj_lib.o: ../cryptlib.h objects.h
obj_lib.o: ../../include/err.h ../../include/lhash.h ../../include/opensslv.h
obj_lib.o: ../../include/stack.h ../cryptlib.h objects.h
crypto/opensslv.h 0 → 100644
浏览文件 @ b4cadc6e
#define OPENSSL_VERSION_NUMBER 0x0922 /* Version 0.9.1c is 0913 */
#define OPENSSL_VERSION_TEXT "OpenSSL 0.9.2b 22 Mar 1999"
#define OPENSSL_VERSION_PTEXT " part of " OPENSSL_VERSION_TEXT
crypto/pem/Makefile.ssl
浏览文件 @ b4cadc6e
......@@ -101,68 +101,71 @@ ctx_size.o: ../../include/bn.h ../../include/cast.h ../../include/crypto.h
ctx_size.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
ctx_size.o: ../../include/evp.h ../../include/idea.h ../../include/md2.h
ctx_size.o: ../../include/md5.h ../../include/mdc2.h ../../include/objects.h
ctx_size.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h
ctx_size.o: ../../include/ripemd.h ../../include/rsa.h ../../include/sha.h
ctx_size.o: ../../include/stack.h
ctx_size.o: ../../include/opensslv.h ../../include/rc2.h ../../include/rc4.h
ctx_size.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h
ctx_size.o: ../../include/sha.h ../../include/stack.h
pem_all.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
pem_all.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
pem_all.o: ../../include/crypto.h ../../include/des.h ../../include/dh.h
pem_all.o: ../../include/dsa.h ../../include/e_os.h ../../include/err.h
pem_all.o: ../../include/evp.h ../../include/idea.h ../../include/md2.h
pem_all.o: ../../include/md5.h ../../include/mdc2.h ../../include/objects.h
pem_all.o: ../../include/pkcs7.h ../../include/rc2.h ../../include/rc4.h
pem_all.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h
pem_all.o: ../../include/sha.h ../../include/stack.h ../../include/x509.h
pem_all.o: ../../include/x509_vfy.h ../cryptlib.h pem.h pem2.h
pem_all.o: ../../include/opensslv.h ../../include/pkcs7.h ../../include/rc2.h
pem_all.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
pem_all.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
pem_all.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h pem.h
pem_all.o: pem2.h
pem_err.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
pem_err.o: ../../include/bn.h ../../include/cast.h ../../include/crypto.h
pem_err.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
pem_err.o: ../../include/err.h ../../include/evp.h ../../include/idea.h
pem_err.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
pem_err.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
pem_err.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
pem_err.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
pem_err.o: ../../include/x509.h ../../include/x509_vfy.h pem.h pem2.h
pem_err.o: ../../include/objects.h ../../include/opensslv.h
pem_err.o: ../../include/pkcs7.h ../../include/rc2.h ../../include/rc4.h
pem_err.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h
pem_err.o: ../../include/sha.h ../../include/stack.h ../../include/x509.h
pem_err.o: ../../include/x509_vfy.h pem.h pem2.h
pem_info.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
pem_info.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
pem_info.o: ../../include/crypto.h ../../include/des.h ../../include/dh.h
pem_info.o: ../../include/dsa.h ../../include/e_os.h ../../include/err.h
pem_info.o: ../../include/evp.h ../../include/idea.h ../../include/md2.h
pem_info.o: ../../include/md5.h ../../include/mdc2.h ../../include/objects.h
pem_info.o: ../../include/pkcs7.h ../../include/rc2.h ../../include/rc4.h
pem_info.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h
pem_info.o: ../../include/sha.h ../../include/stack.h ../../include/x509.h
pem_info.o: ../../include/x509_vfy.h ../cryptlib.h pem.h pem2.h
pem_info.o: ../../include/opensslv.h ../../include/pkcs7.h ../../include/rc2.h
pem_info.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
pem_info.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
pem_info.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h pem.h
pem_info.o: pem2.h
pem_lib.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
pem_lib.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
pem_lib.o: ../../include/crypto.h ../../include/des.h ../../include/dh.h
pem_lib.o: ../../include/dsa.h ../../include/e_os.h ../../include/err.h
pem_lib.o: ../../include/evp.h ../../include/idea.h ../../include/md2.h
pem_lib.o: ../../include/md5.h ../../include/mdc2.h ../../include/objects.h
pem_lib.o: ../../include/pkcs7.h ../../include/rand.h ../../include/rc2.h
pem_lib.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
pem_lib.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
pem_lib.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h pem.h
pem_lib.o: pem2.h
pem_lib.o: ../../include/opensslv.h ../../include/pkcs7.h ../../include/rand.h
pem_lib.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h
pem_lib.o: ../../include/ripemd.h ../../include/rsa.h ../../include/sha.h
pem_lib.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
pem_lib.o: ../cryptlib.h pem.h pem2.h
pem_seal.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
pem_seal.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
pem_seal.o: ../../include/crypto.h ../../include/des.h ../../include/dh.h
pem_seal.o: ../../include/dsa.h ../../include/e_os.h ../../include/err.h
pem_seal.o: ../../include/evp.h ../../include/idea.h ../../include/md2.h
pem_seal.o: ../../include/md5.h ../../include/mdc2.h ../../include/objects.h
pem_seal.o: ../../include/pkcs7.h ../../include/rand.h ../../include/rc2.h
pem_seal.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
pem_seal.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
pem_seal.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h pem.h
pem_seal.o: pem2.h
pem_seal.o: ../../include/opensslv.h ../../include/pkcs7.h ../../include/rand.h
pem_seal.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h
pem_seal.o: ../../include/ripemd.h ../../include/rsa.h ../../include/sha.h
pem_seal.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
pem_seal.o: ../cryptlib.h pem.h pem2.h
pem_sign.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
pem_sign.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
pem_sign.o: ../../include/crypto.h ../../include/des.h ../../include/dh.h
pem_sign.o: ../../include/dsa.h ../../include/e_os.h ../../include/err.h
pem_sign.o: ../../include/evp.h ../../include/idea.h ../../include/md2.h
pem_sign.o: ../../include/md5.h ../../include/mdc2.h ../../include/objects.h
pem_sign.o: ../../include/pkcs7.h ../../include/rand.h ../../include/rc2.h
pem_sign.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
pem_sign.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
pem_sign.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h pem.h
pem_sign.o: pem2.h
pem_sign.o: ../../include/opensslv.h ../../include/pkcs7.h ../../include/rand.h
pem_sign.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h
pem_sign.o: ../../include/ripemd.h ../../include/rsa.h ../../include/sha.h
pem_sign.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
pem_sign.o: ../cryptlib.h pem.h pem2.h
crypto/pem/pem_lib.c
浏览文件 @ b4cadc6e
......@@ -68,7 +68,7 @@
#include "des.h"
#endif
char *PEM_version="PEM part of OpenSSL 0.9.2 31-Dec-1998";
char *PEM_version="PEM" OPENSSL_VERSION_PTEXT;
#define MIN_LENGTH 4
......
crypto/pkcs7/Makefile.ssl
浏览文件 @ b4cadc6e
......@@ -95,7 +95,7 @@ pk7_doit.o: ../../include/mdc2.h ../../include/objects.h ../../include/rand.h
pk7_doit.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h
pk7_doit.o: ../../include/ripemd.h ../../include/rsa.h ../../include/sha.h
pk7_doit.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
pk7_doit.o: ../cryptlib.h ../crypto.h pkcs7.h
pk7_doit.o: ../cryptlib.h ../crypto.h ../opensslv.h pkcs7.h
pk7_lib.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
pk7_lib.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
pk7_lib.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
......@@ -105,7 +105,7 @@ pk7_lib.o: ../../include/mdc2.h ../../include/objects.h ../../include/rc2.h
pk7_lib.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
pk7_lib.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
pk7_lib.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
pk7_lib.o: ../crypto.h pkcs7.h
pk7_lib.o: ../crypto.h ../opensslv.h pkcs7.h
pkcs7err.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
pkcs7err.o: ../../include/bn.h ../../include/cast.h ../../include/des.h
pkcs7err.o: ../../include/dh.h ../../include/dsa.h ../../include/err.h
......@@ -114,4 +114,4 @@ pkcs7err.o: ../../include/md5.h ../../include/mdc2.h ../../include/objects.h
pkcs7err.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h
pkcs7err.o: ../../include/ripemd.h ../../include/rsa.h ../../include/sha.h
pkcs7err.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
pkcs7err.o: ../crypto.h pkcs7.h
pkcs7err.o: ../crypto.h ../opensslv.h pkcs7.h
crypto/rand/Makefile.ssl
浏览文件 @ b4cadc6e
......@@ -79,6 +79,6 @@ errors:
# DO NOT DELETE THIS LINE -- make depend depends on it.
md_rand.o: ../../include/e_os.h ../../include/md5.h ../../include/stack.h
md_rand.o: ../crypto.h rand.h
md_rand.o: ../crypto.h ../opensslv.h rand.h
rand_lib.o: rand.h
randfile.o: ../../include/e_os.h rand.h
crypto/rand/md_rand.c
浏览文件 @ b4cadc6e
......@@ -128,7 +128,7 @@ static unsigned char state[STATE_SIZE+MD_DIGEST_LENGTH];
static unsigned char md[MD_DIGEST_LENGTH];
static long md_count[2]={0,0};
char *RAND_version="RAND part of OpenSSL 0.9.2 31-Dec-1998";
char *RAND_version="RAND" OPENSSL_VERSION_PTEXT;
static void ssleay_rand_cleanup(void);
static void ssleay_rand_seed(const void *buf, int num);
......
crypto/rc2/Makefile.ssl
浏览文件 @ b4cadc6e
......@@ -79,7 +79,7 @@ errors:
# DO NOT DELETE THIS LINE -- make depend depends on it.
rc2_cbc.o: rc2.h rc2_locl.h
rc2_ecb.o: rc2.h rc2_locl.h
rc2_ecb.o: ../opensslv.h rc2.h rc2_locl.h
rc2_skey.o: rc2.h rc2_locl.h
rc2cfb64.o: rc2.h rc2_locl.h
rc2ofb64.o: rc2.h rc2_locl.h
crypto/rc2/rc2_ecb.c
浏览文件 @ b4cadc6e
......@@ -58,8 +58,9 @@
#include "rc2.h"
#include "rc2_locl.h"
#include "opensslv.h"
char *RC2_version="RC2 part of OpenSSL 0.9.2 31-Dec-1998";
char *RC2_version="RC2" OPENSSL_VERSION_PTEXT;
/* RC2 as implemented frm a posting from
* Newsgroups: sci.crypt
......
crypto/rc4/Makefile.ssl
浏览文件 @ b4cadc6e
......@@ -107,4 +107,4 @@ errors:
# DO NOT DELETE THIS LINE -- make depend depends on it.
rc4_enc.o: rc4.h rc4_locl.h
rc4_skey.o: rc4.h rc4_locl.h
rc4_skey.o: ../opensslv.h rc4.h rc4_locl.h
crypto/rc4/rc4_skey.c
浏览文件 @ b4cadc6e
......@@ -58,8 +58,9 @@
#include "rc4.h"
#include "rc4_locl.h"
#include "opensslv.h"
char *RC4_version="RC4 part of OpenSSL 0.9.2 31-Dec-1998";
char *RC4_version="RC4" OPENSSL_VERSION_PTEXT;
char *RC4_options()
{
......
crypto/rc5/Makefile.ssl
浏览文件 @ b4cadc6e
......@@ -104,7 +104,7 @@ errors:
# DO NOT DELETE THIS LINE -- make depend depends on it.
rc5_ecb.o: rc5.h rc5_locl.h
rc5_ecb.o: ../opensslv.h rc5.h rc5_locl.h
rc5_enc.o: rc5.h rc5_locl.h
rc5_skey.o: rc5.h rc5_locl.h
rc5cfb64.o: rc5.h rc5_locl.h
......
crypto/rc5/rc5_ecb.c
浏览文件 @ b4cadc6e
......@@ -58,8 +58,9 @@
#include "rc5.h"
#include "rc5_locl.h"
#include "opensslv.h"
char *RC5_version="RC5 part of OpenSSL 0.9.2 31-Dec-1998";
char *RC5_version="RC5" OPENSSL_VERSION_PTEXT;
void RC5_32_ecb_encrypt(in, out, ks, encrypt)
unsigned char *in;
......
crypto/ripemd/Makefile.ssl
浏览文件 @ b4cadc6e
......@@ -102,5 +102,5 @@ errors:
# DO NOT DELETE THIS LINE -- make depend depends on it.
rmd_dgst.o: ripemd.h rmd_locl.h rmdconst.h
rmd_dgst.o: ../opensslv.h ripemd.h rmd_locl.h rmdconst.h
rmd_one.o: ripemd.h rmd_locl.h rmdconst.h
crypto/ripemd/rmd_dgst.c
浏览文件 @ b4cadc6e
......@@ -58,8 +58,9 @@
#include <stdio.h>
#include "rmd_locl.h"
#include "opensslv.h"
char *RMD160_version="RIPE-MD160 part of OpenSSL 0.9.2 31-Dec-1998";
char *RMD160_version="RIPE-MD160" OPENSSL_VERSION_PTEXT;
#ifndef NOPROTO
# ifdef RMD160_ASM
......
crypto/rsa/Makefile.ssl
浏览文件 @ b4cadc6e
......@@ -88,25 +88,25 @@ $(ERRC).c: $(ERR).err $(ERR).h
rsa_eay.o: ../../include/bio.h ../../include/bn.h ../../include/buffer.h
rsa_eay.o: ../../include/e_os.h ../../include/err.h ../../include/rand.h
rsa_eay.o: ../../include/stack.h ../cryptlib.h ../crypto.h rsa.h
rsa_eay.o: ../../include/stack.h ../cryptlib.h ../crypto.h ../opensslv.h rsa.h
rsa_err.o: ../../include/bn.h ../../include/err.h ../../include/stack.h
rsa_err.o: ../crypto.h rsa.h
rsa_err.o: ../crypto.h ../opensslv.h rsa.h
rsa_gen.o: ../../include/bio.h ../../include/bn.h ../../include/buffer.h
rsa_gen.o: ../../include/e_os.h ../../include/err.h ../../include/stack.h
rsa_gen.o: ../cryptlib.h ../crypto.h rsa.h
rsa_gen.o: ../cryptlib.h ../crypto.h ../opensslv.h rsa.h
rsa_lib.o: ../../include/bio.h ../../include/bn.h ../../include/buffer.h
rsa_lib.o: ../../include/e_os.h ../../include/err.h ../../include/lhash.h
rsa_lib.o: ../../include/stack.h ../cryptlib.h ../crypto.h rsa.h
rsa_lib.o: ../../include/stack.h ../cryptlib.h ../crypto.h ../opensslv.h rsa.h
rsa_none.o: ../../include/bio.h ../../include/bn.h ../../include/buffer.h
rsa_none.o: ../../include/e_os.h ../../include/err.h ../../include/rand.h
rsa_none.o: ../../include/stack.h ../cryptlib.h ../crypto.h rsa.h
rsa_none.o: ../../include/stack.h ../cryptlib.h ../crypto.h ../opensslv.h rsa.h
rsa_oaep.o: ../../include/bio.h ../../include/bn.h ../../include/buffer.h
rsa_oaep.o: ../../include/e_os.h ../../include/err.h ../../include/rand.h
rsa_oaep.o: ../../include/sha.h ../../include/stack.h ../cryptlib.h ../crypto.h
rsa_oaep.o: rsa.h
rsa_oaep.o: ../opensslv.h rsa.h
rsa_pk1.o: ../../include/bio.h ../../include/bn.h ../../include/buffer.h
rsa_pk1.o: ../../include/e_os.h ../../include/err.h ../../include/rand.h
rsa_pk1.o: ../../include/stack.h ../cryptlib.h ../crypto.h rsa.h
rsa_pk1.o: ../../include/stack.h ../cryptlib.h ../crypto.h ../opensslv.h rsa.h
rsa_saos.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
rsa_saos.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
rsa_saos.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
......@@ -116,7 +116,7 @@ rsa_saos.o: ../../include/mdc2.h ../../include/objects.h ../../include/pkcs7.h
rsa_saos.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h
rsa_saos.o: ../../include/ripemd.h ../../include/sha.h ../../include/stack.h
rsa_saos.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
rsa_saos.o: ../crypto.h rsa.h
rsa_saos.o: ../crypto.h ../opensslv.h rsa.h
rsa_sign.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
rsa_sign.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
rsa_sign.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
......@@ -126,7 +126,7 @@ rsa_sign.o: ../../include/mdc2.h ../../include/objects.h ../../include/pkcs7.h
rsa_sign.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h
rsa_sign.o: ../../include/ripemd.h ../../include/sha.h ../../include/stack.h
rsa_sign.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
rsa_sign.o: ../crypto.h rsa.h
rsa_sign.o: ../crypto.h ../opensslv.h rsa.h
rsa_ssl.o: ../../include/bio.h ../../include/bn.h ../../include/buffer.h
rsa_ssl.o: ../../include/e_os.h ../../include/err.h ../../include/rand.h
rsa_ssl.o: ../../include/stack.h ../cryptlib.h ../crypto.h rsa.h
rsa_ssl.o: ../../include/stack.h ../cryptlib.h ../crypto.h ../opensslv.h rsa.h
crypto/rsa/rsa_lib.c
浏览文件 @ b4cadc6e
......@@ -63,7 +63,7 @@
#include "bn.h"
#include "rsa.h"
char *RSA_version="RSA part of OpenSSL 0.9.2 31-Dec-1998";
char *RSA_version="RSA" OPENSSL_VERSION_PTEXT;
static RSA_METHOD *default_RSA_meth=NULL;
static int rsa_meth_num=0;
......
crypto/sha/Makefile.ssl
浏览文件 @ b4cadc6e
......@@ -102,6 +102,6 @@ errors:
# DO NOT DELETE THIS LINE -- make depend depends on it.
sha1_one.o: sha.h
sha1dgst.o: sha.h sha_locl.h
sha_dgst.o: sha.h sha_locl.h
sha1dgst.o: ../opensslv.h sha.h sha_locl.h
sha_dgst.o: ../opensslv.h sha.h sha_locl.h
sha_one.o: sha.h
crypto/sha/sha1dgst.c
浏览文件 @ b4cadc6e
......@@ -62,8 +62,9 @@
#define SHA_1
#include "sha.h"
#include "sha_locl.h"
#include "opensslv.h"
char *SHA1_version="SHA1 part of OpenSSL 0.9.2 31-Dec-1998";
char *SHA1_version="SHA1" OPENSSL_VERSION_PTEXT;
/* Implemented from SHA-1 document - The Secure Hash Algorithm
*/
......
crypto/sha/sha_dgst.c
浏览文件 @ b4cadc6e
......@@ -62,8 +62,9 @@
#undef SHA_1
#include "sha.h"
#include "sha_locl.h"
#include "opensslv.h"
char *SHA_version="SHA part of OpenSSL 0.9.2 31-Dec-1998";
char *SHA_version="SHA" OPENSSL_VERSION_PTEXT;
/* Implemented from SHA-0 document - The Secure Hash Algorithm
*/
......
crypto/stack/Makefile.ssl
浏览文件 @ b4cadc6e
......@@ -79,4 +79,4 @@ errors:
# DO NOT DELETE THIS LINE -- make depend depends on it.
stack.o: ../../include/bio.h ../../include/buffer.h ../../include/e_os.h
stack.o: ../../include/err.h ../cryptlib.h ../crypto.h stack.h
stack.o: ../../include/err.h ../cryptlib.h ../crypto.h ../opensslv.h stack.h
crypto/stack/stack.c
浏览文件 @ b4cadc6e
......@@ -72,7 +72,7 @@
#undef MIN_NODES
#define MIN_NODES 4
char *STACK_version="Stack part of OpenSSL 0.9.2 31-Dec-1998";
char *STACK_version="Stack" OPENSSL_VERSION_PTEXT;
#ifndef NOPROTO
#define FP_ICC (int (*)(const void *,const void *))
......
crypto/txt_db/Makefile.ssl
浏览文件 @ b4cadc6e
......@@ -80,4 +80,4 @@ errors:
txt_db.o: ../../include/bio.h ../../include/buffer.h ../../include/e_os.h
txt_db.o: ../../include/err.h ../../include/lhash.h ../../include/stack.h
txt_db.o: ../cryptlib.h ../crypto.h txt_db.h
txt_db.o: ../cryptlib.h ../crypto.h ../opensslv.h txt_db.h
crypto/txt_db/txt_db.c
浏览文件 @ b4cadc6e
......@@ -66,7 +66,7 @@
#undef BUFSIZE
#define BUFSIZE 512
char *TXT_DB_version="TXT_DB part of OpenSSL 0.9.2 31-Dec-1998";
char *TXT_DB_version="TXT_DB" OPENSSL_VERSION_PTEXT;
TXT_DB *TXT_DB_read(in,num)
BIO *in;
......
crypto/x509/Makefile.ssl
浏览文件 @ b4cadc6e
......@@ -105,7 +105,7 @@ by_dir.o: ../../include/md5.h ../../include/mdc2.h ../../include/objects.h
by_dir.o: ../../include/pkcs7.h ../../include/rc2.h ../../include/rc4.h
by_dir.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h
by_dir.o: ../../include/sha.h ../../include/stack.h ../cryptlib.h ../crypto.h
by_dir.o: x509.h x509_vfy.h
by_dir.o: ../opensslv.h x509.h x509_vfy.h
by_file.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
by_file.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
by_file.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
......@@ -115,7 +115,8 @@ by_file.o: ../../include/md5.h ../../include/mdc2.h ../../include/objects.h
by_file.o: ../../include/pem.h ../../include/pem2.h ../../include/pkcs7.h
by_file.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h
by_file.o: ../../include/ripemd.h ../../include/rsa.h ../../include/sha.h
by_file.o: ../../include/stack.h ../cryptlib.h ../crypto.h x509.h x509_vfy.h
by_file.o: ../../include/stack.h ../cryptlib.h ../crypto.h ../opensslv.h x509.h
by_file.o: x509_vfy.h
v3_net.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
v3_net.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
v3_net.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
......@@ -124,7 +125,8 @@ v3_net.o: ../../include/idea.h ../../include/md2.h ../../include/md5.h
v3_net.o: ../../include/mdc2.h ../../include/objects.h ../../include/pkcs7.h
v3_net.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h
v3_net.o: ../../include/ripemd.h ../../include/rsa.h ../../include/sha.h
v3_net.o: ../../include/stack.h ../cryptlib.h ../crypto.h x509.h x509_vfy.h
v3_net.o: ../../include/stack.h ../cryptlib.h ../crypto.h ../opensslv.h x509.h
v3_net.o: x509_vfy.h
v3_x509.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
v3_x509.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
v3_x509.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
......@@ -133,7 +135,8 @@ v3_x509.o: ../../include/idea.h ../../include/md2.h ../../include/md5.h
v3_x509.o: ../../include/mdc2.h ../../include/objects.h ../../include/pkcs7.h
v3_x509.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h
v3_x509.o: ../../include/ripemd.h ../../include/rsa.h ../../include/sha.h
v3_x509.o: ../../include/stack.h ../cryptlib.h ../crypto.h x509.h x509_vfy.h
v3_x509.o: ../../include/stack.h ../cryptlib.h ../crypto.h ../opensslv.h x509.h
v3_x509.o: x509_vfy.h
x509_cmp.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
x509_cmp.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
x509_cmp.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
......@@ -142,7 +145,8 @@ x509_cmp.o: ../../include/idea.h ../../include/md2.h ../../include/md5.h
x509_cmp.o: ../../include/mdc2.h ../../include/objects.h ../../include/pkcs7.h
x509_cmp.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h
x509_cmp.o: ../../include/ripemd.h ../../include/rsa.h ../../include/sha.h
x509_cmp.o: ../../include/stack.h ../cryptlib.h ../crypto.h x509.h x509_vfy.h
x509_cmp.o: ../../include/stack.h ../cryptlib.h ../crypto.h ../opensslv.h
x509_cmp.o: x509.h x509_vfy.h
x509_d2.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
x509_d2.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
x509_d2.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
......@@ -151,7 +155,8 @@ x509_d2.o: ../../include/idea.h ../../include/md2.h ../../include/md5.h
x509_d2.o: ../../include/mdc2.h ../../include/objects.h ../../include/pkcs7.h
x509_d2.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h
x509_d2.o: ../../include/ripemd.h ../../include/rsa.h ../../include/sha.h
x509_d2.o: ../../include/stack.h ../cryptlib.h ../crypto.h x509.h x509_vfy.h
x509_d2.o: ../../include/stack.h ../cryptlib.h ../crypto.h ../opensslv.h x509.h
x509_d2.o: x509_vfy.h
x509_def.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
x509_def.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
x509_def.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
......@@ -160,7 +165,8 @@ x509_def.o: ../../include/idea.h ../../include/md2.h ../../include/md5.h
x509_def.o: ../../include/mdc2.h ../../include/objects.h ../../include/pkcs7.h
x509_def.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h
x509_def.o: ../../include/ripemd.h ../../include/rsa.h ../../include/sha.h
x509_def.o: ../../include/stack.h ../cryptlib.h ../crypto.h x509.h x509_vfy.h
x509_def.o: ../../include/stack.h ../cryptlib.h ../crypto.h ../opensslv.h
x509_def.o: x509.h x509_vfy.h
x509_err.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
x509_err.o: ../../include/bn.h ../../include/cast.h ../../include/des.h
x509_err.o: ../../include/dh.h ../../include/dsa.h ../../include/err.h
......@@ -168,8 +174,8 @@ x509_err.o: ../../include/evp.h ../../include/idea.h ../../include/md2.h
x509_err.o: ../../include/md5.h ../../include/mdc2.h ../../include/objects.h
x509_err.o: ../../include/pkcs7.h ../../include/rc2.h ../../include/rc4.h
x509_err.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h
x509_err.o: ../../include/sha.h ../../include/stack.h ../crypto.h x509.h
x509_err.o: x509_vfy.h
x509_err.o: ../../include/sha.h ../../include/stack.h ../crypto.h ../opensslv.h
x509_err.o: x509.h x509_vfy.h
x509_ext.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
x509_ext.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
x509_ext.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
......@@ -178,7 +184,8 @@ x509_ext.o: ../../include/idea.h ../../include/md2.h ../../include/md5.h
x509_ext.o: ../../include/mdc2.h ../../include/objects.h ../../include/pkcs7.h
x509_ext.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h
x509_ext.o: ../../include/ripemd.h ../../include/rsa.h ../../include/sha.h
x509_ext.o: ../../include/stack.h ../cryptlib.h ../crypto.h x509.h x509_vfy.h
x509_ext.o: ../../include/stack.h ../cryptlib.h ../crypto.h ../opensslv.h
x509_ext.o: x509.h x509_vfy.h
x509_lu.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
x509_lu.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
x509_lu.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
......@@ -188,7 +195,7 @@ x509_lu.o: ../../include/md5.h ../../include/mdc2.h ../../include/objects.h
x509_lu.o: ../../include/pkcs7.h ../../include/rc2.h ../../include/rc4.h
x509_lu.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h
x509_lu.o: ../../include/sha.h ../../include/stack.h ../cryptlib.h ../crypto.h
x509_lu.o: x509.h x509_vfy.h
x509_lu.o: ../opensslv.h x509.h x509_vfy.h
x509_obj.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
x509_obj.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
x509_obj.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
......@@ -198,7 +205,7 @@ x509_obj.o: ../../include/md5.h ../../include/mdc2.h ../../include/objects.h
x509_obj.o: ../../include/pkcs7.h ../../include/rc2.h ../../include/rc4.h
x509_obj.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h
x509_obj.o: ../../include/sha.h ../../include/stack.h ../cryptlib.h ../crypto.h
x509_obj.o: x509.h x509_vfy.h
x509_obj.o: ../opensslv.h x509.h x509_vfy.h
x509_r2x.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
x509_r2x.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
x509_r2x.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
......@@ -207,7 +214,8 @@ x509_r2x.o: ../../include/idea.h ../../include/md2.h ../../include/md5.h
x509_r2x.o: ../../include/mdc2.h ../../include/objects.h ../../include/pkcs7.h
x509_r2x.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h
x509_r2x.o: ../../include/ripemd.h ../../include/rsa.h ../../include/sha.h
x509_r2x.o: ../../include/stack.h ../cryptlib.h ../crypto.h x509.h x509_vfy.h
x509_r2x.o: ../../include/stack.h ../cryptlib.h ../crypto.h ../opensslv.h
x509_r2x.o: x509.h x509_vfy.h
x509_req.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
x509_req.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
x509_req.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
......@@ -217,7 +225,7 @@ x509_req.o: ../../include/mdc2.h ../../include/objects.h ../../include/pem.h
x509_req.o: ../../include/pem2.h ../../include/pkcs7.h ../../include/rc2.h
x509_req.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
x509_req.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
x509_req.o: ../cryptlib.h ../crypto.h x509.h x509_vfy.h
x509_req.o: ../cryptlib.h ../crypto.h ../opensslv.h x509.h x509_vfy.h
x509_set.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
x509_set.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
x509_set.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
......@@ -226,7 +234,8 @@ x509_set.o: ../../include/idea.h ../../include/md2.h ../../include/md5.h
x509_set.o: ../../include/mdc2.h ../../include/objects.h ../../include/pkcs7.h
x509_set.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h
x509_set.o: ../../include/ripemd.h ../../include/rsa.h ../../include/sha.h
x509_set.o: ../../include/stack.h ../cryptlib.h ../crypto.h x509.h x509_vfy.h
x509_set.o: ../../include/stack.h ../cryptlib.h ../crypto.h ../opensslv.h
x509_set.o: x509.h x509_vfy.h
x509_txt.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
x509_txt.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
x509_txt.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
......@@ -236,7 +245,7 @@ x509_txt.o: ../../include/md5.h ../../include/mdc2.h ../../include/objects.h
x509_txt.o: ../../include/pkcs7.h ../../include/rc2.h ../../include/rc4.h
x509_txt.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h
x509_txt.o: ../../include/sha.h ../../include/stack.h ../cryptlib.h ../crypto.h
x509_txt.o: x509.h x509_vfy.h
x509_txt.o: ../opensslv.h x509.h x509_vfy.h
x509_v3.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
x509_v3.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
x509_v3.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
......@@ -245,7 +254,8 @@ x509_v3.o: ../../include/idea.h ../../include/md2.h ../../include/md5.h
x509_v3.o: ../../include/mdc2.h ../../include/objects.h ../../include/pkcs7.h
x509_v3.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h
x509_v3.o: ../../include/ripemd.h ../../include/rsa.h ../../include/sha.h
x509_v3.o: ../../include/stack.h ../cryptlib.h ../crypto.h x509.h x509_vfy.h
x509_v3.o: ../../include/stack.h ../cryptlib.h ../crypto.h ../opensslv.h x509.h
x509_v3.o: x509_vfy.h
x509_vfy.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
x509_vfy.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
x509_vfy.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
......@@ -255,7 +265,7 @@ x509_vfy.o: ../../include/md5.h ../../include/mdc2.h ../../include/objects.h
x509_vfy.o: ../../include/pkcs7.h ../../include/rc2.h ../../include/rc4.h
x509_vfy.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h
x509_vfy.o: ../../include/sha.h ../../include/stack.h ../cryptlib.h ../crypto.h
x509_vfy.o: x509.h x509_vfy.h
x509_vfy.o: ../opensslv.h x509.h x509_vfy.h
x509name.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
x509name.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
x509name.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
......@@ -264,7 +274,8 @@ x509name.o: ../../include/idea.h ../../include/md2.h ../../include/md5.h
x509name.o: ../../include/mdc2.h ../../include/objects.h ../../include/pkcs7.h
x509name.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h
x509name.o: ../../include/ripemd.h ../../include/rsa.h ../../include/sha.h
x509name.o: ../../include/stack.h ../cryptlib.h ../crypto.h x509.h x509_vfy.h
x509name.o: ../../include/stack.h ../cryptlib.h ../crypto.h ../opensslv.h
x509name.o: x509.h x509_vfy.h
x509pack.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
x509pack.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
x509pack.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
......@@ -273,7 +284,8 @@ x509pack.o: ../../include/idea.h ../../include/md2.h ../../include/md5.h
x509pack.o: ../../include/mdc2.h ../../include/objects.h ../../include/pkcs7.h
x509pack.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h
x509pack.o: ../../include/ripemd.h ../../include/rsa.h ../../include/sha.h
x509pack.o: ../../include/stack.h ../cryptlib.h ../crypto.h x509.h x509_vfy.h
x509pack.o: ../../include/stack.h ../cryptlib.h ../crypto.h ../opensslv.h
x509pack.o: x509.h x509_vfy.h
x509rset.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
x509rset.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
x509rset.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
......@@ -282,7 +294,8 @@ x509rset.o: ../../include/idea.h ../../include/md2.h ../../include/md5.h
x509rset.o: ../../include/mdc2.h ../../include/objects.h ../../include/pkcs7.h
x509rset.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h
x509rset.o: ../../include/ripemd.h ../../include/rsa.h ../../include/sha.h
x509rset.o: ../../include/stack.h ../cryptlib.h ../crypto.h x509.h x509_vfy.h
x509rset.o: ../../include/stack.h ../cryptlib.h ../crypto.h ../opensslv.h
x509rset.o: x509.h x509_vfy.h
x509type.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
x509type.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
x509type.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
......@@ -291,7 +304,8 @@ x509type.o: ../../include/idea.h ../../include/md2.h ../../include/md5.h
x509type.o: ../../include/mdc2.h ../../include/objects.h ../../include/pkcs7.h
x509type.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h
x509type.o: ../../include/ripemd.h ../../include/rsa.h ../../include/sha.h
x509type.o: ../../include/stack.h ../cryptlib.h ../crypto.h x509.h x509_vfy.h
x509type.o: ../../include/stack.h ../cryptlib.h ../crypto.h ../opensslv.h
x509type.o: x509.h x509_vfy.h
x_all.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
x_all.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
x_all.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
......@@ -300,4 +314,5 @@ x_all.o: ../../include/idea.h ../../include/md2.h ../../include/md5.h
x_all.o: ../../include/mdc2.h ../../include/objects.h ../../include/pkcs7.h
x_all.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h
x_all.o: ../../include/ripemd.h ../../include/rsa.h ../../include/sha.h
x_all.o: ../../include/stack.h ../cryptlib.h ../crypto.h x509.h x509_vfy.h
x_all.o: ../../include/stack.h ../cryptlib.h ../crypto.h ../opensslv.h x509.h
x_all.o: x509_vfy.h
crypto/x509/x509_vfy.c
浏览文件 @ b4cadc6e
......@@ -79,7 +79,8 @@ static int null_callback();
static int internal_verify();
#endif
char *X509_version="X.509 part of OpenSSL 0.9.2 31-Dec-1998";
char *X509_version="X.509" OPENSSL_VERSION_PTEXT;
static STACK *x509_store_ctx_method=NULL;
static int x509_store_ctx_num=0;
#if 0
......
crypto/x509v3/Makefile.ssl
浏览文件 @ b4cadc6e
......@@ -98,7 +98,7 @@ v3_akey.o: ../../include/mdc2.h ../../include/objects.h ../../include/pkcs7.h
v3_akey.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h
v3_akey.o: ../../include/ripemd.h ../../include/rsa.h ../../include/sha.h
v3_akey.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
v3_akey.o: ../cryptlib.h ../crypto.h x509v3.h
v3_akey.o: ../cryptlib.h ../crypto.h ../opensslv.h x509v3.h
v3_alt.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
v3_alt.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
v3_alt.o: ../../include/conf.h ../../include/des.h ../../include/dh.h
......@@ -109,7 +109,7 @@ v3_alt.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
v3_alt.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
v3_alt.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
v3_alt.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
v3_alt.o: ../crypto.h x509v3.h
v3_alt.o: ../crypto.h ../opensslv.h x509v3.h
v3_bcons.o: ../../include/asn1.h ../../include/asn1_mac.h ../../include/bio.h
v3_bcons.o: ../../include/blowfish.h ../../include/bn.h ../../include/buffer.h
v3_bcons.o: ../../include/cast.h ../../include/conf.h ../../include/des.h
......@@ -120,7 +120,7 @@ v3_bcons.o: ../../include/mdc2.h ../../include/objects.h ../../include/pkcs7.h
v3_bcons.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h
v3_bcons.o: ../../include/ripemd.h ../../include/rsa.h ../../include/sha.h
v3_bcons.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
v3_bcons.o: ../cryptlib.h ../crypto.h x509v3.h
v3_bcons.o: ../cryptlib.h ../crypto.h ../opensslv.h x509v3.h
v3_bitst.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
v3_bitst.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
v3_bitst.o: ../../include/conf.h ../../include/des.h ../../include/dh.h
......@@ -131,7 +131,7 @@ v3_bitst.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
v3_bitst.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
v3_bitst.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
v3_bitst.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
v3_bitst.o: ../crypto.h x509v3.h
v3_bitst.o: ../crypto.h ../opensslv.h x509v3.h
v3_conf.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
v3_conf.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
v3_conf.o: ../../include/conf.h ../../include/des.h ../../include/dh.h
......@@ -142,7 +142,7 @@ v3_conf.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
v3_conf.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
v3_conf.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
v3_conf.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
v3_conf.o: ../crypto.h x509v3.h
v3_conf.o: ../crypto.h ../opensslv.h x509v3.h
v3_enum.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
v3_enum.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
v3_enum.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
......@@ -152,7 +152,7 @@ v3_enum.o: ../../include/mdc2.h ../../include/objects.h ../../include/pkcs7.h
v3_enum.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h
v3_enum.o: ../../include/ripemd.h ../../include/rsa.h ../../include/sha.h
v3_enum.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
v3_enum.o: ../cryptlib.h ../crypto.h x509v3.h
v3_enum.o: ../cryptlib.h ../crypto.h ../opensslv.h x509v3.h
v3_extku.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
v3_extku.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
v3_extku.o: ../../include/conf.h ../../include/des.h ../../include/dh.h
......@@ -163,7 +163,7 @@ v3_extku.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
v3_extku.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
v3_extku.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
v3_extku.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
v3_extku.o: ../crypto.h x509v3.h
v3_extku.o: ../crypto.h ../opensslv.h x509v3.h
v3_genn.o: ../../include/asn1.h ../../include/asn1_mac.h ../../include/bio.h
v3_genn.o: ../../include/blowfish.h ../../include/bn.h ../../include/buffer.h
v3_genn.o: ../../include/cast.h ../../include/conf.h ../../include/des.h
......@@ -174,7 +174,7 @@ v3_genn.o: ../../include/mdc2.h ../../include/objects.h ../../include/pkcs7.h
v3_genn.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h
v3_genn.o: ../../include/ripemd.h ../../include/rsa.h ../../include/sha.h
v3_genn.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
v3_genn.o: ../cryptlib.h ../crypto.h x509v3.h
v3_genn.o: ../cryptlib.h ../crypto.h ../opensslv.h x509v3.h
v3_ia5.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
v3_ia5.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
v3_ia5.o: ../../include/conf.h ../../include/des.h ../../include/dh.h
......@@ -185,7 +185,7 @@ v3_ia5.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
v3_ia5.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
v3_ia5.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
v3_ia5.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
v3_ia5.o: ../crypto.h x509v3.h
v3_ia5.o: ../crypto.h ../opensslv.h x509v3.h
v3_int.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
v3_int.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
v3_int.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
......@@ -195,7 +195,7 @@ v3_int.o: ../../include/mdc2.h ../../include/objects.h ../../include/pkcs7.h
v3_int.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h
v3_int.o: ../../include/ripemd.h ../../include/rsa.h ../../include/sha.h
v3_int.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
v3_int.o: ../cryptlib.h ../crypto.h x509v3.h
v3_int.o: ../cryptlib.h ../crypto.h ../opensslv.h x509v3.h
v3_lib.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
v3_lib.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
v3_lib.o: ../../include/conf.h ../../include/des.h ../../include/dh.h
......@@ -206,7 +206,7 @@ v3_lib.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
v3_lib.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
v3_lib.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
v3_lib.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
v3_lib.o: ../crypto.h x509v3.h
v3_lib.o: ../crypto.h ../opensslv.h x509v3.h
v3_pku.o: ../../include/asn1.h ../../include/asn1_mac.h ../../include/bio.h
v3_pku.o: ../../include/blowfish.h ../../include/bn.h ../../include/buffer.h
v3_pku.o: ../../include/cast.h ../../include/des.h ../../include/dh.h
......@@ -216,7 +216,8 @@ v3_pku.o: ../../include/md5.h ../../include/mdc2.h ../../include/objects.h
v3_pku.o: ../../include/pkcs7.h ../../include/rc2.h ../../include/rc4.h
v3_pku.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h
v3_pku.o: ../../include/sha.h ../../include/stack.h ../../include/x509.h
v3_pku.o: ../../include/x509_vfy.h ../cryptlib.h ../crypto.h x509v3.h
v3_pku.o: ../../include/x509_vfy.h ../cryptlib.h ../crypto.h ../opensslv.h
v3_pku.o: x509v3.h
v3_prn.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
v3_prn.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
v3_prn.o: ../../include/conf.h ../../include/des.h ../../include/dh.h
......@@ -227,7 +228,7 @@ v3_prn.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
v3_prn.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
v3_prn.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
v3_prn.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
v3_prn.o: ../crypto.h x509v3.h
v3_prn.o: ../crypto.h ../opensslv.h x509v3.h
v3_skey.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
v3_skey.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
v3_skey.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
......@@ -237,7 +238,7 @@ v3_skey.o: ../../include/mdc2.h ../../include/objects.h ../../include/pkcs7.h
v3_skey.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h
v3_skey.o: ../../include/ripemd.h ../../include/rsa.h ../../include/sha.h
v3_skey.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
v3_skey.o: ../cryptlib.h ../crypto.h x509v3.h
v3_skey.o: ../cryptlib.h ../crypto.h ../opensslv.h x509v3.h
v3_utl.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
v3_utl.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
v3_utl.o: ../../include/conf.h ../../include/des.h ../../include/dh.h
......@@ -248,7 +249,7 @@ v3_utl.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
v3_utl.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
v3_utl.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
v3_utl.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
v3_utl.o: ../crypto.h x509v3.h
v3_utl.o: ../crypto.h ../opensslv.h x509v3.h
v3err.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
v3err.o: ../../include/bn.h ../../include/cast.h ../../include/des.h
v3err.o: ../../include/dh.h ../../include/dsa.h ../../include/err.h
......@@ -257,4 +258,4 @@ v3err.o: ../../include/md5.h ../../include/mdc2.h ../../include/objects.h
v3err.o: ../../include/pkcs7.h ../../include/rc2.h ../../include/rc4.h
v3err.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h
v3err.o: ../../include/sha.h ../../include/stack.h ../../include/x509.h
v3err.o: ../../include/x509_vfy.h ../crypto.h x509v3.h
v3err.o: ../../include/x509_vfy.h ../crypto.h ../opensslv.h x509v3.h
rsaref/Makefile.ssl
浏览文件 @ b4cadc6e
......@@ -85,9 +85,9 @@ $(ERRC).c: $(ERR).err
# DO NOT DELETE THIS LINE -- make depend depends on it.
rsar_err.o: ../crypto/crypto.h ../include/bn.h ../include/err.h
rsar_err.o: ../include/rsa.h ../include/stack.h rsaref.h
rsaref.o: ../crypto/cryptlib.h ../crypto/crypto.h ../include/bio.h
rsaref.o: ../include/bn.h ../include/buffer.h ../include/e_os.h
rsaref.o: ../include/err.h ../include/rand.h ../include/rsa.h
rsar_err.o: ../crypto/crypto.h ../crypto/opensslv.h ../include/bn.h
rsar_err.o: ../include/err.h ../include/rsa.h ../include/stack.h rsaref.h
rsaref.o: ../crypto/cryptlib.h ../crypto/crypto.h ../crypto/opensslv.h
rsaref.o: ../include/bio.h ../include/bn.h ../include/buffer.h
rsaref.o: ../include/e_os.h ../include/err.h ../include/rand.h ../include/rsa.h
rsaref.o: ../include/stack.h rsaref.h
ssl/Makefile.ssl
浏览文件 @ b4cadc6e
此差异已折叠。
ssl/s23_lib.c
浏览文件 @ b4cadc6e
......@@ -78,7 +78,7 @@ static int ssl23_put_cipher_by_char();
static SSL_CIPHER *ssl23_get_cipher_by_char();
#endif
char *SSL23_version_str="SSLv2/3 compatibility part of OpenSSL 0.9.2 31-Dec-1998";
char *SSL23_version_str="SSLv2/3 compatibility" OPENSSL_VERSION_PTEXT;
static SSL_METHOD SSLv23_data= {
TLS1_VERSION,
......
ssl/s2_lib.c
浏览文件 @ b4cadc6e
......@@ -67,7 +67,7 @@ static long ssl2_default_timeout(void );
static long ssl2_default_timeout();
#endif
char *ssl2_version_str="SSLv2 part of OpenSSL 0.9.2 31-Dec-1998";
char *ssl2_version_str="SSLv2" OPENSSL_VERSION_PTEXT;
#define SSL2_NUM_CIPHERS (sizeof(ssl2_ciphers)/sizeof(SSL_CIPHER))
......
ssl/s3_clnt.c
浏览文件 @ b4cadc6e
......@@ -605,9 +605,18 @@ SSL *s;
goto f_err;
}
}
if ((j != 0) && (j == s->session->session_id_length) &&
(memcmp(p,s->session->session_id,j) == 0))
s->hit=1;
if (j != 0 && j == s->session->session_id_length
&& memcmp(p,s->session->session_id,j) == 0)
{
if(s->sid_ctx_length != s->session->sid_ctx_length
|| memcmp(s->session->sid_ctx,s->sid_ctx,s->sid_ctx_length))
{
al=SSL_AD_ILLEGAL_PARAMETER;
SSLerr(SSL_F_SSL3_GET_SERVER_HELLO,SSL_R_ATTEMPT_TO_REUSE_SESSION_IN_DIFFERENT_CONTEXT);
goto f_err;
}
s->hit=1;
}
else /* a miss or crap from the other end */
{
/* If we were trying for session-id reuse, make a new
......
ssl/s3_lib.c
浏览文件 @ b4cadc6e
......@@ -60,7 +60,7 @@
#include "objects.h"
#include "ssl_locl.h"
char *ssl3_version_str="SSLv3 part of OpenSSL 0.9.2 31-Dec-1998";
char *ssl3_version_str="SSLv3" OPENSSL_VERSION_PTEXT;
#define SSL3_NUM_CIPHERS (sizeof(ssl3_ciphers)/sizeof(SSL_CIPHER))
......
ssl/s3_srvr.c
浏览文件 @ b4cadc6e
......@@ -1683,6 +1683,8 @@ SSL *s;
if (s->session->peer != NULL)
X509_free(s->session->peer);
s->session->peer=(X509 *)sk_shift(sk);
s->session->cert->cert_chain=sk;
sk=NULL;
ret=1;
if (0)
......
ssl/ssl.err
浏览文件 @ b4cadc6e
......@@ -86,6 +86,7 @@
#define SSL_F_SSL_CTX_USE_RSAPRIVATEKEY_FILE 179
#define SSL_F_SSL_DO_HANDSHAKE 180
#define SSL_F_SSL_GET_NEW_SESSION 181
#define SSL_F_SSL_GET_PREV_SESSION 217
#define SSL_F_SSL_GET_SERVER_SEND_CERT 182
#define SSL_F_SSL_GET_SIGN_PKEY 183
#define SSL_F_SSL_INIT_WBIO_BUFFER 184
......@@ -100,6 +101,7 @@
#define SSL_F_SSL_SET_PKEY 193
#define SSL_F_SSL_SET_RFD 194
#define SSL_F_SSL_SET_SESSION 195
#define SSL_F_SSL_SET_SESSION_ID_CONTEXT 218
#define SSL_F_SSL_SET_WFD 196
#define SSL_F_SSL_UNDEFINED_FUNCTION 197
#define SSL_F_SSL_USE_CERTIFICATE 198
......@@ -120,6 +122,7 @@
/* Reason codes. */
#define SSL_R_APP_DATA_IN_HANDSHAKE 100
#define SSL_R_ATTEMPT_TO_REUSE_SESSION_IN_DIFFERENT_CONTEXT 272
#define SSL_R_BAD_ALERT_RECORD 101
#define SSL_R_BAD_AUTHENTICATION_TYPE 102
#define SSL_R_BAD_CHANGE_CIPHER_SPEC 103
......@@ -132,6 +135,7 @@
#define SSL_R_BAD_DH_P_LENGTH 110
#define SSL_R_BAD_DIGEST_LENGTH 111
#define SSL_R_BAD_DSA_SIGNATURE 112
#define SSL_R_BAD_LENGTH 271
#define SSL_R_BAD_MAC_DECODE 113
#define SSL_R_BAD_MESSAGE_TYPE 114
#define SSL_R_BAD_PACKET_LENGTH 115
......@@ -262,6 +266,7 @@
#define SSL_R_SSL_CTX_HAS_NO_DEFAULT_SSL_VERSION 228
#define SSL_R_SSL_HANDSHAKE_FAILURE 229
#define SSL_R_SSL_LIBRARY_HAS_NO_CIPHERS 230
#define SSL_R_SSL_SESSION_ID_CONTEXT_TOO_LONG 273
#define SSL_R_SSL_SESSION_ID_IS_DIFFERENT 231
#define SSL_R_TLSV1_ALERT_ACCESS_DENIED 1049
#define SSL_R_TLSV1_ALERT_DECODE_ERROR 1050
......
ssl/ssl.h
浏览文件 @ b4cadc6e
......@@ -82,6 +82,7 @@ extern "C" {
#define SSL_TXT_DES_192_EDE3_CBC_WITH_SHA SSL2_TXT_DES_192_EDE3_CBC_WITH_SHA
#define SSL_MAX_SSL_SESSION_ID_LENGTH 32
#define SSL_MAX_SID_CTX_LENGTH 32
#define SSL_MIN_RSA_MODULUS_LENGTH_IN_BYTES (512/8)
#define SSL_MAX_KEY_ARG_LENGTH 8
......@@ -208,7 +209,8 @@ typedef struct ssl_method_st
* Time [ 1 ] EXPLICIT INTEGER, -- optional Start Time
* Timeout [ 2 ] EXPLICIT INTEGER, -- optional Timeout ins seconds
* Peer [ 3 ] EXPLICIT X509, -- optional Peer Certificate
* Compression [4] IMPLICIT ASN1_OBJECT -- compression OID XXXXX
* Session_ID_context [ 4 ] EXPLICIT OCTET_STRING, -- the Session ID context
* Compression [5] IMPLICIT ASN1_OBJECT -- compression OID XXXXX
* }
* Look in ssl/ssl_asn1.c for more details
* I'm using EXPLICIT tags so I can read the damn things using asn1parse :-).
......@@ -226,6 +228,11 @@ typedef struct ssl_session_st
/* session_id - valid? */
unsigned int session_id_length;
unsigned char session_id[SSL_MAX_SSL_SESSION_ID_LENGTH];
/* this is used to determine whether the session is being reused in
* the appropriate context. It is up to the application to set this,
* via SSL_new */
unsigned int sid_ctx_length;
unsigned char sid_ctx[SSL_MAX_SID_CTX_LENGTH];
int not_resumable;
......@@ -555,6 +562,11 @@ struct ssl_st
/* This is used to hold the server certificate used */
struct cert_st /* CERT */ *cert;
/* the session_id_context is used to ensure sessions are only reused
* in the appropriate context */
unsigned int sid_ctx_length;
unsigned char sid_ctx[SSL_MAX_SID_CTX_LENGTH];
/* This can also be in the session once a session is established */
SSL_SESSION *session;
......@@ -917,6 +929,8 @@ int SSL_CTX_check_private_key(SSL_CTX *ctx);
int SSL_check_private_key(SSL *ctx);
SSL * SSL_new(SSL_CTX *ctx);
int SSL_set_session_id_context(SSL *ssl,const unsigned char *sid_ctx,
unsigned int sid_ctx_len);
void SSL_free(SSL *ssl);
int SSL_accept(SSL *ssl);
int SSL_connect(SSL *ssl);
......@@ -1169,6 +1183,7 @@ int SSL_CTX_check_private_key();
int SSL_check_private_key();
SSL * SSL_new();
int SSL_set_session_id_context();
void SSL_clear();
void SSL_free();
int SSL_accept();
......@@ -1374,6 +1389,7 @@ void SSL_set_tmp_dh_callback();
#define SSL_F_SSL_CTX_USE_RSAPRIVATEKEY_FILE 179
#define SSL_F_SSL_DO_HANDSHAKE 180
#define SSL_F_SSL_GET_NEW_SESSION 181
#define SSL_F_SSL_GET_PREV_SESSION 217
#define SSL_F_SSL_GET_SERVER_SEND_CERT 182
#define SSL_F_SSL_GET_SIGN_PKEY 183
#define SSL_F_SSL_INIT_WBIO_BUFFER 184
......@@ -1388,6 +1404,7 @@ void SSL_set_tmp_dh_callback();
#define SSL_F_SSL_SET_PKEY 193
#define SSL_F_SSL_SET_RFD 194
#define SSL_F_SSL_SET_SESSION 195
#define SSL_F_SSL_SET_SESSION_ID_CONTEXT 218
#define SSL_F_SSL_SET_WFD 196
#define SSL_F_SSL_UNDEFINED_FUNCTION 197
#define SSL_F_SSL_USE_CERTIFICATE 198
......@@ -1408,6 +1425,7 @@ void SSL_set_tmp_dh_callback();
/* Reason codes. */
#define SSL_R_APP_DATA_IN_HANDSHAKE 100
#define SSL_R_ATTEMPT_TO_REUSE_SESSION_IN_DIFFERENT_CONTEXT 272
#define SSL_R_BAD_ALERT_RECORD 101
#define SSL_R_BAD_AUTHENTICATION_TYPE 102
#define SSL_R_BAD_CHANGE_CIPHER_SPEC 103
......@@ -1420,6 +1438,7 @@ void SSL_set_tmp_dh_callback();
#define SSL_R_BAD_DH_P_LENGTH 110
#define SSL_R_BAD_DIGEST_LENGTH 111
#define SSL_R_BAD_DSA_SIGNATURE 112
#define SSL_R_BAD_LENGTH 271
#define SSL_R_BAD_MAC_DECODE 113
#define SSL_R_BAD_MESSAGE_TYPE 114
#define SSL_R_BAD_PACKET_LENGTH 115
......@@ -1550,6 +1569,7 @@ void SSL_set_tmp_dh_callback();
#define SSL_R_SSL_CTX_HAS_NO_DEFAULT_SSL_VERSION 228
#define SSL_R_SSL_HANDSHAKE_FAILURE 229
#define SSL_R_SSL_LIBRARY_HAS_NO_CIPHERS 230
#define SSL_R_SSL_SESSION_ID_CONTEXT_TOO_LONG 273
#define SSL_R_SSL_SESSION_ID_IS_DIFFERENT 231
#define SSL_R_TLSV1_ALERT_ACCESS_DENIED 1049
#define SSL_R_TLSV1_ALERT_DECODE_ERROR 1050
......
ssl/ssl_asn1.c
浏览文件 @ b4cadc6e
......@@ -69,6 +69,7 @@ typedef struct ssl_session_asn1_st
ASN1_OCTET_STRING cipher;
ASN1_OCTET_STRING master_key;
ASN1_OCTET_STRING session_id;
ASN1_OCTET_STRING session_id_context;
ASN1_OCTET_STRING key_arg;
ASN1_INTEGER time;
ASN1_INTEGER timeout;
......@@ -84,7 +85,7 @@ SSL_SESSION *in;
unsigned char **pp;
{
#define LSIZE2 (sizeof(long)*2)
int v1=0,v2=0,v3=0;
int v1=0,v2=0,v3=0,v4=0;
unsigned char buf[4],ibuf1[LSIZE2],ibuf2[LSIZE2];
unsigned char ibuf3[LSIZE2],ibuf4[LSIZE2];
long l;
......@@ -138,6 +139,10 @@ unsigned char **pp;
a.session_id.type=V_ASN1_OCTET_STRING;
a.session_id.data=in->session_id;
a.session_id_context.length=in->sid_ctx_length;
a.session_id_context.type=V_ASN1_OCTET_STRING;
a.session_id_context.data=in->sid_ctx;
a.key_arg.length=in->key_arg_length;
a.key_arg.type=V_ASN1_OCTET_STRING;
a.key_arg.data=in->key_arg;
......@@ -171,6 +176,7 @@ unsigned char **pp;
M_ASN1_I2D_len_EXP_opt(&(a.timeout),i2d_ASN1_INTEGER,2,v2);
if (in->peer != NULL)
M_ASN1_I2D_len_EXP_opt(in->peer,i2d_X509,3,v3);
M_ASN1_I2D_len_EXP_opt(&a.session_id_context,i2d_ASN1_OCTET_STRING,4,v4);
M_ASN1_I2D_seq_total();
......@@ -187,6 +193,8 @@ unsigned char **pp;
M_ASN1_I2D_put_EXP_opt(&(a.timeout),i2d_ASN1_INTEGER,2,v2);
if (in->peer != NULL)
M_ASN1_I2D_put_EXP_opt(in->peer,i2d_X509,3,v3);
M_ASN1_I2D_put_EXP_opt(&a.session_id_context,i2d_ASN1_OCTET_STRING,4,
v4);
M_ASN1_I2D_finish();
}
......@@ -308,6 +316,21 @@ long length;
}
M_ASN1_D2I_get_EXP_opt(ret->peer,d2i_X509,3);
os.length=0;
os.data=NULL;
M_ASN1_D2I_get_EXP_opt(osp,d2i_ASN1_OCTET_STRING,4);
if(os.data != NULL)
{
if (os.length > SSL_MAX_SID_CTX_LENGTH)
SSLerr(SSL_F_D2I_SSL_SESSION,SSL_R_BAD_LENGTH);
ret->sid_ctx_length=os.length;
memcpy(ret->sid_ctx,os.data,os.length);
Free(os.data); os.data=NULL; os.length=0;
}
else
ret->sid_ctx_length=0;
M_ASN1_D2I_Finish(a,SSL_SESSION_free,SSL_F_D2I_SSL_SESSION);
}
ssl/ssl_err.c
浏览文件 @ b4cadc6e
......@@ -148,6 +148,7 @@ static ERR_STRING_DATA SSL_str_functs[]=
{ERR_PACK(0,SSL_F_SSL_CTX_USE_RSAPRIVATEKEY_FILE,0), "SSL_CTX_use_RSAPrivateKey_file"},
{ERR_PACK(0,SSL_F_SSL_DO_HANDSHAKE,0), "SSL_do_handshake"},
{ERR_PACK(0,SSL_F_SSL_GET_NEW_SESSION,0), "SSL_GET_NEW_SESSION"},
{ERR_PACK(0,SSL_F_SSL_GET_PREV_SESSION,0), "SSL_GET_PREV_SESSION"},
{ERR_PACK(0,SSL_F_SSL_GET_SERVER_SEND_CERT,0), "SSL_GET_SERVER_SEND_CERT"},
{ERR_PACK(0,SSL_F_SSL_GET_SIGN_PKEY,0), "SSL_GET_SIGN_PKEY"},
{ERR_PACK(0,SSL_F_SSL_INIT_WBIO_BUFFER,0), "SSL_INIT_WBIO_BUFFER"},
......@@ -162,6 +163,7 @@ static ERR_STRING_DATA SSL_str_functs[]=
{ERR_PACK(0,SSL_F_SSL_SET_PKEY,0), "SSL_SET_PKEY"},
{ERR_PACK(0,SSL_F_SSL_SET_RFD,0), "SSL_set_rfd"},
{ERR_PACK(0,SSL_F_SSL_SET_SESSION,0), "SSL_set_session"},
{ERR_PACK(0,SSL_F_SSL_SET_SESSION_ID_CONTEXT,0), "SSL_set_session_id_context"},
{ERR_PACK(0,SSL_F_SSL_SET_WFD,0), "SSL_set_wfd"},
{ERR_PACK(0,SSL_F_SSL_UNDEFINED_FUNCTION,0), "SSL_UNDEFINED_FUNCTION"},
{ERR_PACK(0,SSL_F_SSL_USE_CERTIFICATE,0), "SSL_use_certificate"},
......@@ -185,6 +187,7 @@ static ERR_STRING_DATA SSL_str_functs[]=
static ERR_STRING_DATA SSL_str_reasons[]=
{
{SSL_R_APP_DATA_IN_HANDSHAKE ,"app data in handshake"},
{SSL_R_ATTEMPT_TO_REUSE_SESSION_IN_DIFFERENT_CONTEXT,"attempt to reuse session in different context"},
{SSL_R_BAD_ALERT_RECORD ,"bad alert record"},
{SSL_R_BAD_AUTHENTICATION_TYPE ,"bad authentication type"},
{SSL_R_BAD_CHANGE_CIPHER_SPEC ,"bad change cipher spec"},
......@@ -197,6 +200,7 @@ static ERR_STRING_DATA SSL_str_reasons[]=
{SSL_R_BAD_DH_P_LENGTH ,"bad dh p length"},
{SSL_R_BAD_DIGEST_LENGTH ,"bad digest length"},
{SSL_R_BAD_DSA_SIGNATURE ,"bad dsa signature"},
{SSL_R_BAD_LENGTH ,"bad length"},
{SSL_R_BAD_MAC_DECODE ,"bad mac decode"},
{SSL_R_BAD_MESSAGE_TYPE ,"bad message type"},
{SSL_R_BAD_PACKET_LENGTH ,"bad packet length"},
......@@ -327,6 +331,7 @@ static ERR_STRING_DATA SSL_str_reasons[]=
{SSL_R_SSL_CTX_HAS_NO_DEFAULT_SSL_VERSION,"ssl ctx has no default ssl version"},
{SSL_R_SSL_HANDSHAKE_FAILURE ,"ssl handshake failure"},
{SSL_R_SSL_LIBRARY_HAS_NO_CIPHERS ,"ssl library has no ciphers"},
{SSL_R_SSL_SESSION_ID_CONTEXT_TOO_LONG ,"ssl session id context too long"},
{SSL_R_SSL_SESSION_ID_IS_DIFFERENT ,"ssl session id is different"},
{SSL_R_TLSV1_ALERT_ACCESS_DENIED ,"tlsv1 alert access denied"},
{SSL_R_TLSV1_ALERT_DECODE_ERROR ,"tlsv1 alert decode error"},
......
ssl/ssl_lib.c
浏览文件 @ b4cadc6e
......@@ -63,7 +63,7 @@
#include "lhash.h"
#include "ssl_locl.h"
char *SSL_version_str="OpenSSL 0.9.2 31-Dec-1998";
char *SSL_version_str=OPENSSL_VERSION_TEXT;
static STACK *ssl_meth=NULL;
static STACK *ssl_ctx_meth=NULL;
......@@ -216,6 +216,20 @@ err:
return(NULL);
}
int SSL_set_session_id_context(SSL *ssl,const unsigned char *sid_ctx,
unsigned int sid_ctx_len)
{
if(sid_ctx_len > SSL_MAX_SID_CTX_LENGTH)
{
SSLerr(SSL_F_SSL_SET_SESSION_ID_CONTEXT,SSL_R_SSL_SESSION_ID_CONTEXT_TOO_LONG);
return 0;
}
ssl->sid_ctx_length=sid_ctx_len;
memcpy(ssl->sid_ctx,sid_ctx,sid_ctx_len);
return 1;
}
void SSL_free(SSL *s)
{
int i;
......@@ -485,6 +499,7 @@ void SSL_copy_session_id(SSL *t,SSL *f)
else
t->cert=NULL;
if (tmp != NULL) ssl_cert_free(tmp);
SSL_set_session_id_context(t,f->sid_ctx,f->sid_ctx_length);
}
/* Fix this so it checks all the valid key/cert options */
......@@ -1417,7 +1432,8 @@ SSL *SSL_dup(SSL *s)
SSL *ret;
int i;
if ((ret=SSL_new(SSL_get_SSL_CTX(s))) == NULL) return(NULL);
if ((ret=SSL_new(SSL_get_SSL_CTX(s))) == NULL)
return(NULL);
/* This copies version, session-id, SSL_METHOD and 'cert' */
SSL_copy_session_id(ret,s);
......
ssl/ssl_sess.c
浏览文件 @ b4cadc6e
......@@ -190,6 +190,8 @@ int session;
ss->session_id_length=0;
}
memcpy(ss->sid_ctx,s->sid_ctx,s->sid_ctx_length);
ss->sid_ctx_length=s->sid_ctx_length;
s->session=ss;
ss->ssl_version=s->version;
......@@ -202,13 +204,14 @@ unsigned char *session_id;
int len;
{
SSL_SESSION *ret=NULL,data;
int copy=1;
/* conn_init();*/
data.ssl_version=s->version;
data.session_id_length=len;
if (len > SSL_MAX_SSL_SESSION_ID_LENGTH)
return(0);
memcpy(data.session_id,session_id,len);;
memcpy(data.session_id,session_id,len);
if (!(s->ctx->session_cache_mode & SSL_SESS_CACHE_NO_INTERNAL_LOOKUP))
{
......@@ -219,26 +222,33 @@ int len;
if (ret == NULL)
{
int copy=1;
s->ctx->stats.sess_miss++;
ret=NULL;
if ((s->ctx->get_session_cb != NULL) &&
((ret=s->ctx->get_session_cb(s,session_id,len,&copy))
!= NULL))
if (s->ctx->get_session_cb != NULL
&& (ret=s->ctx->get_session_cb(s,session_id,len,&copy))
!= NULL)
{
s->ctx->stats.sess_cb_hit++;
/* The following should not return 1, otherwise,
* things are very strange */
SSL_CTX_add_session(s->ctx,ret);
/* auto free it */
if (!copy)
SSL_SESSION_free(ret);
}
if (ret == NULL) return(0);
}
if((s->verify_mode&SSL_VERIFY_PEER)
&& (!s->sid_ctx_length || ret->sid_ctx_length != s->sid_ctx_length
|| memcmp(ret->sid_ctx,s->sid_ctx,ret->sid_ctx_length)))
{
SSLerr(SSL_F_SSL_GET_PREV_SESSION,SSL_R_ATTEMPT_TO_REUSE_SESSION_IN_DIFFERENT_CONTEXT);
return 0;
}
/* auto free it */
if (!copy)
SSL_SESSION_free(ret);
if (ret->cipher == NULL)
{
char buf[5],*p;
......
ssl/ssl_txt.c
浏览文件 @ b4cadc6e
......@@ -84,7 +84,7 @@ int SSL_SESSION_print(bp,x)
BIO *bp;
SSL_SESSION *x;
{
int i;
unsigned int i;
char str[128],*s;
if (x == NULL) goto err;
......@@ -111,13 +111,19 @@ SSL_SESSION *x;
sprintf(str," Cipher : %s\n",(x->cipher == NULL)?"unknown":x->cipher->name);
if (BIO_puts(bp,str) <= 0) goto err;
if (BIO_puts(bp," Session-ID: ") <= 0) goto err;
for (i=0; i<(int)x->session_id_length; i++)
for (i=0; i<x->session_id_length; i++)
{
sprintf(str,"%02X",x->session_id[i]);
if (BIO_puts(bp,str) <= 0) goto err;
}
if (BIO_puts(bp,"\nSession-ID-ctx: ") <= 0) goto err;
for (i=0; i<x->sid_ctx_length; i++)
{
sprintf(str,"%02X",x->sid_ctx[i]);
if (BIO_puts(bp,str) <= 0) goto err;
}
if (BIO_puts(bp,"\n Master-Key: ") <= 0) goto err;
for (i=0; i<(int)x->master_key_length; i++)
for (i=0; i<(unsigned int)x->master_key_length; i++)
{
sprintf(str,"%02X",x->master_key[i]);
if (BIO_puts(bp,str) <= 0) goto err;
......@@ -128,7 +134,7 @@ SSL_SESSION *x;
if (BIO_puts(bp,"None") <= 0) goto err;
}
else
for (i=0; i<(int)x->key_arg_length; i++)
for (i=0; i<x->key_arg_length; i++)
{
sprintf(str,"%02X",x->key_arg[i]);
if (BIO_puts(bp,str) <= 0) goto err;
......
ssl/t1_lib.c
浏览文件 @ b4cadc6e
......@@ -60,7 +60,7 @@
#include "objects.h"
#include "ssl_locl.h"
char *tls1_version_str="TLSv1 part of OpenSSL 0.9.2 31-Dec-1998";
char *tls1_version_str="TLSv1" OPENSSL_VERSION_PTEXT;
#ifndef NO_PROTO
static long tls1_default_timeout(void);
......
test/Makefile.ssl
浏览文件 @ b4cadc6e
......@@ -303,27 +303,28 @@ bntest.o: ../include/bn.h ../include/cast.h ../include/crypto.h
bntest.o: ../include/des.h ../include/dh.h ../include/dsa.h ../include/e_os.h
bntest.o: ../include/err.h ../include/evp.h ../include/idea.h ../include/md2.h
bntest.o: ../include/md5.h ../include/mdc2.h ../include/objects.h
bntest.o: ../include/pkcs7.h ../include/rand.h ../include/rc2.h
bntest.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h
bntest.o: ../include/rsa.h ../include/sha.h ../include/stack.h
bntest.o: ../include/x509.h ../include/x509_vfy.h
bntest.o: ../include/opensslv.h ../include/pkcs7.h ../include/rand.h
bntest.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h
bntest.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h
bntest.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h
casttest.o: ../include/cast.h
destest.o: ../include/des.h
dhtest.o: ../include/bio.h ../include/bn.h ../include/crypto.h ../include/dh.h
dhtest.o: ../include/stack.h
dhtest.o: ../include/opensslv.h ../include/stack.h
dsatest.o: ../include/bio.h ../include/bn.h ../include/crypto.h
dsatest.o: ../include/dsa.h ../include/err.h ../include/rand.h
dsatest.o: ../include/stack.h
dsatest.o: ../include/dsa.h ../include/err.h ../include/opensslv.h
dsatest.o: ../include/rand.h ../include/stack.h
exptest.o: ../include/bio.h ../include/bn.h ../include/crypto.h
exptest.o: ../include/err.h ../include/rand.h ../include/stack.h
exptest.o: ../include/err.h ../include/opensslv.h ../include/rand.h
exptest.o: ../include/stack.h
hmactest.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h
hmactest.o: ../include/bn.h ../include/cast.h ../include/crypto.h
hmactest.o: ../include/des.h ../include/dh.h ../include/dsa.h ../include/evp.h
hmactest.o: ../include/hmac.h ../include/idea.h ../include/md2.h
hmactest.o: ../include/md5.h ../include/mdc2.h ../include/objects.h
hmactest.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h
hmactest.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h
hmactest.o: ../include/stack.h
hmactest.o: ../include/opensslv.h ../include/rc2.h ../include/rc4.h
hmactest.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h
hmactest.o: ../include/sha.h ../include/stack.h
ideatest.o: ../include/idea.h
md2test.o: ../include/md2.h
md5test.o: ../include/md5.h
......@@ -334,7 +335,7 @@ rc4test.o: ../include/rc4.h
rc5test.o: ../include/rc5.h
rmdtest.o: ../include/ripemd.h
rsa_oaep_test.o: ../include/bn.h ../include/crypto.h ../include/e_os.h
rsa_oaep_test.o: ../include/rsa.h ../include/stack.h
rsa_oaep_test.o: ../include/opensslv.h ../include/rsa.h ../include/stack.h
sha1test.o: ../include/sha.h
shatest.o: ../include/sha.h
ssltest.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h
......@@ -343,8 +344,8 @@ ssltest.o: ../include/crypto.h ../include/des.h ../include/dh.h
ssltest.o: ../include/dsa.h ../include/e_os.h ../include/err.h ../include/evp.h
ssltest.o: ../include/idea.h ../include/lhash.h ../include/md2.h
ssltest.o: ../include/md5.h ../include/mdc2.h ../include/objects.h
ssltest.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h
ssltest.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h
ssltest.o: ../include/sha.h ../include/ssl.h ../include/ssl2.h
ssltest.o: ../include/opensslv.h ../include/pkcs7.h ../include/rc2.h
ssltest.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h
ssltest.o: ../include/rsa.h ../include/sha.h ../include/ssl.h ../include/ssl2.h
ssltest.o: ../include/ssl23.h ../include/ssl3.h ../include/stack.h
ssltest.o: ../include/tls1.h ../include/x509.h ../include/x509_vfy.h
test/testsid.pem
浏览文件 @ b4cadc6e
-----BEGIN SSL SESSION PARAMETERS-----
MIIBxwIBAQIBAgQDAQCABBCi11xa5qkOP8xrr02K/NQCBBBkIYQZM0Bt95W0EHNV
MIIB1gIBAQIBAgQDAQCABBCi11xa5qkOP8xrr02K/NQCBBBkIYQZM0Bt95W0EHNV
bA58oQYCBDIBr7WiBAICASyjggGGMIIBgjCCASwCAQMwDQYJKoZIhvcNAQEEBQAw
ODELMAkGA1UEBhMCQVUxDDAKBgNVBAgTA1FMRDEbMBkGA1UEAxMSU1NMZWF5L3Jz
YSB0ZXN0IENBMB4XDTk1MTAwOTIzMzEzNFoXDTk4MDcwNTIzMzEzNFowYDELMAkG
......@@ -8,5 +8,5 @@ LjELMAkGA1UECxMCQ1MxGzAZBgNVBAMTElNTTGVheSBkZW1vIGNsaWVudDBcMA0G
CSqGSIb3DQEBAQUAA0sAMEgCQQC4pcXEL1lgVA+B5Q3TcuW/O3LZHoA73IYm8oFD
TezgCDhL2RTMn+seKWF36UtJKRIOBU9jZHCVVd0Me5ls6BEjAgMBAAEwDQYJKoZI
hvcNAQEEBQADQQBoIpOcwUY1qlVF7j3ROSGvUsbvByOBFmYWkIBgsCqR+9qo1A7L
CrWF5i8LWt/vLwAHaxWNx2YuBJMFyuK81fTv
CrWF5i8LWt/vLwAHaxWNx2YuBJMFyuK81fTvpA0EC3Rlc3Rjb250ZXh0
-----END SSL SESSION PARAMETERS-----
util/ssleay.num
浏览文件 @ b4cadc6e
......@@ -168,3 +168,4 @@ SSL_add_file_cert_subjects_to_stack 185
SSL_set_tmp_rsa_callback 186
SSL_set_tmp_dh_callback 187
SSL_add_dir_cert_subjects_to_stack 188
SSL_set_session_id_context 189
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或