Commit 36d16f8e authored by Ben Laurie's avatar Ben Laurie
Browse files

Add DTLS support.

parent ab781a0c

.cvsignore

+1 −1
Original line number Diff line number Diff line 
openssl.pc

Makefile.ssl

MINFO

makefile.one

tmp
@@ -16,3 +15,4 @@ libcrypto.so.* 
libssl.so.*

*.flc

semantic.cache

Makefile

CHANGES

+3 −0
Original line number Diff line number Diff line
@@ -4,6 +4,9 @@ 


 Changes between 0.9.7g and 0.9.8  [xx XXX xxxx]



  *) Add support for DTLS.

     [Nagendra Modadugu <nagendra@cs.stanford.edu> and Ben Laurie]



  *) Add support for DER encoded private keys (SSL_FILETYPE_ASN1)

     to SSL_CTX_use_PrivateKey_file() and SSL_use_PrivateKey_file()

     [Walter Goulet]

Configure

+1 −0
Original line number Diff line number Diff line
@@ -515,6 +515,7 @@ my %table=( 
"rhapsody-ppc-cc","cc:-O3 -DB_ENDIAN::(unknown):MACOSX_RHAPSODY::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}::",

"darwin-ppc-cc","cc:-O3 -DB_ENDIAN::-D_REENTRANT:MACOSX::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::osx_ppc32.o:::::::::::darwin-shared:-fPIC -fno-common::.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",

"darwin-i386-cc","cc:-O3 -fomit-frame-pointer -fno-common -DB_ENDIAN::-D_REENTRANT:MACOSX::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}::darwin-shared:-fPIC::.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",

"debug-darwin-ppc-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DB_ENDIAN -g -Wall -O::-D_REENTRANT:MACOSX::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::osx_ppc32.o:::::::::::darwin-shared:-fPIC::.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",



##### A/UX

"aux3-gcc","gcc:-O2 -DTERMIO::(unknown):AUX:-lbsd:RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:::",

Makefile.org

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ SDIRS= \ 
	bn ec rsa dsa ecdsa dh ecdh dso engine \

	buffer bio stack lhash rand err \

	evp asn1 pem x509 x509v3 conf txt_db pkcs7 pkcs12 comp ocsp ui krb5 \

	store

	store pqueue



# tests to perform.  "alltests" is a special word indicating that all tests

# should be performed.

apps/s_apps.h

+2 −2
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ typedef fd_mask fd_set; 
#define PORT_STR        "4433"

#define PROTOCOL        "tcp"



int do_server(int port, int *ret, int (*cb) (char *hostname, int s, unsigned char *context), char *context);

int do_server(int port, int type, int *ret, int (*cb) (char *hostname, int s, unsigned char *context), char *context);

#ifdef HEADER_X509_H

int MS_CALLBACK verify_callback(int ok, X509_STORE_CTX *ctx);

#endif
@@ -156,7 +156,7 @@ int MS_CALLBACK verify_callback(int ok, X509_STORE_CTX *ctx); 
int set_cert_stuff(SSL_CTX *ctx, char *cert_file, char *key_file);

int set_cert_key_stuff(SSL_CTX *ctx, X509 *cert, EVP_PKEY *key);

#endif

int init_client(int *sock, char *server, int port);

int init_client(int *sock, char *server, int port, int type);

int should_retry(int i);

int extract_port(char *str, short *port_ptr);

int extract_host_port(char *str,char **host_ptr,unsigned char *ip,short *p);