Fossil SCM

Added ssl support to msc msc doesn't like declaring vars in the middle of a block! added the extra needed libs in a commented LIBS line

renez 2010-08-28 20:22 windowscompilers
Commit 29c728f4b3610bbef0727ef902b9e80ceb9b4a0b
Parent 99e0a29efec1997…
3 files changed +4 -4 +2 +2
~ src/http_ssl.c ~ src/makemake.tcl ~ win/Makefile.msc
M src/http_ssl.c
+4 -4
--- src/http_ssl.c
+++ src/http_ssl.c
@@ -128,11 +128,11 @@
128128
 ** Return the number of errors.
129129
 */
130130
 int ssl_open(void){
131131
 X509 *cert;
132132
 int hasSavedCertificate = 0;
133
-
133
+char *connStr ;
134134
 ssl_global_init();
135135
136136
 /* Get certificate for current server from global config and
137137
 * (if we have it in config) add it to certificate store.
138138
 */
@@ -150,11 +150,11 @@
150150
 ssl_set_errmsg("SSL: cannot open SSL (%s)",
151151
 ERR_reason_error_string(ERR_get_error()));
152152
 return 1;
153153
 }
154154
155
- char *connStr = mprintf("%s:%d", g.urlName, g.urlPort);
155
+ connStr = mprintf("%s:%d", g.urlName, g.urlPort);
156156
 BIO_set_conn_hostname(iBio, connStr);
157157
 free(connStr);
158158
159159
 if( BIO_do_connect(iBio)<=0 ){
160160
 ssl_set_errmsg("SSL: cannot connect to host %s:%d (%s)",
@@ -178,29 +178,29 @@
178178
 return 1;
179179
 }
180180
181181
 if( SSL_get_verify_result(ssl) != X509_V_OK ){
182182
 char *desc, *prompt;
183
+ char *warning = "";
184
+ Blob ans;
183185
 BIO *mem;
184186
185187
 mem = BIO_new(BIO_s_mem());
186188
 X509_NAME_print_ex(mem, X509_get_subject_name(cert), 2, XN_FLAG_MULTILINE);
187189
 BIO_puts(mem, "\n\nIssued By:\n\n");
188190
 X509_NAME_print_ex(mem, X509_get_issuer_name(cert), 2, XN_FLAG_MULTILINE);
189191
 BIO_write(mem, "", 1); // null-terminate mem buffer
190192
 BIO_get_mem_data(mem, &desc);
191193
192
- char *warning = "";
193194
 if( hasSavedCertificate ){
194195
 warning = "WARNING: Certificate doesn't match the "
195196
 "saved certificate for this host!";
196197
 }
197198
 prompt = mprintf("\nUnknown SSL certificate:\n\n%s\n\n%s\n"
198199
 "Accept certificate [a=always/y/N]? ", desc, warning);
199200
 BIO_free(mem);
200201
201
- Blob ans;
202202
 prompt_user(prompt, &ans);
203203
 free(prompt);
204204
 if( blob_str(&ans)[0]!='y' && blob_str(&ans)[0]!='a' ) {
205205
 X509_free(cert);
206206
 ssl_set_errmsg("SSL certificate declined");
207207
--- src/http_ssl.c
+++ src/http_ssl.c
@@ -128,11 +128,11 @@
128 ** Return the number of errors.
129 */
130 int ssl_open(void){
131 X509 *cert;
132 int hasSavedCertificate = 0;
133
134 ssl_global_init();
135
136 /* Get certificate for current server from global config and
137 * (if we have it in config) add it to certificate store.
138 */
@@ -150,11 +150,11 @@
150 ssl_set_errmsg("SSL: cannot open SSL (%s)",
151 ERR_reason_error_string(ERR_get_error()));
152 return 1;
153 }
154
155 char *connStr = mprintf("%s:%d", g.urlName, g.urlPort);
156 BIO_set_conn_hostname(iBio, connStr);
157 free(connStr);
158
159 if( BIO_do_connect(iBio)<=0 ){
160 ssl_set_errmsg("SSL: cannot connect to host %s:%d (%s)",
@@ -178,29 +178,29 @@
178 return 1;
179 }
180
181 if( SSL_get_verify_result(ssl) != X509_V_OK ){
182 char *desc, *prompt;
 
 
183 BIO *mem;
184
185 mem = BIO_new(BIO_s_mem());
186 X509_NAME_print_ex(mem, X509_get_subject_name(cert), 2, XN_FLAG_MULTILINE);
187 BIO_puts(mem, "\n\nIssued By:\n\n");
188 X509_NAME_print_ex(mem, X509_get_issuer_name(cert), 2, XN_FLAG_MULTILINE);
189 BIO_write(mem, "", 1); // null-terminate mem buffer
190 BIO_get_mem_data(mem, &desc);
191
192 char *warning = "";
193 if( hasSavedCertificate ){
194 warning = "WARNING: Certificate doesn't match the "
195 "saved certificate for this host!";
196 }
197 prompt = mprintf("\nUnknown SSL certificate:\n\n%s\n\n%s\n"
198 "Accept certificate [a=always/y/N]? ", desc, warning);
199 BIO_free(mem);
200
201 Blob ans;
202 prompt_user(prompt, &ans);
203 free(prompt);
204 if( blob_str(&ans)[0]!='y' && blob_str(&ans)[0]!='a' ) {
205 X509_free(cert);
206 ssl_set_errmsg("SSL certificate declined");
207
--- src/http_ssl.c
+++ src/http_ssl.c
@@ -128,11 +128,11 @@
128 ** Return the number of errors.
129 */
130 int ssl_open(void){
131 X509 *cert;
132 int hasSavedCertificate = 0;
133 char *connStr ;
134 ssl_global_init();
135
136 /* Get certificate for current server from global config and
137 * (if we have it in config) add it to certificate store.
138 */
@@ -150,11 +150,11 @@
150 ssl_set_errmsg("SSL: cannot open SSL (%s)",
151 ERR_reason_error_string(ERR_get_error()));
152 return 1;
153 }
154
155 connStr = mprintf("%s:%d", g.urlName, g.urlPort);
156 BIO_set_conn_hostname(iBio, connStr);
157 free(connStr);
158
159 if( BIO_do_connect(iBio)<=0 ){
160 ssl_set_errmsg("SSL: cannot connect to host %s:%d (%s)",
@@ -178,29 +178,29 @@
178 return 1;
179 }
180
181 if( SSL_get_verify_result(ssl) != X509_V_OK ){
182 char *desc, *prompt;
183 char *warning = "";
184 Blob ans;
185 BIO *mem;
186
187 mem = BIO_new(BIO_s_mem());
188 X509_NAME_print_ex(mem, X509_get_subject_name(cert), 2, XN_FLAG_MULTILINE);
189 BIO_puts(mem, "\n\nIssued By:\n\n");
190 X509_NAME_print_ex(mem, X509_get_issuer_name(cert), 2, XN_FLAG_MULTILINE);
191 BIO_write(mem, "", 1); // null-terminate mem buffer
192 BIO_get_mem_data(mem, &desc);
193
 
194 if( hasSavedCertificate ){
195 warning = "WARNING: Certificate doesn't match the "
196 "saved certificate for this host!";
197 }
198 prompt = mprintf("\nUnknown SSL certificate:\n\n%s\n\n%s\n"
199 "Accept certificate [a=always/y/N]? ", desc, warning);
200 BIO_free(mem);
201
 
202 prompt_user(prompt, &ans);
203 free(prompt);
204 if( blob_str(&ans)[0]!='y' && blob_str(&ans)[0]!='a' ) {
205 X509_free(cert);
206 ssl_set_errmsg("SSL certificate declined");
207
M src/makemake.tcl
+2
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -349,10 +349,12 @@
349349
 CFLAGS = -nologo -MD -O2 -Oy- -Zi
350350
 CFLAGS = -nologo -MD -O2 -Oy-
351351
 BCC = $(CC) $(CFLAGS)
352352
 TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(I18N) $(SSL) $(INCL)
353353
 LIBS = zlib.lib ws2_32.lib
354
+##SSL uncoment below
355
+#LIBS = zlib.lib ws2_32.lib ssleay32.lib libeay32.lib user32.lib gdi32.lib advapi32.lib
354356
 LIBDIR = -LIBPATH:$(MSCDIR)\extra\lib
355357
 }
356358
 puts -nonewline "SRC = "
357359
 foreach s [lsort $src] {
358360
 puts -nonewline "${s}_.c "
359361
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -349,10 +349,12 @@
349 CFLAGS = -nologo -MD -O2 -Oy- -Zi
350 CFLAGS = -nologo -MD -O2 -Oy-
351 BCC = $(CC) $(CFLAGS)
352 TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(I18N) $(SSL) $(INCL)
353 LIBS = zlib.lib ws2_32.lib
 
 
354 LIBDIR = -LIBPATH:$(MSCDIR)\extra\lib
355 }
356 puts -nonewline "SRC = "
357 foreach s [lsort $src] {
358 puts -nonewline "${s}_.c "
359
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -349,10 +349,12 @@
349 CFLAGS = -nologo -MD -O2 -Oy- -Zi
350 CFLAGS = -nologo -MD -O2 -Oy-
351 BCC = $(CC) $(CFLAGS)
352 TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(I18N) $(SSL) $(INCL)
353 LIBS = zlib.lib ws2_32.lib
354 ##SSL uncoment below
355 #LIBS = zlib.lib ws2_32.lib ssleay32.lib libeay32.lib user32.lib gdi32.lib advapi32.lib
356 LIBDIR = -LIBPATH:$(MSCDIR)\extra\lib
357 }
358 puts -nonewline "SRC = "
359 foreach s [lsort $src] {
360 puts -nonewline "${s}_.c "
361
M win/Makefile.msc
+2
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -24,10 +24,12 @@
2424
 CFLAGS = -nologo -MD -O2 -Oy- -Zi
2525
 CFLAGS = -nologo -MD -O2 -Oy-
2626
 BCC = $(CC) $(CFLAGS)
2727
 TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(I18N) $(SSL) $(INCL)
2828
 LIBS = zlib.lib ws2_32.lib
29
+##SSL uncoment below
30
+#LIBS = zlib.lib ws2_32.lib ssleay32.lib libeay32.lib user32.lib gdi32.lib advapi32.lib
2931
 LIBDIR = -LIBPATH:$(MSCDIR)\extra\lib
3032
3133
 SRC = add_.c allrepo_.c attach_.c bag_.c blob_.c branch_.c browse_.c captcha_.c cgi_.c checkin_.c checkout_.c clearsign_.c clone_.c comformat_.c configure_.c content_.c db_.c delta_.c deltacmd_.c descendants_.c diff_.c diffcmd_.c doc_.c encode_.c file_.c finfo_.c graph_.c http_.c http_socket_.c http_ssl_.c http_transport_.c info_.c login_.c main_.c manifest_.c md5_.c merge_.c merge3_.c name_.c pivot_.c popen_.c pqueue_.c printf_.c rebuild_.c report_.c rss_.c schema_.c search_.c setup_.c sha1_.c shun_.c skins_.c stat_.c style_.c sync_.c tag_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c update_.c url_.c user_.c verify_.c vfile_.c wiki_.c wikiformat_.c winhttp_.c xfer_.c zip_.c
3234
3335
 OBJ = $(OBJDIR)\add$O $(OBJDIR)\allrepo$O $(OBJDIR)\attach$O $(OBJDIR)\bag$O $(OBJDIR)\blob$O $(OBJDIR)\branch$O $(OBJDIR)\browse$O $(OBJDIR)\captcha$O $(OBJDIR)\cgi$O $(OBJDIR)\checkin$O $(OBJDIR)\checkout$O $(OBJDIR)\clearsign$O $(OBJDIR)\clone$O $(OBJDIR)\comformat$O $(OBJDIR)\configure$O $(OBJDIR)\content$O $(OBJDIR)\db$O $(OBJDIR)\delta$O $(OBJDIR)\deltacmd$O $(OBJDIR)\descendants$O $(OBJDIR)\diff$O $(OBJDIR)\diffcmd$O $(OBJDIR)\doc$O $(OBJDIR)\encode$O $(OBJDIR)\file$O $(OBJDIR)\finfo$O $(OBJDIR)\graph$O $(OBJDIR)\http$O $(OBJDIR)\http_socket$O $(OBJDIR)\http_ssl$O $(OBJDIR)\http_transport$O $(OBJDIR)\info$O $(OBJDIR)\login$O $(OBJDIR)\main$O $(OBJDIR)\manifest$O $(OBJDIR)\md5$O $(OBJDIR)\merge$O $(OBJDIR)\merge3$O $(OBJDIR)\name$O $(OBJDIR)\pivot$O $(OBJDIR)\popen$O $(OBJDIR)\pqueue$O $(OBJDIR)\printf$O $(OBJDIR)\rebuild$O $(OBJDIR)\report$O $(OBJDIR)\rss$O $(OBJDIR)\schema$O $(OBJDIR)\search$O $(OBJDIR)\setup$O $(OBJDIR)\sha1$O $(OBJDIR)\shun$O $(OBJDIR)\skins$O $(OBJDIR)\stat$O $(OBJDIR)\style$O $(OBJDIR)\sync$O $(OBJDIR)\tag$O $(OBJDIR)\th_main$O $(OBJDIR)\timeline$O $(OBJDIR)\tkt$O $(OBJDIR)\tktsetup$O $(OBJDIR)\undo$O $(OBJDIR)\update$O $(OBJDIR)\url$O $(OBJDIR)\user$O $(OBJDIR)\verify$O $(OBJDIR)\vfile$O $(OBJDIR)\wiki$O $(OBJDIR)\wikiformat$O $(OBJDIR)\winhttp$O $(OBJDIR)\xfer$O $(OBJDIR)\zip$O $(OBJDIR)\sqlite3$O $(OBJDIR)\th$O $(OBJDIR)\th_lang$O
3436
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -24,10 +24,12 @@
24 CFLAGS = -nologo -MD -O2 -Oy- -Zi
25 CFLAGS = -nologo -MD -O2 -Oy-
26 BCC = $(CC) $(CFLAGS)
27 TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(I18N) $(SSL) $(INCL)
28 LIBS = zlib.lib ws2_32.lib
 
 
29 LIBDIR = -LIBPATH:$(MSCDIR)\extra\lib
30
31 SRC = add_.c allrepo_.c attach_.c bag_.c blob_.c branch_.c browse_.c captcha_.c cgi_.c checkin_.c checkout_.c clearsign_.c clone_.c comformat_.c configure_.c content_.c db_.c delta_.c deltacmd_.c descendants_.c diff_.c diffcmd_.c doc_.c encode_.c file_.c finfo_.c graph_.c http_.c http_socket_.c http_ssl_.c http_transport_.c info_.c login_.c main_.c manifest_.c md5_.c merge_.c merge3_.c name_.c pivot_.c popen_.c pqueue_.c printf_.c rebuild_.c report_.c rss_.c schema_.c search_.c setup_.c sha1_.c shun_.c skins_.c stat_.c style_.c sync_.c tag_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c update_.c url_.c user_.c verify_.c vfile_.c wiki_.c wikiformat_.c winhttp_.c xfer_.c zip_.c
32
33 OBJ = $(OBJDIR)\add$O $(OBJDIR)\allrepo$O $(OBJDIR)\attach$O $(OBJDIR)\bag$O $(OBJDIR)\blob$O $(OBJDIR)\branch$O $(OBJDIR)\browse$O $(OBJDIR)\captcha$O $(OBJDIR)\cgi$O $(OBJDIR)\checkin$O $(OBJDIR)\checkout$O $(OBJDIR)\clearsign$O $(OBJDIR)\clone$O $(OBJDIR)\comformat$O $(OBJDIR)\configure$O $(OBJDIR)\content$O $(OBJDIR)\db$O $(OBJDIR)\delta$O $(OBJDIR)\deltacmd$O $(OBJDIR)\descendants$O $(OBJDIR)\diff$O $(OBJDIR)\diffcmd$O $(OBJDIR)\doc$O $(OBJDIR)\encode$O $(OBJDIR)\file$O $(OBJDIR)\finfo$O $(OBJDIR)\graph$O $(OBJDIR)\http$O $(OBJDIR)\http_socket$O $(OBJDIR)\http_ssl$O $(OBJDIR)\http_transport$O $(OBJDIR)\info$O $(OBJDIR)\login$O $(OBJDIR)\main$O $(OBJDIR)\manifest$O $(OBJDIR)\md5$O $(OBJDIR)\merge$O $(OBJDIR)\merge3$O $(OBJDIR)\name$O $(OBJDIR)\pivot$O $(OBJDIR)\popen$O $(OBJDIR)\pqueue$O $(OBJDIR)\printf$O $(OBJDIR)\rebuild$O $(OBJDIR)\report$O $(OBJDIR)\rss$O $(OBJDIR)\schema$O $(OBJDIR)\search$O $(OBJDIR)\setup$O $(OBJDIR)\sha1$O $(OBJDIR)\shun$O $(OBJDIR)\skins$O $(OBJDIR)\stat$O $(OBJDIR)\style$O $(OBJDIR)\sync$O $(OBJDIR)\tag$O $(OBJDIR)\th_main$O $(OBJDIR)\timeline$O $(OBJDIR)\tkt$O $(OBJDIR)\tktsetup$O $(OBJDIR)\undo$O $(OBJDIR)\update$O $(OBJDIR)\url$O $(OBJDIR)\user$O $(OBJDIR)\verify$O $(OBJDIR)\vfile$O $(OBJDIR)\wiki$O $(OBJDIR)\wikiformat$O $(OBJDIR)\winhttp$O $(OBJDIR)\xfer$O $(OBJDIR)\zip$O $(OBJDIR)\sqlite3$O $(OBJDIR)\th$O $(OBJDIR)\th_lang$O
34
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -24,10 +24,12 @@
24 CFLAGS = -nologo -MD -O2 -Oy- -Zi
25 CFLAGS = -nologo -MD -O2 -Oy-
26 BCC = $(CC) $(CFLAGS)
27 TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(I18N) $(SSL) $(INCL)
28 LIBS = zlib.lib ws2_32.lib
29 ##SSL uncoment below
30 #LIBS = zlib.lib ws2_32.lib ssleay32.lib libeay32.lib user32.lib gdi32.lib advapi32.lib
31 LIBDIR = -LIBPATH:$(MSCDIR)\extra\lib
32
33 SRC = add_.c allrepo_.c attach_.c bag_.c blob_.c branch_.c browse_.c captcha_.c cgi_.c checkin_.c checkout_.c clearsign_.c clone_.c comformat_.c configure_.c content_.c db_.c delta_.c deltacmd_.c descendants_.c diff_.c diffcmd_.c doc_.c encode_.c file_.c finfo_.c graph_.c http_.c http_socket_.c http_ssl_.c http_transport_.c info_.c login_.c main_.c manifest_.c md5_.c merge_.c merge3_.c name_.c pivot_.c popen_.c pqueue_.c printf_.c rebuild_.c report_.c rss_.c schema_.c search_.c setup_.c sha1_.c shun_.c skins_.c stat_.c style_.c sync_.c tag_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c update_.c url_.c user_.c verify_.c vfile_.c wiki_.c wikiformat_.c winhttp_.c xfer_.c zip_.c
34
35 OBJ = $(OBJDIR)\add$O $(OBJDIR)\allrepo$O $(OBJDIR)\attach$O $(OBJDIR)\bag$O $(OBJDIR)\blob$O $(OBJDIR)\branch$O $(OBJDIR)\browse$O $(OBJDIR)\captcha$O $(OBJDIR)\cgi$O $(OBJDIR)\checkin$O $(OBJDIR)\checkout$O $(OBJDIR)\clearsign$O $(OBJDIR)\clone$O $(OBJDIR)\comformat$O $(OBJDIR)\configure$O $(OBJDIR)\content$O $(OBJDIR)\db$O $(OBJDIR)\delta$O $(OBJDIR)\deltacmd$O $(OBJDIR)\descendants$O $(OBJDIR)\diff$O $(OBJDIR)\diffcmd$O $(OBJDIR)\doc$O $(OBJDIR)\encode$O $(OBJDIR)\file$O $(OBJDIR)\finfo$O $(OBJDIR)\graph$O $(OBJDIR)\http$O $(OBJDIR)\http_socket$O $(OBJDIR)\http_ssl$O $(OBJDIR)\http_transport$O $(OBJDIR)\info$O $(OBJDIR)\login$O $(OBJDIR)\main$O $(OBJDIR)\manifest$O $(OBJDIR)\md5$O $(OBJDIR)\merge$O $(OBJDIR)\merge3$O $(OBJDIR)\name$O $(OBJDIR)\pivot$O $(OBJDIR)\popen$O $(OBJDIR)\pqueue$O $(OBJDIR)\printf$O $(OBJDIR)\rebuild$O $(OBJDIR)\report$O $(OBJDIR)\rss$O $(OBJDIR)\schema$O $(OBJDIR)\search$O $(OBJDIR)\setup$O $(OBJDIR)\sha1$O $(OBJDIR)\shun$O $(OBJDIR)\skins$O $(OBJDIR)\stat$O $(OBJDIR)\style$O $(OBJDIR)\sync$O $(OBJDIR)\tag$O $(OBJDIR)\th_main$O $(OBJDIR)\timeline$O $(OBJDIR)\tkt$O $(OBJDIR)\tktsetup$O $(OBJDIR)\undo$O $(OBJDIR)\update$O $(OBJDIR)\url$O $(OBJDIR)\user$O $(OBJDIR)\verify$O $(OBJDIR)\vfile$O $(OBJDIR)\wiki$O $(OBJDIR)\wikiformat$O $(OBJDIR)\winhttp$O $(OBJDIR)\xfer$O $(OBJDIR)\zip$O $(OBJDIR)\sqlite3$O $(OBJDIR)\th$O $(OBJDIR)\th_lang$O
36

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button