Overview
Comment: | Fix build warnings. |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
67bf2dd40de3028d0a31f415b5125434 |
User & Date: | razzell on 2004-03-24 05:22:53 |
Other Links: | manifest | tags |
Context
2004-06-29
| ||
10:38 | * Makefile.in: Fixed to build on win32 using msys with * aclocal.m4: MSVC. Also fixed the test target. * configure.in: * configure: Regenerated. * tclconfig/tcl.m4: Updated to most recent version. check-in: ae154f5bb8 user: patthoyts tags: trunk | |
2004-03-24
| ||
05:22 | Fix build warnings. check-in: 67bf2dd40d user: razzell tags: trunk | |
2004-03-20
| ||
01:18 | regen with latest TEA check-in: 5a6275abdd user: hobbs tags: trunk | |
Changes
Modified ChangeLog from [706a07e2f7] to [a26c06da63].
1 2 3 4 5 6 7 |
2004-03-19 Jeff Hobbs <[email protected]> * tls.c (Tls_Init): replaced older TEA config with newer * config/* (removed): * pkgIndex.tcl.in, strncasecmp.c (removed): * Makefile.in, aclocal.m4, configure, configure.in: * tclconfig/README.txt, tclconfig/install-sh, tclconfig/tcl.m4: |
> > > > > > |
1 2 3 4 5 6 7 8 9 10 11 12 13 |
2004-03-23 Dan Razzell <[email protected]> * tls.c: * tlsBIO.c: * tlsIO.c: * tlsInt.h: Fixed type match warnings. 2004-03-19 Jeff Hobbs <[email protected]> * tls.c (Tls_Init): replaced older TEA config with newer * config/* (removed): * pkgIndex.tcl.in, strncasecmp.c (removed): * Makefile.in, aclocal.m4, configure, configure.in: * tclconfig/README.txt, tclconfig/install-sh, tclconfig/tcl.m4: |
Modified tls.c from [f2f5d0dfc5] to [e35ed3b05f].
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 ... 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 ... 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 ... 497 498 499 500 501 502 503 504 505 506 507 508 509 510 .... 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 |
/* * Copyright (C) 1997-1999 Matt Newman <[email protected]> * some modifications: * Copyright (C) 2000 Ajuba Solutions * Copyright (C) 2002 ActiveState Corporation * Copyright (C) 2004 Starfish Systems * * $Header: /home/rkeene/tmp/cvs2fossil/../tcltls/tls/tls/tls.c,v 1.21 2004/03/19 21:05:16 hobbs 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 * ................................................................................ Tcl_Interp *interp = statePtr->interp; Tcl_Obj *cmdPtr; int result; if (statePtr->password == NULL) { if (Tcl_Eval(interp, "tls::password") == TCL_OK) { char *ret = (char *) Tcl_GetStringResult(interp); strncpy(buf, ret, size); return strlen(ret); } else { return -1; } } cmdPtr = Tcl_DuplicateObj(statePtr->password); ................................................................................ Tcl_DecrRefCount(cmdPtr); Tcl_Release((ClientData) statePtr); Tcl_Release((ClientData) statePtr->interp); if (result == TCL_OK) { char *ret = (char *) Tcl_GetStringResult(interp); strncpy(buf, ret, size); return strlen(ret); } else { return -1; } } #endif ................................................................................ case TLS_TLS1: #if defined(NO_TLS1) Tcl_AppendResult(interp, "protocol not supported", NULL); return TCL_ERROR; #else ctx = SSL_CTX_new(TLSv1_method()); break; #endif } if (ctx == NULL) { Tcl_AppendResult(interp, REASON(), (char *) NULL); return TCL_ERROR; } ssl = SSL_new(ctx); if (ssl == NULL) { ................................................................................ X509_free(cert); EVP_PKEY_free(pkey); } else { Tcl_SetResult(interp,"Error generating private key",NULL); return TCL_ERROR; } } break; } return TCL_OK; } /* *------------------------------------------------------------------- |
| | | > > > > |
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 ... 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 ... 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 ... 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 .... 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 |
/* * Copyright (C) 1997-1999 Matt Newman <[email protected]> * some modifications: * Copyright (C) 2000 Ajuba Solutions * Copyright (C) 2002 ActiveState Corporation * Copyright (C) 2004 Starfish Systems * * $Header: /home/rkeene/tmp/cvs2fossil/../tcltls/tls/tls/tls.c,v 1.22 2004/03/24 05:22:53 razzell 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 * ................................................................................ Tcl_Interp *interp = statePtr->interp; Tcl_Obj *cmdPtr; int result; if (statePtr->password == NULL) { if (Tcl_Eval(interp, "tls::password") == TCL_OK) { char *ret = (char *) Tcl_GetStringResult(interp); strncpy(buf, ret, (size_t) size); return strlen(ret); } else { return -1; } } cmdPtr = Tcl_DuplicateObj(statePtr->password); ................................................................................ Tcl_DecrRefCount(cmdPtr); Tcl_Release((ClientData) statePtr); Tcl_Release((ClientData) statePtr->interp); if (result == TCL_OK) { char *ret = (char *) Tcl_GetStringResult(interp); strncpy(buf, ret, (size_t) size); return strlen(ret); } else { return -1; } } #endif ................................................................................ case TLS_TLS1: #if defined(NO_TLS1) Tcl_AppendResult(interp, "protocol not supported", NULL); return TCL_ERROR; #else ctx = SSL_CTX_new(TLSv1_method()); break; #endif default: break; } if (ctx == NULL) { Tcl_AppendResult(interp, REASON(), (char *) NULL); return TCL_ERROR; } ssl = SSL_new(ctx); if (ssl == NULL) { ................................................................................ X509_free(cert); EVP_PKEY_free(pkey); } else { Tcl_SetResult(interp,"Error generating private key",NULL); return TCL_ERROR; } } break; default: break; } return TCL_OK; } /* *------------------------------------------------------------------- |
Modified tlsBIO.c from [eab9c4dc8f] to [66eac232ea].
1
2
3
4
5
6
7
8
9
10
11
...
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
|
/* * Copyright (C) 1997-2000 Matt Newman <[email protected]> * * $Header: /home/rkeene/tmp/cvs2fossil/../tcltls/tls/tls/tlsBIO.c,v 1.7 2004/02/04 04:02:19 razzell Exp $ * * Provides BIO layer to interface openssl to Tcl. */ #include "tlsInt.h" /* ................................................................................ } static int BioPuts (bio, str) BIO *bio; CONST char *str; { return BioWrite(bio, str, strlen(str)); } static long BioCtrl (bio, cmd, num, ptr) BIO *bio; int cmd; long num; |
|
|
|
1
2
3
4
5
6
7
8
9
10
11
...
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
|
/* * Copyright (C) 1997-2000 Matt Newman <[email protected]> * * $Header: /home/rkeene/tmp/cvs2fossil/../tcltls/tls/tls/tlsBIO.c,v 1.8 2004/03/24 05:22:53 razzell Exp $ * * Provides BIO layer to interface openssl to Tcl. */ #include "tlsInt.h" /* ................................................................................ } static int BioPuts (bio, str) BIO *bio; CONST char *str; { return BioWrite(bio, str, (int) strlen(str)); } static long BioCtrl (bio, cmd, num, ptr) BIO *bio; int cmd; long num; |
Modified tlsIO.c from [40b688575b] to [5817cb10fa].
1
2
3
4
5
6
7
8
9
10
11
12
...
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
|
/* * Copyright (C) 1997-2000 Matt Newman <[email protected]> * Copyright (C) 2000 Ajuba Solutions * * $Header: /home/rkeene/tmp/cvs2fossil/../tcltls/tls/tls/tlsIO.c,v 1.13 2002/02/04 22:46:31 hobbs Exp $ * * TLS (aka SSL) Channel - can be layered on any bi-directional * Tcl_Channel (Note: Requires Trf Core Patch) * * This was built from scratch based upon observation of OpenSSL 0.9.2B * * Addition credit is due for Andreas Kupries ([email protected]), for ................................................................................ * that version of the core. * * (2) With stubs we just determine the difference between the older * and modern variant and overallocate accordingly if compiled * against an older variant. */ int size = sizeof(Tcl_ChannelType); /* Base size */ /* * Size of a procedure pointer. We assume that all procedure * pointers are of the same size, regardless of exact type * (arguments and return values). * * 8.2. First version containing close2proc. Baseline. |
|
|
|
1
2
3
4
5
6
7
8
9
10
11
12
...
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
|
/* * Copyright (C) 1997-2000 Matt Newman <[email protected]> * Copyright (C) 2000 Ajuba Solutions * * $Header: /home/rkeene/tmp/cvs2fossil/../tcltls/tls/tls/tlsIO.c,v 1.14 2004/03/24 05:22:53 razzell Exp $ * * TLS (aka SSL) Channel - can be layered on any bi-directional * Tcl_Channel (Note: Requires Trf Core Patch) * * This was built from scratch based upon observation of OpenSSL 0.9.2B * * Addition credit is due for Andreas Kupries ([email protected]), for ................................................................................ * that version of the core. * * (2) With stubs we just determine the difference between the older * and modern variant and overallocate accordingly if compiled * against an older variant. */ unsigned int size = sizeof(Tcl_ChannelType); /* Base size */ /* * Size of a procedure pointer. We assume that all procedure * pointers are of the same size, regardless of exact type * (arguments and return values). * * 8.2. First version containing close2proc. Baseline. |
Modified tlsInt.h from [bfa5033f5f] to [17c696f67a].
1
2
3
4
5
6
7
8
9
10
11
..
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
|
/* * Copyright (C) 1997-2000 Matt Newman <[email protected]> * * $Header: /home/rkeene/tmp/cvs2fossil/../tcltls/tls/tls/tlsInt.h,v 1.11 2004/02/04 04:02:19 razzell Exp $ * * TLS (aka SSL) Channel - can be layered on any bi-directional * Tcl_Channel (Note: Requires Trf Core Patch) * * This was built from scratch based upon observation of OpenSSL 0.9.2B * * Addition credit is due for Andreas Kupries ([email protected]), for ................................................................................ #ifdef DEBUG #define dprintf fprintf #else #define dprintf if (0) fprintf #endif #define SSL_ERROR(ssl,err) \ ((char*)ERR_reason_error_string(SSL_get_error((ssl),(err)))) /* * OpenSSL BIO Routines */ #define BIO_TYPE_TCL (19|0x0400) /* * Defines for State.flags |
|
|
|
1
2
3
4
5
6
7
8
9
10
11
..
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
|
/* * Copyright (C) 1997-2000 Matt Newman <[email protected]> * * $Header: /home/rkeene/tmp/cvs2fossil/../tcltls/tls/tls/tlsInt.h,v 1.12 2004/03/24 05:22:53 razzell Exp $ * * TLS (aka SSL) Channel - can be layered on any bi-directional * Tcl_Channel (Note: Requires Trf Core Patch) * * This was built from scratch based upon observation of OpenSSL 0.9.2B * * Addition credit is due for Andreas Kupries ([email protected]), for ................................................................................ #ifdef DEBUG #define dprintf fprintf #else #define dprintf if (0) fprintf #endif #define SSL_ERROR(ssl,err) \ ((char*)ERR_reason_error_string((unsigned long)SSL_get_error((ssl),(err)))) /* * OpenSSL BIO Routines */ #define BIO_TYPE_TCL (19|0x0400) /* * Defines for State.flags |