Commit 4479ce9c authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Update from HEAD.

parent 4a0d3530

ssl/d1_lib.c

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ 
#include <openssl/objects.h>

#include "ssl_locl.h"



const char *dtls1_version_str="DTLSv1" OPENSSL_VERSION_PTEXT;

const char dtls1_version_str[]="DTLSv1" OPENSSL_VERSION_PTEXT;



SSL3_ENC_METHOD DTLSv1_enc_data={

    dtls1_enc,

ssl/s2_lib.c

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ 
#include <openssl/evp.h>

#include <openssl/md5.h>



const char *ssl2_version_str="SSLv2" OPENSSL_VERSION_PTEXT;

const char ssl2_version_str[]="SSLv2" OPENSSL_VERSION_PTEXT;



#define SSL2_NUM_CIPHERS (sizeof(ssl2_ciphers)/sizeof(SSL_CIPHER))

ssl/s3_lib.c

+1 −1
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ 
#endif

#include <openssl/pq_compat.h>



const char *ssl3_version_str="SSLv3" OPENSSL_VERSION_PTEXT;

const char ssl3_version_str[]="SSLv3" OPENSSL_VERSION_PTEXT;



#define SSL3_NUM_CIPHERS	(sizeof(ssl3_ciphers)/sizeof(SSL_CIPHER))

ssl/t1_lib.c

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ 
#include <openssl/objects.h>

#include "ssl_locl.h"



const char *tls1_version_str="TLSv1" OPENSSL_VERSION_PTEXT;

const char tls1_version_str[]="TLSv1" OPENSSL_VERSION_PTEXT;



SSL3_ENC_METHOD TLSv1_enc_data={

	tls1_enc,