Overview
Comment: | added code to allow compilation with either OpenSSL or BSAFE |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk | scriptics-sc-2-0-b9 |
Files: | files | file ages | folders |
SHA1: |
cc4e8de2d7a3ccbaf4116b45cea84228 |
User & Date: | aborr on 2000-05-04 20:40:40 |
Other Links: | manifest | tags |
Context
2000-05-09
| ||
22:26 | minor change to error message check-in: 10b4432d02 user: aborr tags: trunk | |
2000-05-04
| ||
20:40 | added code to allow compilation with either OpenSSL or BSAFE check-in: cc4e8de2d7 user: aborr tags: trunk, scriptics-sc-2-0-b9 | |
20:21 | minor chnges to allow compilation with BSAFE or OpenSSL check-in: b26fff0537 user: aborr tags: trunk | |
Changes
Modified tls.c
from [230e3f6e31]
to [58fc6e64f6].
1 2 3 | /* * Copyright (C) 1997-1999 Matt Newman <[email protected]> * | | | 1 2 3 4 5 6 7 8 9 10 11 | /* * Copyright (C) 1997-1999 Matt Newman <[email protected]> * * $Header: /home/rkeene/tmp/cvs2fossil/../tcltls/tls/tls/tls.c,v 1.3 2000/05/04 20:40:40 aborr Exp $ * * TLS (aka SSL) Channel - can be layered on any bi-directional * Tcl_Channel (Note: Requires Trf Core Patch) * * This was built (almost) from scratch based upon observation of * OpenSSL 0.9.2B * |
︙ | ︙ | |||
82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 | if ((dh->p == NULL) || (dh->g == NULL)) return(NULL); return(dh); } #endif /* * Per OpenSSL 0.9.4 Compat */ #ifndef STACK_OF #define STACK_OF(x) STACK #define sk_SSL_CIPHER_num(sk) sk_num((sk)) #define sk_SSL_CIPHER_value( sk, index) (SSL_CIPHER*)sk_value((sk), (index)) #endif /* *------------------------------------------------------------------- * * InfoCallback -- * * monitors SSL connection process | > > > > > > > > > > > > | 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 | if ((dh->p == NULL) || (dh->g == NULL)) return(NULL); return(dh); } #endif /* * We lose the tcl password callback when we use the RSA BSAFE SSL-C 1.1.2 * libraries instead of the current OpenSSL libraries. */ #ifdef BSAFE #define PRE_OPENSSL_0_9_4 1 #endif /* * Per OpenSSL 0.9.4 Compat */ #ifndef STACK_OF #define STACK_OF(x) STACK #define sk_SSL_CIPHER_num(sk) sk_num((sk)) #define sk_SSL_CIPHER_value( sk, index) (SSL_CIPHER*)sk_value((sk), (index)) #endif /* *------------------------------------------------------------------- * * InfoCallback -- * * monitors SSL connection process |
︙ | ︙ | |||
848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 | SSL_CTX_sess_set_cache_size( ctx, 128); if (ciphers != NULL) SSL_CTX_set_cipher_list(ctx, ciphers); /* set some callbacks */ SSL_CTX_set_default_passwd_cb(ctx, PasswordCallback); SSL_CTX_set_default_passwd_cb_userdata(ctx, (void *)interp); #ifndef NO_DH { DH* dh = get_dh512(); SSL_CTX_set_tmp_dh(ctx, dh); DH_free(dh); } | > > > | 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 | SSL_CTX_sess_set_cache_size( ctx, 128); if (ciphers != NULL) SSL_CTX_set_cipher_list(ctx, ciphers); /* set some callbacks */ SSL_CTX_set_default_passwd_cb(ctx, PasswordCallback); #ifndef BSAFE SSL_CTX_set_default_passwd_cb_userdata(ctx, (void *)interp); #endif #ifndef NO_DH { DH* dh = get_dh512(); SSL_CTX_set_tmp_dh(ctx, dh); DH_free(dh); } |
︙ | ︙ |