some doco updates

git-svn-id: svn://svn.code.sf.net/p/axtls/code/trunk@122 9a5d90b5-6617-0410-8a86-bb477d3ed2e3

config/makefile.conf

@@ -33,21 +33,23 @@ ifdef CONFIG_PLATFORM_WIN32
 
 ifdef CONFIG_VISUAL_STUDIO_6_0
 CONFIG_VISUAL_STUDIO_6_0_BASE_UNIX:=$(shell cygpath -u $(CONFIG_VISUAL_STUDIO_6_0_BASE))
-INCLUDE=$(shell echo "$(CONFIG_VISUAL_STUDIO_6_0_BASE)\vc98\Include")
-LIB=$(shell echo "$(CONFIG_VISUAL_STUDIO_6_0_BASE)\vc98\Lib")
+export INCLUDE=$(shell echo "$(CONFIG_VISUAL_STUDIO_6_0_BASE)\vc98\Include")
+export LIB=$(shell echo "$(CONFIG_VISUAL_STUDIO_6_0_BASE)\vc98\Lib")
 PATH:=$(CONFIG_VISUAL_STUDIO_6_0_BASE_UNIX)/common/msdev98/bin:$(CONFIG_VISUAL_STUDIO_6_0_BASE_UNIX)/vc98/bin:$(PATH)
 else
 ifdef CONFIG_VISUAL_STUDIO_7_0
 CONFIG_VISUAL_STUDIO_7_0_BASE_UNIX:=$(shell cygpath -u $(CONFIG_VISUAL_STUDIO_7_0_BASE))
-INCLUDE=$(shell echo "$(CONFIG_VISUAL_STUDIO_7_0_BASE)\vc7\include;$(CONFIG_VISUAL_STUDIO_7_0_BASE)\vc7\platformsdk\include")
-LIB=$(shell echo "$(CONFIG_VISUAL_STUDIO_7_0_BASE)\vc7\\platformsdk\lib;$(CONFIG_VISUAL_STUDIO_7_0_BASE)\vc7\lib")
+export INCLUDE=$(shell echo "$(CONFIG_VISUAL_STUDIO_7_0_BASE)\vc7\include;$(CONFIG_VISUAL_STUDIO_7_0_BASE)\vc7\platformsdk\include")
+export LIB=$(shell echo "$(CONFIG_VISUAL_STUDIO_7_0_BASE)\vc7\\platformsdk\lib;$(CONFIG_VISUAL_STUDIO_7_0_BASE)\vc7\lib")
 PATH:=$(CONFIG_VISUAL_STUDIO_7_0_BASE_UNIX)/vc7/bin:$(CONFIG_VISUAL_STUDIO_7_0_BASE_UNIX)/common7/ide:$(PATH)
 else 
 ifdef CONFIG_VISUAL_STUDIO_8_0
 CONFIG_VISUAL_STUDIO_8_0_BASE_UNIX:=$(shell cygpath -u $(CONFIG_VISUAL_STUDIO_8_0_BASE))
-INCLUDE=$(shell echo "$(CONFIG_VISUAL_STUDIO_8_0_BASE)\vc\include;$(CONFIG_VISUAL_STUDIO_8_0_BASE)\vc\platformsdk\include")
-LIB=$(shell echo "$(CONFIG_VISUAL_STUDIO_8_0_BASE)\vc\platformsdk\lib;$(CONFIG_VISUAL_STUDIO_8_0_BASE)\vc\lib")
+export INCLUDE=$(shell echo "$(CONFIG_VISUAL_STUDIO_8_0_BASE)\vc\include;$(CONFIG_VISUAL_STUDIO_8_0_BASE)\vc\platformsdk\include")
+export LIB=$(shell echo "$(CONFIG_VISUAL_STUDIO_8_0_BASE)\vc\platformsdk\lib;$(CONFIG_VISUAL_STUDIO_8_0_BASE)\vc\lib")
 PATH:=$(CONFIG_VISUAL_STUDIO_8_0_BASE_UNIX)/vc/bin:$(CONFIG_VISUAL_STUDIO_8_0_BASE_UNIX)/common7/ide:$(PATH)
+stuff:
+	@echo $(INCLUDE)
 endif
 endif
 endif

ssl/bigint.c

@@ -1497,7 +1497,7 @@ bigint *bi_mod_power2(BI_CTX *ctx, bigint *bi, bigint *bim, bigint *biexp)
 
 #ifdef CONFIG_BIGINT_CRT
 /**
- * @Use the Chinese Remainder Theorem to quickly perform RSA decrypts.
+ * @brief Use the Chinese Remainder Theorem to quickly perform RSA decrypts.
  *
  * @param ctx [in]  The bigint session context.
  * @param bi  [in]  The bigint to perform the exp/mod.

ssl/ssl.h

@@ -290,9 +290,9 @@ EXP_FUNC const uint8_t * STDCALL ssl_get_session_id(const SSL *ssl);
 /**
  * @brief Get the session id size for a handshake. 
  * 
- * This will be 32 for a ssl server and may be something else for a ssl client.
+ * This will normally be 32 but could be 0 (no session id) or something else.
  * @param ssl [in] An SSL object reference.
- * @return The number of valid bytes in a handshaking sequence
+ * @return The size of the session id.
  */
 EXP_FUNC uint8_t STDCALL ssl_get_session_id_size(const SSL *ssl);
 

ssl/test/ssltest.c

@@ -689,7 +689,7 @@ static int client_socket_init(uint16_t port)
     if (connect(client_fd, (struct sockaddr *)&address, sizeof(address)) < 0)
     {
         perror("socket");
-        close(client_fd);
+        SOCKET_CLOSE(client_fd);
         client_fd = -1;
     }
 
@@ -841,7 +841,7 @@ static int SSL_server_test(
         /* we are ready to go */
         ssl = ssl_server_new(ssl_ctx, client_fd);
         while ((size = ssl_read(ssl, &read_buf)) == SSL_OK);
-        close(client_fd);
+        SOCKET_CLOSE(client_fd);
         
         if (size < SSL_OK) /* got some alert or something nasty */
         {
@@ -869,7 +869,7 @@ static int SSL_server_test(
         ssl_free(ssl);
     }
 
-    close(server_fd);
+    SOCKET_CLOSE(server_fd);
 
 error:
     ssl_ctx_free(ssl_ctx);
@@ -1294,7 +1294,7 @@ static int SSL_client_test(
 
 client_test_exit:
     ssl_free(ssl);
-    close(client_fd);
+    SOCKET_CLOSE(client_fd);
     usleep(200000);           /* allow openssl to say something */
 
     if (sess_resume)
@@ -1484,7 +1484,7 @@ static void do_basic(void)
 
 error:
     ssl_ctx_free(ssl_clnt_ctx);
-    close(client_fd);
+    SOCKET_CLOSE(client_fd);
 
     /* exit this thread */
 }
@@ -1556,8 +1556,8 @@ static int SSL_basic_test(void)
     TTY_FLUSH();
 
     ssl_free(ssl_svr);
-    close(server_fd);
-    close(client_fd);
+    SOCKET_CLOSE(server_fd);
+    SOCKET_CLOSE(client_fd);
 
 error:
     ssl_ctx_free(ssl_svr_ctx);
@@ -1603,7 +1603,7 @@ void do_multi_clnt(multi_t *multi_data)
 
 client_test_exit:
     ssl_free(ssl);
-    close(client_fd);
+    SOCKET_CLOSE(client_fd);
     free(multi_data);
 }
 
@@ -1622,7 +1622,7 @@ void do_multi_svr(SSL *ssl)
         {
             if (res == SSL_ERROR_CONN_LOST)
             {
-                close(ssl->client_fd);
+                SOCKET_CLOSE(ssl->client_fd);
                 ssl_free(ssl);
                 break;
             }
@@ -1713,7 +1713,7 @@ int multi_thread_test(void)
 error:
     ssl_ctx_free(ssl_server_ctx);
     ssl_ctx_free(ssl_clnt_ctx);
-    close(server_fd);
+    SOCKET_CLOSE(server_fd);
     return res;
 }
 #endif

ssl/test/test_axssl.sh

@@ -24,7 +24,7 @@
 #
 
 if grep "CONFIG_PLATFORM_WIN32=y" "../config/.config"  > /dev/null; then
-    JAVA_EXE="/cygdrive/c/Program Files/Java/jdk1.5.0_06/bin/java.exe"
+    JAVA_EXE="$JAVA_HOME/bin/java.exe"
     PERL_BIN="/cygdrive/c/Perl/bin/perl"
     KILL_AXSSL="kill %1"
     KILL_CSHARP="kill %1"