arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-04-21 10:26:06 +03:00
Code

added versioning/fragmentation

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/axtls/code/trunk@56 9a5d90b5-6617-0410-8a86-bb477d3ed2e3
This commit is contained in:
cameronrich 2007-02-01 08:31:32 +00:00
parent bb61a8921c
commit f616c74150
40 changed files with 611 additions and 545 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile
View File

@ -44,9 +44,13 @@ ifdef CONFIG_SAMPLES
$(MAKE) -C samples $(MAKE) -C samples
endif endif
$(STAGE) : $(STAGE) : ssl/version.h
@mkdir -p $(STAGE) @mkdir -p $(STAGE)
# create a version file with something in it.
ssl/version.h:
@echo "#define AXTLS_VERSION \"(no version)\"" > ssl/version.h
$(PREFIX) : $(PREFIX) :
@mkdir -p $(PREFIX)/lib @mkdir -p $(PREFIX)/lib
@mkdir -p $(PREFIX)/bin @mkdir -p $(PREFIX)/bin
@ -56,6 +60,7 @@ release:
-$(MAKE) clean -$(MAKE) clean
-@rm config/*.msi config/*.back.aip config/config.h config/.config* -@rm config/*.msi config/*.back.aip config/config.h config/.config*
@rm -fr $(STAGE) @rm -fr $(STAGE)
@echo "#define AXTLS_VERSION \"$(VERSION)\"" > ssl/version.h
cd ../; tar cvfz $(RELEASE).tar.gz --wildcards-match-slash --exclude .svn axTLS; cd -; cd ../; tar cvfz $(RELEASE).tar.gz --wildcards-match-slash --exclude .svn axTLS; cd -;
docs: docs:

2
README
View File

@ -148,7 +148,7 @@ Solaris issues
============== ==============
* mconf doesn't work well - some manual tweaking is required for string values. * mconf doesn't work well - some manual tweaking is required for string values.
* GNU make and GNU patch are required and need to be in $PATH. * GNU make is required and needs to be in $PATH.
* To get swig's library dependencies to work (and for the C library to be * To get swig's library dependencies to work (and for the C library to be
found), I needed to type: found), I needed to type:

8
bindings/csharp/axTLS.cs
View File

@ -185,6 +185,14 @@ namespace axTLS
{ {
axtls.ssl_display_error(error_code); axtls.ssl_display_error(error_code);
} }
/**
* @brief Return the version of the axTLS project.
*/
public static string Version()
{
return axtls.ssl_version();
}
} }
/** /**

1
bindings/generate_SWIG_interface.pl
View File

@ -30,6 +30,7 @@ sub transformSignature
# make API Java more 'byte' friendly # make API Java more 'byte' friendly
$line =~ s/uint32_t/int/g; $line =~ s/uint32_t/int/g;
$line =~ s/const uint8_t \* /const unsigned char \* /g; $line =~ s/const uint8_t \* /const unsigned char \* /g;
$line =~ s/\(void\)/()/g;
if ($ARGV[0] eq "-java") if ($ARGV[0] eq "-java")
{ {
$line =~ s/.*ssl_read.*//g; $line =~ s/.*ssl_read.*//g;

1
bindings/generate_interface.pl
View File

@ -59,6 +59,7 @@ sub transformSignature
$line =~ s/SSLCTX \* ?/IntPtr /g; $line =~ s/SSLCTX \* ?/IntPtr /g;
$line =~ s/SSLObjLoader \* ?/IntPtr /g; $line =~ s/SSLObjLoader \* ?/IntPtr /g;
$line =~ s/SSL \* ?/IntPtr /g; $line =~ s/SSL \* ?/IntPtr /g;
$line =~ s/\(void\)/()/g;
} }
elsif ($binding == $VBNET) elsif ($binding == $VBNET)
{ {

8
bindings/java/SSLUtil.java
View File

@ -92,5 +92,13 @@ public class SSLUtil
{ {
axtlsj.ssl_display_error(error_code); axtlsj.ssl_display_error(error_code);
} }
/**
* @brief Return the version of the axTLS project.
*/
public static String version()
{
return axtlsj.ssl_version();
}
} }

4
bindings/vbnet/axTLSvb.vb
View File

@ -83,6 +83,10 @@ Namespace axTLSvb
Public Shared Sub DisplayError(ByVal error_code As Integer) Public Shared Sub DisplayError(ByVal error_code As Integer)
axtls.ssl_display_error(error_code) axtls.ssl_display_error(error_code)
End Sub End Sub
Public Shared Function Version() As String
Return axtls.ssl_version()
End Function
End Class End Class
Public Class SSLCTX Public Class SSLCTX

94
config/axhttpd.aip
View File

@ -1,17 +1,17 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?> <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<DOCUMENT type="Advanced Installer" CreateVersion="3.9" version="4.1.1" modules="freeware" RootPath="." Language="en"> <DOCUMENT type="Advanced Installer" CreateVersion="3.9" version="4.2" modules="freeware" RootPath="." Language="en">
<COMPONENT cid="caphyon.advinst.msicomp.MsiPropsComponent"> <COMPONENT cid="caphyon.advinst.msicomp.MsiPropsComponent">
<ROW Property="ALLUSERS" Value="2"/> <ROW Property="ALLUSERS" Value="2"/>
<ROW Property="ARPCOMMENTS" Value="This installer database contains the logic and data required to install &lt;product name&gt;." ValueLocId="*"/> <ROW Property="ARPCOMMENTS" Value="This installer database contains the logic and data required to install &lt;product name&gt;." ValueLocId="*"/>
<ROW Property="ARPPRODUCTICON" Value="controlPanelIcon.exe"/> <ROW Property="ARPPRODUCTICON" Value="controlPanelIcon.exe"/>
<ROW Property="ARPURLINFOABOUT" Value="http://www.leroc.com.au/axTLS"/> <ROW Property="ARPURLINFOABOUT" Value="http://axtls.cerocclub.com.au"/>
<ROW Property="BannerBitmap" Value="default_banner.bmp" Type="1"/> <ROW Property="BannerBitmap" Value="default_banner.bmp" Type="1"/>
<ROW Property="DialogBitmap" Value="default_dialog.bmp" Type="1"/> <ROW Property="DialogBitmap" Value="default_dialog.bmp" Type="1"/>
<ROW Property="Manufacturer" Value="axTLS" ValueLocId="*"/> <ROW Property="Manufacturer" Value="axTLS" ValueLocId="*"/>
<ROW Property="ProductCode" Value="1033:{95CBFC63-55F3-4811-8E6A-933E33358612} "/> <ROW Property="ProductCode" Value="1033:{4708D414-9C0E-46D2-9B67-D6421C9C5F81} "/>
<ROW Property="ProductLanguage" Value="1033"/> <ROW Property="ProductLanguage" Value="1033"/>
<ROW Property="ProductName" Value="Awhttpd" ValueLocId="*"/> <ROW Property="ProductName" Value="Axhttpd" ValueLocId="*"/>
<ROW Property="ProductVersion" Value="1.0.2"/> <ROW Property="ProductVersion" Value="1.1.0"/>
<ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND"/> <ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND"/>
<ROW Property="UpgradeCode" Value="{93E5623E-740C-449C-9770-EDABD392868D}"/> <ROW Property="UpgradeCode" Value="{93E5623E-740C-449C-9770-EDABD392868D}"/>
</COMPONENT> </COMPONENT>
@ -23,16 +23,6 @@
<ROW Directory="SHORTCUTDIR" Directory_Parent="TARGETDIR" DefaultDir="SHORTC~1|SHORTCUTDIR" IsPseudoRoot="1"/> <ROW Directory="SHORTCUTDIR" Directory_Parent="TARGETDIR" DefaultDir="SHORTC~1|SHORTCUTDIR" IsPseudoRoot="1"/>
<ROW Directory="TARGETDIR" DefaultDir="SourceDir"/> <ROW Directory="TARGETDIR" DefaultDir="SourceDir"/>
<ROW Directory="crypto_files_DIR" Directory_Parent="www_DIR" DefaultDir="crypto~1|crypto_files"/> <ROW Directory="crypto_files_DIR" Directory_Parent="www_DIR" DefaultDir="crypto~1|crypto_files"/>
<ROW Directory="prop_base_1_DIR" Directory_Parent="tmp_DIR" DefaultDir="prop-b~1|prop-base"/>
<ROW Directory="prop_base_DIR" Directory_Parent="svn_DIR" DefaultDir="prop-b~1|prop-base"/>
<ROW Directory="props_1_DIR" Directory_Parent="tmp_DIR" DefaultDir="props"/>
<ROW Directory="props_DIR" Directory_Parent="svn_DIR" DefaultDir="props"/>
<ROW Directory="svn_DIR" Directory_Parent="crypto_files_DIR" DefaultDir="svn~1|.svn"/>
<ROW Directory="text_base_1_DIR" Directory_Parent="tmp_DIR" DefaultDir="text-b~1|text-base"/>
<ROW Directory="text_base_DIR" Directory_Parent="svn_DIR" DefaultDir="text-b~1|text-base"/>
<ROW Directory="tmp_DIR" Directory_Parent="svn_DIR" DefaultDir="tmp"/>
<ROW Directory="wcprops_1_DIR" Directory_Parent="svn_DIR" DefaultDir="wcprops"/>
<ROW Directory="wcprops_DIR" Directory_Parent="tmp_DIR" DefaultDir="wcprops"/>
<ROW Directory="www_DIR" Directory_Parent="APPDIR" DefaultDir="www"/> <ROW Directory="www_DIR" Directory_Parent="APPDIR" DefaultDir="www"/>
</COMPONENT> </COMPONENT>
<COMPONENT cid="caphyon.advinst.msicomp.MsiCompsComponent"> <COMPONENT cid="caphyon.advinst.msicomp.MsiCompsComponent">
@ -46,24 +36,14 @@
<ROW Component="axtlsj.dll" ComponentId="{AB8043C7-8291-4898-B34A-561335956DC1}" Directory_="APPDIR" Attributes="0" KeyPath="axtlsj.dll" FullKeyPath="APPDIR\axtlsj.dll"/> <ROW Component="axtlsj.dll" ComponentId="{AB8043C7-8291-4898-B34A-561335956DC1}" Directory_="APPDIR" Attributes="0" KeyPath="axtlsj.dll" FullKeyPath="APPDIR\axtlsj.dll"/>
<ROW Component="bigint.h" ComponentId="{FC3E492B-D4F0-41FB-A977-76F6E9FE9FFE}" Directory_="New_Folder_DIR" Attributes="0" KeyPath="bigint.h" FullKeyPath="APPDIR\include"/> <ROW Component="bigint.h" ComponentId="{FC3E492B-D4F0-41FB-A977-76F6E9FE9FFE}" Directory_="New_Folder_DIR" Attributes="0" KeyPath="bigint.h" FullKeyPath="APPDIR\include"/>
<ROW Component="crypto_2600des.gif" ComponentId="{CF142350-C3E2-4F82-88AF-0706F8D8C7F9}" Directory_="crypto_files_DIR" Attributes="0" KeyPath="crypto_2600des.gif" FullKeyPath="APPDIR\www\crypto_files"/> <ROW Component="crypto_2600des.gif" ComponentId="{CF142350-C3E2-4F82-88AF-0706F8D8C7F9}" Directory_="crypto_files_DIR" Attributes="0" KeyPath="crypto_2600des.gif" FullKeyPath="APPDIR\www\crypto_files"/>
<ROW Component="crypto_2600des.gif.svn_base" ComponentId="{5A7893BF-4CE9-440F-8212-886D5E21EA39}" Directory_="prop_base_DIR" Attributes="0" KeyPath="crypto_2600des.gif.svn_base" FullKeyPath="APPDIR\www\crypto_files\.svn\prop-base"/>
<ROW Component="crypto_2600des.gif.svn_base_1" ComponentId="{28160B9C-10F3-43AB-B43B-EAD04D2A62F1}" Directory_="text_base_DIR" Attributes="0" KeyPath="crypto_2600des.gif.svn_base_1" FullKeyPath="APPDIR\www\crypto_files\.svn\text-base"/>
<ROW Component="crypto_2600des.gif.svn_work" ComponentId="{22FF589C-8024-4A96-B101-5D05BFB226D4}" Directory_="props_DIR" Attributes="0" KeyPath="crypto_2600des.gif.svn_work" FullKeyPath="APPDIR\www\crypto_files\.svn\props"/>
<ROW Component="crypto_2600des.gif.svn_work_1" ComponentId="{8C90C876-62C5-4B00-B61C-7F79AFB316ED}" Directory_="wcprops_1_DIR" Attributes="0" KeyPath="crypto_2600des.gif.svn_work_1" FullKeyPath="APPDIR\www\crypto_files\.svn\wcprops"/>
<ROW Component="dir_wcprops" ComponentId="{466EBC3E-CFBE-4532-8D34-0CF1BD18A6B0}" Directory_="svn_DIR" Attributes="0" KeyPath="dir_wcprops" FullKeyPath="APPDIR\www\crypto_files\.svn"/>
<ROW Component="favicon.ico" ComponentId="{9A1AB507-100A-470D-A002-CD8262CA4913}" Directory_="www_DIR" Attributes="0" KeyPath="favicon.ico" FullKeyPath="APPDIR\www"/> <ROW Component="favicon.ico" ComponentId="{9A1AB507-100A-470D-A002-CD8262CA4913}" Directory_="www_DIR" Attributes="0" KeyPath="favicon.ico" FullKeyPath="APPDIR\www"/>
<ROW Component="prop_base" ComponentId="{43478899-1EF9-4375-AAA5-CDDF217F1B98}" Directory_="prop_base_1_DIR" Attributes="0"/>
<ROW Component="props" ComponentId="{B04545A5-3C92-4DCE-BEAB-BD380EF0C57C}" Directory_="props_1_DIR" Attributes="0"/>
<ROW Component="test_cgi.php" ComponentId="{9025188F-8BED-4459-86EF-74C28A3B9301}" Directory_="New_Folder_1_DIR" Attributes="0" KeyPath="test_cgi.php" FullKeyPath="APPDIR\www\test_dir"/> <ROW Component="test_cgi.php" ComponentId="{9025188F-8BED-4459-86EF-74C28A3B9301}" Directory_="New_Folder_1_DIR" Attributes="0" KeyPath="test_cgi.php" FullKeyPath="APPDIR\www\test_dir"/>
<ROW Component="text_base" ComponentId="{37B9ED8A-06B0-431B-9EB6-58ED9497E9BC}" Directory_="text_base_1_DIR" Attributes="0"/>
<ROW Component="wcprops" ComponentId="{4106AB01-565E-4281-97AE-96EC1F865899}" Directory_="wcprops_DIR" Attributes="0"/>
</COMPONENT> </COMPONENT>
<COMPONENT cid="caphyon.advinst.msicomp.MsiFeatsComponent"> <COMPONENT cid="caphyon.advinst.msicomp.MsiFeatsComponent">
<ROW Feature="MainFeature" Title="MainFeature" Description="Description" Display="1" Level="1" Directory_="APPDIR" Attributes="0" Components="axhttpd.exe axssl.csharp.exe axssl.exe axssl.vbnet.exe axtls.dll axtls.jar axtlsj.dll favicon.ico bigint.h test_cgi.php New_Folder dir_wcprops crypto_2600des.gif.svn_base crypto_2600des.gif.svn_work crypto_2600des.gif.svn_base_1 prop_base props text_base wcprops crypto_2600des.gif.svn_work_1 crypto_2600des.gif"/> <ROW Feature="MainFeature" Title="MainFeature" Description="Description" Display="1" Level="1" Directory_="APPDIR" Attributes="0" Components="axhttpd.exe axssl.csharp.exe axssl.exe axssl.vbnet.exe axtls.dll axtls.jar axtlsj.dll favicon.ico bigint.h test_cgi.php New_Folder crypto_2600des.gif"/>
<ATTRIBUTE name="CurrentFeature" value="MainFeature"/> <ATTRIBUTE name="CurrentFeature" value="MainFeature"/>
</COMPONENT> </COMPONENT>
<COMPONENT cid="caphyon.advinst.msicomp.MsiFilesComponent"> <COMPONENT cid="caphyon.advinst.msicomp.MsiFilesComponent">
<ROW File="README.txt" Component_="dir_wcprops" FileName="README.txt" Attributes="1" SourcePath="..\www\crypto_files\.svn\README.txt" SelfReg="false" Sequence="43"/>
<ROW File="axhttpd.exe" Component_="axhttpd.exe" FileName="axhttpd.exe" Attributes="0" SourcePath="..\_stage\axhttpd.exe" SelfReg="false" Sequence="1"/> <ROW File="axhttpd.exe" Component_="axhttpd.exe" FileName="axhttpd.exe" Attributes="0" SourcePath="..\_stage\axhttpd.exe" SelfReg="false" Sequence="1"/>
<ROW File="axssl.csharp.exe" Component_="axssl.csharp.exe" FileName="axsslc~1.exe|axssl.csharp.exe" Attributes="0" SourcePath="..\_stage\axssl.csharp.exe" SelfReg="false" Sequence="2"/> <ROW File="axssl.csharp.exe" Component_="axssl.csharp.exe" FileName="axsslc~1.exe|axssl.csharp.exe" Attributes="0" SourcePath="..\_stage\axssl.csharp.exe" SelfReg="false" Sequence="2"/>
<ROW File="axssl.exe" Component_="axssl.exe" FileName="axssl.exe" Attributes="0" SourcePath="..\_stage\axssl.exe" SelfReg="false" Sequence="3"/> <ROW File="axssl.exe" Component_="axssl.exe" FileName="axssl.exe" Attributes="0" SourcePath="..\_stage\axssl.exe" SelfReg="false" Sequence="3"/>
@ -76,58 +56,18 @@
<ROW File="bigint.h" Component_="bigint.h" FileName="bigint.h" Attributes="0" SourcePath="..\ssl\bigint.h" SelfReg="false" Sequence="16"/> <ROW File="bigint.h" Component_="bigint.h" FileName="bigint.h" Attributes="0" SourcePath="..\ssl\bigint.h" SelfReg="false" Sequence="16"/>
<ROW File="bigint_impl.h" Component_="bigint.h" FileName="bigint~1.h|bigint_impl.h" Attributes="0" SourcePath="..\ssl\bigint_impl.h" SelfReg="false" Sequence="13"/> <ROW File="bigint_impl.h" Component_="bigint.h" FileName="bigint~1.h|bigint_impl.h" Attributes="0" SourcePath="..\ssl\bigint_impl.h" SelfReg="false" Sequence="13"/>
<ROW File="crypto.h" Component_="bigint.h" FileName="crypto.h" Attributes="0" SourcePath="..\ssl\crypto.h" SelfReg="false" Sequence="14"/> <ROW File="crypto.h" Component_="bigint.h" FileName="crypto.h" Attributes="0" SourcePath="..\ssl\crypto.h" SelfReg="false" Sequence="14"/>
<ROW File="crypto_2600des.gif" Component_="crypto_2600des.gif" FileName="crypto~1.gif|crypto_2600des.gif" Attributes="0" SourcePath="..\www\crypto_files\crypto_2600des.gif" SelfReg="false" Sequence="62"/> <ROW File="crypto_2600des.gif" Component_="crypto_2600des.gif" FileName="crypto~1.gif|crypto_2600des.gif" Attributes="0" SourcePath="..\www\crypto_files\crypto_2600des.gif" SelfReg="false" Sequence="21"/>
<ROW File="crypto_2600des.gif.svn_base" Component_="crypto_2600des.gif.svn_base" FileName="crypto~1.svn|crypto_2600des.gif.svn-base" Attributes="1" SourcePath="..\www\crypto_files\.svn\prop-base\crypto_2600des.gif.svn-base" SelfReg="false" Sequence="25"/> <ROW File="crypto_3ways.gif" Component_="crypto_2600des.gif" FileName="crypto~2.gif|crypto_3ways.gif" Attributes="0" SourcePath="..\www\crypto_files\crypto_3ways.gif" SelfReg="false" Sequence="22"/>
<ROW File="crypto_2600des.gif.svn_base_1" Component_="crypto_2600des.gif.svn_base_1" FileName="crypto~1.svn|crypto_2600des.gif.svn-base" Attributes="1" SourcePath="..\www\crypto_files\.svn\text-base\crypto_2600des.gif.svn-base" SelfReg="false" Sequence="44"/> <ROW File="crypto_backrsa.jpg" Component_="crypto_2600des.gif" FileName="crypto~1.jpg|crypto_backrsa.jpg" Attributes="0" SourcePath="..\www\crypto_files\crypto_backrsa.jpg" SelfReg="false" Sequence="23"/>
<ROW File="crypto_2600des.gif.svn_work" Component_="crypto_2600des.gif.svn_work" FileName="crypto~1.svn|crypto_2600des.gif.svn-work" Attributes="1" SourcePath="..\www\crypto_files\.svn\props\crypto_2600des.gif.svn-work" SelfReg="false" Sequence="34"/> <ROW File="crypto_cert.gif" Component_="crypto_2600des.gif" FileName="crypto~3.gif|crypto_cert.gif" Attributes="0" SourcePath="..\www\crypto_files\crypto_cert.gif" SelfReg="false" Sequence="24"/>
<ROW File="crypto_2600des.gif.svn_work_1" Component_="crypto_2600des.gif.svn_work_1" FileName="crypto~1.svn|crypto_2600des.gif.svn-work" Attributes="1" SourcePath="..\www\crypto_files\.svn\wcprops\crypto_2600des.gif.svn-work" SelfReg="false" Sequence="53"/> <ROW File="crypto_des.gif" Component_="crypto_2600des.gif" FileName="crypto~4.gif|crypto_des.gif" Attributes="0" SourcePath="..\www\crypto_files\crypto_des.gif" SelfReg="false" Sequence="25"/>
<ROW File="crypto_3ways.gif" Component_="crypto_2600des.gif" FileName="crypto~2.gif|crypto_3ways.gif" Attributes="0" SourcePath="..\www\crypto_files\crypto_3ways.gif" SelfReg="false" Sequence="63"/> <ROW File="crypto_ecc.gif" Component_="crypto_2600des.gif" FileName="crypto~5.gif|crypto_ecc.gif" Attributes="0" SourcePath="..\www\crypto_files\crypto_ecc.gif" SelfReg="false" Sequence="26"/>
<ROW File="crypto_3ways.gif.svn_base" Component_="crypto_2600des.gif.svn_base" FileName="crypto~2.svn|crypto_3ways.gif.svn-base" Attributes="1" SourcePath="..\www\crypto_files\.svn\prop-base\crypto_3ways.gif.svn-base" SelfReg="false" Sequence="26"/> <ROW File="crypto_sslv3.gif" Component_="crypto_2600des.gif" FileName="crypto~6.gif|crypto_sslv3.gif" Attributes="0" SourcePath="..\www\crypto_files\crypto_sslv3.gif" SelfReg="false" Sequence="27"/>
<ROW File="crypto_3ways.gif.svn_base_1" Component_="crypto_2600des.gif.svn_base_1" FileName="crypto~2.svn|crypto_3ways.gif.svn-base" Attributes="1" SourcePath="..\www\crypto_files\.svn\text-base\crypto_3ways.gif.svn-base" SelfReg="false" Sequence="45"/> <ROW File="crypto_types.gif" Component_="crypto_2600des.gif" FileName="crypto~7.gif|crypto_types.gif" Attributes="0" SourcePath="..\www\crypto_files\crypto_types.gif" SelfReg="false" Sequence="28"/>
<ROW File="crypto_3ways.gif.svn_work" Component_="crypto_2600des.gif.svn_work" FileName="crypto~2.svn|crypto_3ways.gif.svn-work" Attributes="1" SourcePath="..\www\crypto_files\.svn\props\crypto_3ways.gif.svn-work" SelfReg="false" Sequence="35"/>
<ROW File="crypto_3ways.gif.svn_work_1" Component_="crypto_2600des.gif.svn_work_1" FileName="crypto~2.svn|crypto_3ways.gif.svn-work" Attributes="1" SourcePath="..\www\crypto_files\.svn\wcprops\crypto_3ways.gif.svn-work" SelfReg="false" Sequence="54"/>
<ROW File="crypto_backrsa.jpg" Component_="crypto_2600des.gif" FileName="crypto~1.jpg|crypto_backrsa.jpg" Attributes="0" SourcePath="..\www\crypto_files\crypto_backrsa.jpg" SelfReg="false" Sequence="64"/>
<ROW File="crypto_backrsa.jpg.svn_base" Component_="crypto_2600des.gif.svn_base" FileName="crypto~3.svn|crypto_backrsa.jpg.svn-base" Attributes="1" SourcePath="..\www\crypto_files\.svn\prop-base\crypto_backrsa.jpg.svn-base" SelfReg="false" Sequence="27"/>
<ROW File="crypto_backrsa.jpg.svn_base_1" Component_="crypto_2600des.gif.svn_base_1" FileName="crypto~3.svn|crypto_backrsa.jpg.svn-base" Attributes="1" SourcePath="..\www\crypto_files\.svn\text-base\crypto_backrsa.jpg.svn-base" SelfReg="false" Sequence="46"/>
<ROW File="crypto_backrsa.jpg.svn_work" Component_="crypto_2600des.gif.svn_work" FileName="crypto~3.svn|crypto_backrsa.jpg.svn-work" Attributes="1" SourcePath="..\www\crypto_files\.svn\props\crypto_backrsa.jpg.svn-work" SelfReg="false" Sequence="36"/>
<ROW File="crypto_backrsa.jpg.svn_work_1" Component_="crypto_2600des.gif.svn_work_1" FileName="crypto~3.svn|crypto_backrsa.jpg.svn-work" Attributes="1" SourcePath="..\www\crypto_files\.svn\wcprops\crypto_backrsa.jpg.svn-work" SelfReg="false" Sequence="55"/>
<ROW File="crypto_cert.gif" Component_="crypto_2600des.gif" FileName="crypto~3.gif|crypto_cert.gif" Attributes="0" SourcePath="..\www\crypto_files\crypto_cert.gif" SelfReg="false" Sequence="65"/>
<ROW File="crypto_cert.gif.svn_base" Component_="crypto_2600des.gif.svn_base" FileName="crypto~4.svn|crypto_cert.gif.svn-base" Attributes="1" SourcePath="..\www\crypto_files\.svn\prop-base\crypto_cert.gif.svn-base" SelfReg="false" Sequence="28"/>
<ROW File="crypto_cert.gif.svn_base_1" Component_="crypto_2600des.gif.svn_base_1" FileName="crypto~4.svn|crypto_cert.gif.svn-base" Attributes="1" SourcePath="..\www\crypto_files\.svn\text-base\crypto_cert.gif.svn-base" SelfReg="false" Sequence="47"/>
<ROW File="crypto_cert.gif.svn_work" Component_="crypto_2600des.gif.svn_work" FileName="crypto~4.svn|crypto_cert.gif.svn-work" Attributes="1" SourcePath="..\www\crypto_files\.svn\props\crypto_cert.gif.svn-work" SelfReg="false" Sequence="37"/>
<ROW File="crypto_cert.gif.svn_work_1" Component_="crypto_2600des.gif.svn_work_1" FileName="crypto~4.svn|crypto_cert.gif.svn-work" Attributes="1" SourcePath="..\www\crypto_files\.svn\wcprops\crypto_cert.gif.svn-work" SelfReg="false" Sequence="56"/>
<ROW File="crypto_des.gif" Component_="crypto_2600des.gif" FileName="crypto~4.gif|crypto_des.gif" Attributes="0" SourcePath="..\www\crypto_files\crypto_des.gif" SelfReg="false" Sequence="66"/>
<ROW File="crypto_des.gif.svn_base" Component_="crypto_2600des.gif.svn_base" FileName="crypto~5.svn|crypto_des.gif.svn-base" Attributes="1" SourcePath="..\www\crypto_files\.svn\prop-base\crypto_des.gif.svn-base" SelfReg="false" Sequence="29"/>
<ROW File="crypto_des.gif.svn_base_1" Component_="crypto_2600des.gif.svn_base_1" FileName="crypto~5.svn|crypto_des.gif.svn-base" Attributes="1" SourcePath="..\www\crypto_files\.svn\text-base\crypto_des.gif.svn-base" SelfReg="false" Sequence="48"/>
<ROW File="crypto_des.gif.svn_work" Component_="crypto_2600des.gif.svn_work" FileName="crypto~5.svn|crypto_des.gif.svn-work" Attributes="1" SourcePath="..\www\crypto_files\.svn\props\crypto_des.gif.svn-work" SelfReg="false" Sequence="38"/>
<ROW File="crypto_des.gif.svn_work_1" Component_="crypto_2600des.gif.svn_work_1" FileName="crypto~5.svn|crypto_des.gif.svn-work" Attributes="1" SourcePath="..\www\crypto_files\.svn\wcprops\crypto_des.gif.svn-work" SelfReg="false" Sequence="57"/>
<ROW File="crypto_ecc.gif" Component_="crypto_2600des.gif" FileName="crypto~5.gif|crypto_ecc.gif" Attributes="0" SourcePath="..\www\crypto_files\crypto_ecc.gif" SelfReg="false" Sequence="67"/>
<ROW File="crypto_ecc.gif.svn_base" Component_="crypto_2600des.gif.svn_base" FileName="crypto~6.svn|crypto_ecc.gif.svn-base" Attributes="1" SourcePath="..\www\crypto_files\.svn\prop-base\crypto_ecc.gif.svn-base" SelfReg="false" Sequence="30"/>
<ROW File="crypto_ecc.gif.svn_base_1" Component_="crypto_2600des.gif.svn_base_1" FileName="crypto~6.svn|crypto_ecc.gif.svn-base" Attributes="1" SourcePath="..\www\crypto_files\.svn\text-base\crypto_ecc.gif.svn-base" SelfReg="false" Sequence="49"/>
<ROW File="crypto_ecc.gif.svn_work" Component_="crypto_2600des.gif.svn_work" FileName="crypto~6.svn|crypto_ecc.gif.svn-work" Attributes="1" SourcePath="..\www\crypto_files\.svn\props\crypto_ecc.gif.svn-work" SelfReg="false" Sequence="39"/>
<ROW File="crypto_ecc.gif.svn_work_1" Component_="crypto_2600des.gif.svn_work_1" FileName="crypto~6.svn|crypto_ecc.gif.svn-work" Attributes="1" SourcePath="..\www\crypto_files\.svn\wcprops\crypto_ecc.gif.svn-work" SelfReg="false" Sequence="58"/>
<ROW File="crypto_sslv3.gif" Component_="crypto_2600des.gif" FileName="crypto~6.gif|crypto_sslv3.gif" Attributes="0" SourcePath="..\www\crypto_files\crypto_sslv3.gif" SelfReg="false" Sequence="68"/>
<ROW File="crypto_sslv3.gif.svn_base" Component_="crypto_2600des.gif.svn_base" FileName="crypto~7.svn|crypto_sslv3.gif.svn-base" Attributes="1" SourcePath="..\www\crypto_files\.svn\prop-base\crypto_sslv3.gif.svn-base" SelfReg="false" Sequence="31"/>
<ROW File="crypto_sslv3.gif.svn_base_1" Component_="crypto_2600des.gif.svn_base_1" FileName="crypto~7.svn|crypto_sslv3.gif.svn-base" Attributes="1" SourcePath="..\www\crypto_files\.svn\text-base\crypto_sslv3.gif.svn-base" SelfReg="false" Sequence="50"/>
<ROW File="crypto_sslv3.gif.svn_work" Component_="crypto_2600des.gif.svn_work" FileName="crypto~7.svn|crypto_sslv3.gif.svn-work" Attributes="1" SourcePath="..\www\crypto_files\.svn\props\crypto_sslv3.gif.svn-work" SelfReg="false" Sequence="40"/>
<ROW File="crypto_sslv3.gif.svn_work_1" Component_="crypto_2600des.gif.svn_work_1" FileName="crypto~7.svn|crypto_sslv3.gif.svn-work" Attributes="1" SourcePath="..\www\crypto_files\.svn\wcprops\crypto_sslv3.gif.svn-work" SelfReg="false" Sequence="59"/>
<ROW File="crypto_types.gif" Component_="crypto_2600des.gif" FileName="crypto~7.gif|crypto_types.gif" Attributes="0" SourcePath="..\www\crypto_files\crypto_types.gif" SelfReg="false" Sequence="69"/>
<ROW File="crypto_types.gif.svn_base" Component_="crypto_2600des.gif.svn_base" FileName="crypto~8.svn|crypto_types.gif.svn-base" Attributes="1" SourcePath="..\www\crypto_files\.svn\prop-base\crypto_types.gif.svn-base" SelfReg="false" Sequence="32"/>
<ROW File="crypto_types.gif.svn_base_1" Component_="crypto_2600des.gif.svn_base_1" FileName="crypto~8.svn|crypto_types.gif.svn-base" Attributes="1" SourcePath="..\www\crypto_files\.svn\text-base\crypto_types.gif.svn-base" SelfReg="false" Sequence="51"/>
<ROW File="crypto_types.gif.svn_work" Component_="crypto_2600des.gif.svn_work" FileName="crypto~8.svn|crypto_types.gif.svn-work" Attributes="1" SourcePath="..\www\crypto_files\.svn\props\crypto_types.gif.svn-work" SelfReg="false" Sequence="41"/>
<ROW File="crypto_types.gif.svn_work_1" Component_="crypto_2600des.gif.svn_work_1" FileName="crypto~8.svn|crypto_types.gif.svn-work" Attributes="1" SourcePath="..\www\crypto_files\.svn\wcprops\crypto_types.gif.svn-work" SelfReg="false" Sequence="60"/>
<ROW File="dir_wcprops" Component_="dir_wcprops" FileName="dir-wc~1|dir-wcprops" Attributes="1" SourcePath="..\www\crypto_files\.svn\dir-wcprops" SelfReg="false" Sequence="21"/>
<ROW File="empty_file" Component_="dir_wcprops" FileName="empty-~1|empty-file" Attributes="1" SourcePath="..\www\crypto_files\.svn\empty-file" SelfReg="false" Sequence="22"/>
<ROW File="entries" Component_="dir_wcprops" FileName="entries" Attributes="1" SourcePath="..\www\crypto_files\.svn\entries" SelfReg="false" Sequence="23"/>
<ROW File="favicon.ico" Component_="favicon.ico" FileName="favicon.ico" Attributes="0" SourcePath="..\www\favicon.ico" SelfReg="false" Sequence="10"/> <ROW File="favicon.ico" Component_="favicon.ico" FileName="favicon.ico" Attributes="0" SourcePath="..\www\favicon.ico" SelfReg="false" Sequence="10"/>
<ROW File="format" Component_="dir_wcprops" FileName="format" Attributes="1" SourcePath="..\www\crypto_files\.svn\format" SelfReg="false" Sequence="24"/>
<ROW File="health.sh" Component_="test_cgi.php" FileName="health.sh" Attributes="0" SourcePath="..\www\test_dir\health.sh" SelfReg="false" Sequence="19"/> <ROW File="health.sh" Component_="test_cgi.php" FileName="health.sh" Attributes="0" SourcePath="..\www\test_dir\health.sh" SelfReg="false" Sequence="19"/>
<ROW File="index.html" Component_="favicon.ico" FileName="index~1.htm|index.html" Attributes="0" SourcePath="..\www\index.html" SelfReg="false" Sequence="11"/> <ROW File="index.html" Component_="favicon.ico" FileName="index~1.htm|index.html" Attributes="0" SourcePath="..\www\index.html" SelfReg="false" Sequence="11"/>
<ROW File="kerberos.gif" Component_="crypto_2600des.gif" FileName="kerberos.gif" Attributes="0" SourcePath="..\www\crypto_files\kerberos.gif" SelfReg="false" Sequence="70"/> <ROW File="kerberos.gif" Component_="crypto_2600des.gif" FileName="kerberos.gif" Attributes="0" SourcePath="..\www\crypto_files\kerberos.gif" SelfReg="false" Sequence="29"/>
<ROW File="kerberos.gif.svn_base" Component_="crypto_2600des.gif.svn_base" FileName="kerber~1.svn|kerberos.gif.svn-base" Attributes="1" SourcePath="..\www\crypto_files\.svn\prop-base\kerberos.gif.svn-base" SelfReg="false" Sequence="33"/>
<ROW File="kerberos.gif.svn_base_1" Component_="crypto_2600des.gif.svn_base_1" FileName="kerber~1.svn|kerberos.gif.svn-base" Attributes="1" SourcePath="..\www\crypto_files\.svn\text-base\kerberos.gif.svn-base" SelfReg="false" Sequence="52"/>
<ROW File="kerberos.gif.svn_work" Component_="crypto_2600des.gif.svn_work" FileName="kerber~1.svn|kerberos.gif.svn-work" Attributes="1" SourcePath="..\www\crypto_files\.svn\props\kerberos.gif.svn-work" SelfReg="false" Sequence="42"/>
<ROW File="kerberos.gif.svn_work_1" Component_="crypto_2600des.gif.svn_work_1" FileName="kerber~1.svn|kerberos.gif.svn-work" Attributes="1" SourcePath="..\www\crypto_files\.svn\wcprops\kerberos.gif.svn-work" SelfReg="false" Sequence="61"/>
<ROW File="os_port.h" Component_="bigint.h" FileName="os_port.h" Attributes="0" SourcePath="..\ssl\os_port.h" SelfReg="false" Sequence="17"/> <ROW File="os_port.h" Component_="bigint.h" FileName="os_port.h" Attributes="0" SourcePath="..\ssl\os_port.h" SelfReg="false" Sequence="17"/>
<ROW File="some_text.txt" Component_="test_cgi.php" FileName="some_t~1.txt|some_text.txt" Attributes="0" SourcePath="..\www\test_dir\some_text.txt" SelfReg="false" Sequence="20"/> <ROW File="some_text.txt" Component_="test_cgi.php" FileName="some_t~1.txt|some_text.txt" Attributes="0" SourcePath="..\www\test_dir\some_text.txt" SelfReg="false" Sequence="20"/>
<ROW File="ssl.h" Component_="bigint.h" FileName="ssl.h" Attributes="0" SourcePath="..\ssl\ssl.h" SelfReg="false" Sequence="12"/> <ROW File="ssl.h" Component_="bigint.h" FileName="ssl.h" Attributes="0" SourcePath="..\ssl\ssl.h" SelfReg="false" Sequence="12"/>
@ -163,10 +103,6 @@
</COMPONENT> </COMPONENT>
<COMPONENT cid="caphyon.advinst.msicomp.MsiCreateFolderComponent"> <COMPONENT cid="caphyon.advinst.msicomp.MsiCreateFolderComponent">
<ROW Directory_="New_Folder_2_DIR" Component_="New_Folder"/> <ROW Directory_="New_Folder_2_DIR" Component_="New_Folder"/>
<ROW Directory_="prop_base_1_DIR" Component_="prop_base"/>
<ROW Directory_="props_1_DIR" Component_="props"/>
<ROW Directory_="text_base_1_DIR" Component_="text_base"/>
<ROW Directory_="wcprops_DIR" Component_="wcprops"/>
</COMPONENT> </COMPONENT>
<COMPONENT cid="caphyon.advinst.msicomp.MsiCustActComponent"> <COMPONENT cid="caphyon.advinst.msicomp.MsiCustActComponent">
<ROW Action="AI_DOWNGRADE" Type="19" Target="4010"/> <ROW Action="AI_DOWNGRADE" Type="19" Target="4010"/>

1
config/linuxconfig
View File

@ -39,6 +39,7 @@ CONFIG_SSL_USE_PKCS12=y
CONFIG_SSL_EXPIRY_TIME=24 CONFIG_SSL_EXPIRY_TIME=24
CONFIG_X509_MAX_CA_CERTS=4 CONFIG_X509_MAX_CA_CERTS=4
CONFIG_SSL_MAX_CERTS=2 CONFIG_SSL_MAX_CERTS=2
# CONFIG_SSL_CTX_MUTEXING is not set
CONFIG_USE_DEV_URANDOM=y CONFIG_USE_DEV_URANDOM=y
# CONFIG_WIN32_USE_CRYPTO_LIB is not set # CONFIG_WIN32_USE_CRYPTO_LIB is not set
# CONFIG_PERFORMANCE_TESTING is not set # CONFIG_PERFORMANCE_TESTING is not set

1
config/win32config
View File

@ -43,6 +43,7 @@ CONFIG_SSL_USE_PKCS12=y
CONFIG_SSL_EXPIRY_TIME=24 CONFIG_SSL_EXPIRY_TIME=24
CONFIG_X509_MAX_CA_CERTS=4 CONFIG_X509_MAX_CA_CERTS=4
CONFIG_SSL_MAX_CERTS=2 CONFIG_SSL_MAX_CERTS=2
# CONFIG_SSL_CTX_MUTEXING is not set
# CONFIG_USE_DEV_URANDOM is not set # CONFIG_USE_DEV_URANDOM is not set
CONFIG_WIN32_USE_CRYPTO_LIB=y CONFIG_WIN32_USE_CRYPTO_LIB=y
# CONFIG_PERFORMANCE_TESTING is not set # CONFIG_PERFORMANCE_TESTING is not set

2
docsrc/doco_footer.html
View File

@ -1,3 +1,3 @@
<p></p> <p></p>
<p align="center"><img src="../images/tsbasbw.gif" width="1000" height="7"></p> <p align="center"><img src="../images/tsbasbw.gif" width="1000" height="7"></p>
<CITE>Copyright <sup>©</sup> 2006 Cameron Rich</CITE> <CITE>Copyright <sup>©</sup> 2007 Cameron Rich</CITE>

2
httpd/Makefile
View File

@ -58,6 +58,8 @@ OBJ= \
proc.o \ proc.o \
mime_types.o mime_types.o
include ../config/makefile.post
ifndef CONFIG_PLATFORM_WIN32 ifndef CONFIG_PLATFORM_WIN32
$(TARGET): $(OBJ) ../$(STAGE)/libaxtls.a $(TARGET): $(OBJ) ../$(STAGE)/libaxtls.a

32
httpd/main.c
View File

@ -24,7 +24,6 @@
#include <sys/stat.h> #include <sys/stat.h>
#include "axhttp.h" #include "axhttp.h"
// GLOBALS
struct serverstruct *servers; struct serverstruct *servers;
struct connstruct *usedconns; struct connstruct *usedconns;
struct connstruct *freeconns; struct connstruct *freeconns;
@ -99,7 +98,7 @@ int main(int argc, char *argv[])
WSADATA wsaData; WSADATA wsaData;
WSAStartup(wVersionRequested,&wsaData); WSAStartup(wVersionRequested,&wsaData);
#else #else
if (getuid() == 0) // change our uid if we are root if (getuid() == 0) /* change our uid if we are root */
{ {
setgid(32767); setgid(32767);
setuid(32767); setuid(32767);
@ -111,6 +110,7 @@ int main(int argc, char *argv[])
signal(SIGCHLD, reaper); signal(SIGCHLD, reaper);
#endif #endif
#endif #endif
signal(SIGINT, sigint_cleanup); signal(SIGINT, sigint_cleanup);
signal(SIGTERM, die); signal(SIGTERM, die);
mime_init(); mime_init();
@ -167,8 +167,8 @@ int main(int argc, char *argv[])
addcgiext(CONFIG_HTTP_CGI_EXTENSION); addcgiext(CONFIG_HTTP_CGI_EXTENSION);
#endif #endif
#if defined(CONFIG_HTTP_VERBOSE) #if defined(CONFIG_HTTP_VERBOSE)
printf("axhttpd: listening on ports http:%d and https:%d\n", printf("axhttpd (%s): listening on ports %d (http) and %d (https)\n",
CONFIG_HTTP_PORT, CONFIG_HTTP_HTTPS_PORT); ssl_version(), CONFIG_HTTP_PORT, CONFIG_HTTP_HTTPS_PORT);
TTY_FLUSH(); TTY_FLUSH();
#endif #endif
#if defined(CONFIG_HTTP_IS_DAEMON) #if defined(CONFIG_HTTP_IS_DAEMON)
@ -178,7 +178,7 @@ int main(int argc, char *argv[])
setsid(); setsid();
#endif #endif
// main loop /* main loop */
while (1) while (1)
{ {
FD_ZERO(&rfds); FD_ZERO(&rfds);
@ -186,7 +186,7 @@ int main(int argc, char *argv[])
rnum = wnum = -1; rnum = wnum = -1;
sp = servers; sp = servers;
while (sp != NULL) // read each server port while (sp != NULL) /* read each server port */
{ {
FD_SET(sp->sd, &rfds); FD_SET(sp->sd, &rfds);
@ -195,13 +195,13 @@ int main(int argc, char *argv[])
sp = sp->next; sp = sp->next;
} }
// Add the established sockets /* Add the established sockets */
tp = usedconns; tp = usedconns;
currtime = time(NULL); currtime = time(NULL);
while (tp != NULL) while (tp != NULL)
{ {
if (currtime > tp->timeout) // timed out? Kill it. if (currtime > tp->timeout) /* timed out? Kill it. */
{ {
to = tp; to = tp;
tp = tp->next; tp = tp->next;
@ -253,7 +253,7 @@ int main(int argc, char *argv[])
wnum != -1 ? &wfds : NULL, wnum != -1 ? &wfds : NULL,
NULL, NULL); NULL, NULL);
// New connection? /* New connection? */
sp = servers; sp = servers;
while (active > 0 && sp != NULL) while (active > 0 && sp != NULL)
{ {
@ -266,7 +266,7 @@ int main(int argc, char *argv[])
sp = sp->next; sp = sp->next;
} }
// Handle the established sockets /* Handle the established sockets */
tp = usedconns; tp = usedconns;
while (active > 0 && tp != NULL) while (active > 0 && tp != NULL)
@ -446,14 +446,10 @@ static void handlenewconnection(int listenfd, int is_ssl)
int connfd = accept(listenfd, (struct sockaddr *)&their_addr, &tp); int connfd = accept(listenfd, (struct sockaddr *)&their_addr, &tp);
if (tp == sizeof(struct sockaddr_in6)) if (tp == sizeof(struct sockaddr_in6))
{
inet_ntop(AF_INET6, &their_addr.sin6_addr, ipbuf, sizeof(ipbuf)); inet_ntop(AF_INET6, &their_addr.sin6_addr, ipbuf, sizeof(ipbuf));
}
else if (tp == sizeof(struct sockaddr_in)) else if (tp == sizeof(struct sockaddr_in))
{
inet_ntop(AF_INET, &(((struct sockaddr_in *)&their_addr)->sin_addr), inet_ntop(AF_INET, &(((struct sockaddr_in *)&their_addr)->sin_addr),
ipbuf, sizeof(ipbuf)); ipbuf, sizeof(ipbuf));
}
else else
*ipbuf = '\0'; *ipbuf = '\0';
@ -539,7 +535,7 @@ static void addconnection(int sd, char *ip, int is_ssl)
{ {
struct connstruct *tp; struct connstruct *tp;
// Get ourselves a connstruct /* Get ourselves a connstruct */
if (freeconns == NULL) if (freeconns == NULL)
tp = (struct connstruct *)malloc(sizeof(struct connstruct)); tp = (struct connstruct *)malloc(sizeof(struct connstruct));
else else
@ -548,7 +544,7 @@ static void addconnection(int sd, char *ip, int is_ssl)
freeconns = tp->next; freeconns = tp->next;
} }
// Attach it to the used list /* Attach it to the used list */
tp->next = usedconns; tp->next = usedconns;
usedconns = tp; usedconns = tp;
tp->networkdesc = sd; tp->networkdesc = sd;
@ -605,11 +601,11 @@ void removeconnection(struct connstruct *cn)
if (shouldret) if (shouldret)
return; return;
// If we did, add it to the free list /* If we did, add it to the free list */
cn->next = freeconns; cn->next = freeconns;
freeconns = cn; freeconns = cn;
// Close it all down /* Close it all down */
if (cn->networkdesc != -1) if (cn->networkdesc != -1)
{ {
if (cn->is_ssl) if (cn->is_ssl)

6
httpd/mime_types.c
View File

@ -32,18 +32,18 @@ typedef struct
static mime_table_t mime_table[] = static mime_table_t mime_table[] =
{ {
// Fundamentals /* Fundamental types */
{ ".html", "text/html" }, { ".html", "text/html" },
{ ".htm", "text/html" }, { ".htm", "text/html" },
{ ".css", "text/css" }, { ".css", "text/css" },
// Basic graphics /* Basic graphics */
{ ".jpg", "image/jpeg" }, { ".jpg", "image/jpeg" },
{ ".gif", "image/gif" }, { ".gif", "image/gif" },
{ ".png", "image/png" }, { ".png", "image/png" },
#ifdef CONFIG_HTTP_ALL_MIME_TYPES #ifdef CONFIG_HTTP_ALL_MIME_TYPES
// This list is a bit expensive to maintain normally, so it's an option. /* This list is a bit expensive to maintain normally, so it's an option. */
{ ".txt", "text/plain" }, { ".txt", "text/plain" },
{ ".rtx", "text/richtext" }, { ".rtx", "text/richtext" },
{ ".etx", "text/x-setext" }, { ".etx", "text/x-setext" },

62
httpd/proc.c
View File

@ -48,7 +48,7 @@ static void split(char *tp, char *sp[], int maxwords, char sc);
static int iscgi(const char *fn); static int iscgi(const char *fn);
#endif #endif
// Returns 1 if elems should continue being read, 0 otherwise /* Returns 1 if elems should continue being read, 0 otherwise */
static int procheadelem(struct connstruct *cn, char *buf) static int procheadelem(struct connstruct *cn, char *buf)
{ {
char *delim, *value; char *delim, *value;
@ -79,8 +79,6 @@ static int procheadelem(struct connstruct *cn, char *buf)
if (sanitizefile(value) == 0) if (sanitizefile(value) == 0)
{ {
printf("#3\n");
TTY_FLUSH();
send404(cn); send404(cn);
removeconnection(cn); removeconnection(cn);
return 0; return 0;
@ -155,7 +153,7 @@ static void procdirlisting(struct connstruct *cn)
return; return;
} }
// Get rid of the "." /* Get rid of the "." */
readdir(cn->dirp); readdir(cn->dirp);
#endif #endif
@ -198,12 +196,12 @@ void procdodir(struct connstruct *cn)
file = dp->d_name; file = dp->d_name;
#endif #endif
// if no index file, don't display the ".." directory /* if no index file, don't display the ".." directory */
if (cn->filereq[0] == '/' && cn->filereq[1] == '\0' && if (cn->filereq[0] == '/' && cn->filereq[1] == '\0' &&
strcmp(file, "..") == 0) strcmp(file, "..") == 0)
continue; continue;
// don't display files beginning with "." /* don't display files beginning with "." */
if (file[0] == '.' && file[1] != '.') if (file[0] == '.' && file[1] != '.')
continue; continue;
@ -257,7 +255,7 @@ void procreadhead(struct connstruct *cn)
rv = special_read(cn, buf, sizeof(buf)-1); rv = special_read(cn, buf, sizeof(buf)-1);
if (rv <= 0) if (rv <= 0)
{ {
if (rv < 0) // really dead? if (rv < 0) /* really dead? */
removeconnection(cn); removeconnection(cn);
return; return;
} }
@ -265,10 +263,10 @@ void procreadhead(struct connstruct *cn)
buf[rv] = '\0'; buf[rv] = '\0';
next = tp = buf; next = tp = buf;
// Split up lines and send to procheadelem() /* Split up lines and send to procheadelem() */
while (*next != '\0') while (*next != '\0')
{ {
// If we have a blank line, advance to next stage! /* If we have a blank line, advance to next stage! */
if (*next == '\r' || *next == '\n') if (*next == '\r' || *next == '\n')
{ {
buildactualfile(cn); buildactualfile(cn);
@ -319,7 +317,7 @@ void procsendhead(struct connstruct *cn)
#if defined(CONFIG_HTTP_HAS_CGI) #if defined(CONFIG_HTTP_HAS_CGI)
if (trycgi_withpathinfo(cn) == 0) if (trycgi_withpathinfo(cn) == 0)
{ {
// We Try To Find A CGI /* We Try To Find A CGI */
proccgi(cn, 1); proccgi(cn, 1);
return; return;
} }
@ -334,7 +332,7 @@ void procsendhead(struct connstruct *cn)
if (iscgi(cn->actualfile)) if (iscgi(cn->actualfile))
{ {
#ifndef WIN32 #ifndef WIN32
// Set up CGI script /* Set up CGI script */
if ((stbuf.st_mode & S_IEXEC) == 0 || isdir(cn->actualfile)) if ((stbuf.st_mode & S_IEXEC) == 0 || isdir(cn->actualfile))
{ {
send404(cn); send404(cn);
@ -350,11 +348,11 @@ void procsendhead(struct connstruct *cn)
if ((stbuf.st_mode & S_IFMT) == S_IFDIR) if ((stbuf.st_mode & S_IFMT) == S_IFDIR)
{ {
// Check to see if this dir has an index file /* Check to see if this dir has an index file */
if (procindex(cn, &stbuf) == 0) if (procindex(cn, &stbuf) == 0)
{ {
#if defined(CONFIG_HTTP_DIRECTORIES) #if defined(CONFIG_HTTP_DIRECTORIES)
// If not, we do a directory listing of it /* If not, we do a directory listing of it */
procdirlisting(cn); procdirlisting(cn);
#else #else
send404(cn); send404(cn);
@ -364,10 +362,10 @@ void procsendhead(struct connstruct *cn)
} }
#if defined(CONFIG_HTTP_HAS_CGI) #if defined(CONFIG_HTTP_HAS_CGI)
// If the index is a CGI file, handle it like any other CGI /* If the index is a CGI file, handle it like any other CGI */
if (iscgi(cn->actualfile)) if (iscgi(cn->actualfile))
{ {
// Set up CGI script /* Set up CGI script */
if ((stbuf.st_mode & S_IEXEC) == 0 || isdir(cn->actualfile)) if ((stbuf.st_mode & S_IEXEC) == 0 || isdir(cn->actualfile))
{ {
send404(cn); send404(cn);
@ -383,7 +381,7 @@ void procsendhead(struct connstruct *cn)
if (cn->modified_since) if (cn->modified_since)
{ {
// file has already been read before /* file has already been read before */
snprintf(buf, sizeof(buf), "HTTP/1.1 304 Not Modified\nServer: " snprintf(buf, sizeof(buf), "HTTP/1.1 304 Not Modified\nServer: "
"axhttpd V%s\nDate: %s\n", VERSION, date); "axhttpd V%s\nDate: %s\n", VERSION, date);
special_write(cn, buf, strlen(buf)); special_write(cn, buf, strlen(buf));
@ -402,7 +400,7 @@ void procsendhead(struct connstruct *cn)
"Content-Type: %s\nContent-Length: %ld\n" "Content-Type: %s\nContent-Length: %ld\n"
"Date: %sLast-Modified: %s\n", VERSION, "Date: %sLast-Modified: %s\n", VERSION,
getmimetype(cn->actualfile), (long) stbuf.st_size, getmimetype(cn->actualfile), (long) stbuf.st_size,
date, ctime(&(stbuf.st_mtime))); // ctime() has a \n on the end date, ctime(&(stbuf.st_mtime))); /* ctime() has a \n on the end */
special_write(cn, buf, strlen(buf)); special_write(cn, buf, strlen(buf));
@ -505,8 +503,8 @@ static int special_read(struct connstruct *cn, void *buf, size_t count)
if (cn->is_ssl) if (cn->is_ssl)
{ {
SSL *ssl = ssl_find(servers->ssl_ctx, cn->networkdesc);
uint8_t *read_buf; uint8_t *read_buf;
SSL *ssl = ssl_find(servers->ssl_ctx, cn->networkdesc);
if ((res = ssl_read(ssl, &read_buf)) > SSL_OK) if ((res = ssl_read(ssl, &read_buf)) > SSL_OK)
memcpy(buf, read_buf, res > (int)count ? count : res); memcpy(buf, read_buf, res > (int)count ? count : res);
@ -517,9 +515,9 @@ static int special_read(struct connstruct *cn, void *buf, size_t count)
return res; return res;
} }
// Returns 0 if no index was found and doesn't modify cn->actualfile /* Returns 0 if no index was found and doesn't modify cn->actualfile
// Returns 1 if an index was found and puts the index in cn->actualfile Returns 1 if an index was found and puts the index in cn->actualfile
// and puts its stat info into stp and puts its stat info into stp */
static int procindex(struct connstruct *cn, struct stat *stp) static int procindex(struct connstruct *cn, struct stat *stp)
{ {
char tbuf[MAXREQUESTLENGTH]; char tbuf[MAXREQUESTLENGTH];
@ -557,9 +555,9 @@ static void proccgi(struct connstruct *cn, int has_pathinfo)
#ifndef WIN32 #ifndef WIN32
pipe(tpipe); pipe(tpipe);
if (fork() > 0) // parent if (fork() > 0) /* parent */
{ {
// Close the write descriptor /* Close the write descriptor */
close(tpipe[1]); close(tpipe[1]);
cn->filedesc = tpipe[0]; cn->filedesc = tpipe[0];
cn->state = STATE_WANT_TO_READ_FILE; cn->state = STATE_WANT_TO_READ_FILE;
@ -567,16 +565,16 @@ static void proccgi(struct connstruct *cn, int has_pathinfo)
return; return;
} }
// The problem child... /* The problem child... */
// Our stdout/stderr goes to the socket /* Our stdout/stderr goes to the socket */
dup2(tpipe[1], 1); dup2(tpipe[1], 1);
dup2(tpipe[1], 2); dup2(tpipe[1], 2);
// If it was a POST request, send the socket data to our stdin /* If it was a POST request, send the socket data to our stdin */
if (cn->reqtype == TYPE_POST) if (cn->reqtype == TYPE_POST)
dup2(cn->networkdesc, 0); dup2(cn->networkdesc, 0);
else // Otherwise we can shutdown the read side of the sock else /* Otherwise we can shutdown the read side of the sock */
shutdown(cn->networkdesc, 0); shutdown(cn->networkdesc, 0);
close(tpipe[0]); close(tpipe[0]);
@ -645,7 +643,7 @@ static int trycgi_withpathinfo(struct connstruct *cn)
{ {
char tpfile[MAXREQUESTLENGTH]; char tpfile[MAXREQUESTLENGTH];
char fr_str[MAXREQUESTLENGTH]; char fr_str[MAXREQUESTLENGTH];
char *fr_rs[MAXCGIARGS]; // filereq splitted char *fr_rs[MAXCGIARGS]; /* filereq splitted */
int i = 0, offset; int i = 0, offset;
my_strncpy(fr_str, cn->filereq, MAXREQUESTLENGTH); my_strncpy(fr_str, cn->filereq, MAXREQUESTLENGTH);
@ -818,14 +816,14 @@ static int sanitizefile(const char *buf)
{ {
int len, i; int len, i;
// Don't accept anything not starting with a / /* Don't accept anything not starting with a / */
if (*buf != '/') if (*buf != '/')
return 0; return 0;
len = strlen(buf); len = strlen(buf);
for (i = 0; i < len; i++) for (i = 0; i < len; i++)
{ {
// Check for "/." : In other words, don't send files starting with a . /* Check for "/." i.e. don't send files starting with a . */
if (buf[i] == '/' && buf[i+1] == '.') if (buf[i] == '/' && buf[i+1] == '.')
return 0; return 0;
} }
@ -837,14 +835,14 @@ static int sanitizehost(char *buf)
{ {
while (*buf != '\0') while (*buf != '\0')
{ {
// Handle the port /* Handle the port */
if (*buf == ':') if (*buf == ':')
{ {
*buf = '\0'; *buf = '\0';
return 1; return 1;
} }
// Enforce some basic URL rules... /* Enforce some basic URL rules... */
if ((isalnum(*buf) == 0 && *buf != '-' && *buf != '.') || if ((isalnum(*buf) == 0 && *buf != '-' && *buf != '.') ||
(*buf == '.' && *(buf+1) == '.') || (*buf == '.' && *(buf+1) == '.') ||
(*buf == '.' && *(buf+1) == '-') || (*buf == '.' && *(buf+1) == '-') ||

10
samples/c/axssl.c
View File

@ -63,11 +63,15 @@ int main(int argc, char *argv[])
signal(SIGPIPE, SIG_IGN); /* ignore pipe errors */ signal(SIGPIPE, SIG_IGN); /* ignore pipe errors */
#endif #endif
if (argc == 2 && strcmp(argv[1], "version") == 0)
{
printf("axssl %s\n", ssl_version());
exit(0);
}
if (argc < 2 || ( if (argc < 2 || (
strcmp(argv[1], "s_server") && strcmp(argv[1], "s_client"))) strcmp(argv[1], "s_server") && strcmp(argv[1], "s_client")))
{
print_options(argc > 1 ? argv[1] : ""); print_options(argc > 1 ? argv[1] : "");
}
strcmp(argv[1], "s_server") ? strcmp(argv[1], "s_server") ?
do_client(argc, argv) : do_server(argc, argv); do_client(argc, argv) : do_server(argc, argv);
@ -733,7 +737,7 @@ static void do_client(int argc, char *argv[])
static void print_options(char *option) static void print_options(char *option)
{ {
printf("axssl: Error: '%s' is an invalid command.\n", option); printf("axssl: Error: '%s' is an invalid command.\n", option);
printf("usage: axssl [s_server|s_client] [args ...]\n"); printf("usage: axssl [s_server|s_client|version] [args ...]\n");
exit(1); exit(1);
} }

15
samples/csharp/axssl.cs
View File

@ -44,24 +44,24 @@ public class axssl
*/ */
public static void Main(string[] args) public static void Main(string[] args)
{ {
if (args.Length == 1 && args[0] == "version")
{
Console.WriteLine("axssl.csharp " + SSLUtil.Version());
Environment.Exit(0);
}
axssl runner = new axssl(); axssl runner = new axssl();
if (args.Length < 1 || (args[0] != "s_server" && args[0] != "s_client")) if (args.Length < 1 || (args[0] != "s_server" && args[0] != "s_client"))
{
runner.print_options(args.Length > 0 ? args[0] : ""); runner.print_options(args.Length > 0 ? args[0] : "");
}
int build_mode = SSLUtil.BuildMode(); int build_mode = SSLUtil.BuildMode();
if (args[0] == "s_server") if (args[0] == "s_server")
{
runner.do_server(build_mode, args); runner.do_server(build_mode, args);
}
else else
{
runner.do_client(build_mode, args); runner.do_client(build_mode, args);
} }
}
/* /*
* do_server() * do_server()
@ -603,7 +603,8 @@ public class axssl
{ {
Console.WriteLine("axssl: Error: '" + option + Console.WriteLine("axssl: Error: '" + option +
"' is an invalid command."); "' is an invalid command.");
Console.WriteLine("usage: axssl.cs.exe [s_server|s_client] [args ...]"); Console.WriteLine("usage: axssl.csharp [s_server|" +
"s_client|version] [args ...]");
Environment.Exit(1); Environment.Exit(1);
} }

26
samples/java/axssl.java
View File

@ -43,6 +43,12 @@ public class axssl
*/ */
public static void main(String[] args) public static void main(String[] args)
{ {
if (args.length == 1 && args[0].equals("version"))
{
System.out.println("axtls.jar " + SSLUtil.version());
System.exit(0);
}
axssl runner = new axssl(); axssl runner = new axssl();
try try
@ -57,14 +63,10 @@ public class axssl
int build_mode = SSLUtil.buildMode(); int build_mode = SSLUtil.buildMode();
if (args[0].equals("s_server")) if (args[0].equals("s_server"))
{
runner.do_server(build_mode, args); runner.do_server(build_mode, args);
}
else else
{
runner.do_client(build_mode, args); runner.do_client(build_mode, args);
} }
}
catch (Exception e) catch (Exception e)
{ {
System.out.println(e); System.out.println(e);
@ -193,9 +195,7 @@ public class axssl
axtlsj.SSL_DEFAULT_SVR_SESS); axtlsj.SSL_DEFAULT_SVR_SESS);
if (ssl_ctx == null) if (ssl_ctx == null)
{
throw new Exception("Error: Server context is invalid"); throw new Exception("Error: Server context is invalid");
}
if (private_key_file != null) if (private_key_file != null)
{ {
@ -316,9 +316,7 @@ public class axssl
throws Exception throws Exception
{ {
if (build_mode < axtlsj.SSL_BUILD_ENABLE_CLIENT) if (build_mode < axtlsj.SSL_BUILD_ENABLE_CLIENT)
{
print_client_options(build_mode, args[1]); print_client_options(build_mode, args[1]);
}
int i = 1, res; int i = 1, res;
int port = 4433; int port = 4433;
@ -599,7 +597,7 @@ public class axssl
{ {
System.out.println("axssl: Error: '" + option + System.out.println("axssl: Error: '" + option +
"' is an invalid command."); "' is an invalid command.");
System.out.println("usage: axtlsj.jar [s_server|s_client] " + System.out.println("usage: axtlsj.jar [s_server|s_client|version] " +
"[args ...]"); "[args ...]");
System.exit(1); System.exit(1);
} }
@ -701,26 +699,16 @@ public class axssl
byte ciph_id = ssl.getCipherId(); byte ciph_id = ssl.getCipherId();
if (ciph_id == axtlsj.SSL_AES128_SHA) if (ciph_id == axtlsj.SSL_AES128_SHA)
{
System.out.println("AES128-SHA"); System.out.println("AES128-SHA");
}
else if (ciph_id == axtlsj.SSL_AES256_SHA) else if (ciph_id == axtlsj.SSL_AES256_SHA)
{
System.out.println("AES256-SHA"); System.out.println("AES256-SHA");
}
else if (ciph_id == axtlsj.SSL_RC4_128_SHA) else if (ciph_id == axtlsj.SSL_RC4_128_SHA)
{
System.out.println("RC4-SHA"); System.out.println("RC4-SHA");
}
else if (ciph_id == axtlsj.SSL_RC4_128_MD5) else if (ciph_id == axtlsj.SSL_RC4_128_MD5)
{
System.out.println("RC4-MD5"); System.out.println("RC4-MD5");
}
else else
{
System.out.println("Unknown - " + ssl.getCipherId()); System.out.println("Unknown - " + ssl.getCipherId());
} }
}
public char toHexChar(int i) public char toHexChar(int i)
{ {

6
samples/perl/axssl.pl
View File

@ -62,6 +62,12 @@ sub get_native_sock
# Main entry point. Doesn't do much except works out whether we are a client # Main entry point. Doesn't do much except works out whether we are a client
# or a server. # or a server.
# #
if ($#ARGV == 0 && $ARGV[0] eq "version")
{
printf("axssl.pl ".axtlsp::ssl_version()."\n");
exit 0;
}
print_options($#ARGV > -1 ? $ARGV[0] : "") print_options($#ARGV > -1 ? $ARGV[0] : "")
if ($#ARGV < 0 || ($ARGV[0] ne "s_server" && $ARGV[0] ne "s_client")); if ($#ARGV < 0 || ($ARGV[0] ne "s_server" && $ARGV[0] ne "s_client"));

11
samples/vbnet/axssl.vb
View File

@ -98,7 +98,8 @@ Public Class axssl
If args(i) = "-verify" Then If args(i) = "-verify" Then
options = options Or axtls.SSL_CLIENT_AUTHENTICATION options = options Or axtls.SSL_CLIENT_AUTHENTICATION
ElseIf args(i) = "-CAfile" ElseIf args(i) = "-CAfile"
If i >= args.Length-1 Or ca_cert_index >= ca_cert_size Then If i >= args.Length-1 Or _
ca_cert_index >= ca_cert_size Then
print_server_options(build_mode, args(i)) print_server_options(build_mode, args(i))
End If End If
@ -553,7 +554,8 @@ Public Class axssl
Public Sub print_options(ByVal options As String) Public Sub print_options(ByVal options As String)
Console.WriteLine("axssl: Error: '" & options & _ Console.WriteLine("axssl: Error: '" & options & _
"' is an invalid command.") "' is an invalid command.")
Console.WriteLine("usage: axssl.vb.exe [s_server|s_client] [args ...]") Console.WriteLine("usage: axssl.vbnet [s_server|s_client|" & _
"version] [args ...]")
Environment.Exit(1) Environment.Exit(1)
End Sub End Sub
@ -663,6 +665,11 @@ Public Module MyMain
Function Main(ByVal args() As String) As Integer Function Main(ByVal args() As String) As Integer
Dim runner As axssl = New axssl() Dim runner As axssl = New axssl()
If args.Length = 1 And args(0) = "version" Then
Console.WriteLine("axssl.vbnet " & SSLUtil.Version())
Environment.Exit(0)
End If
If args.Length < 1 If args.Length < 1
runner.print_options("") runner.print_options("")
ElseIf args(0) <> "s_server" And args(0) <> "s_client" ElseIf args(0) <> "s_server" And args(0) <> "s_client"

13
ssl/Config.in
View File

@ -210,6 +210,19 @@ config CONFIG_SSL_MAX_CERTS
The default is to allow one certificate + 1 certificate in the chain The default is to allow one certificate + 1 certificate in the chain
(which may be the certificate authority certificate). (which may be the certificate authority certificate).
config CONFIG_SSLCTX_MUTEXING
bool "Enable SSLCTX mutexing"
default n
help
Normally mutexing is not required - each SSLCTX object can deal with
many SSL objects (as long as each SSLCTX object is using a single
thread).
If the SSLCTX object is not thread safe e.g. the case where a
new thread is created for each SSL object, then mutexing is required.
Select y when a mutex on the SSLCTX object is required.
config CONFIG_USE_DEV_URANDOM config CONFIG_USE_DEV_URANDOM
bool "Use /dev/urandom" bool "Use /dev/urandom"
default y default y

2
ssl/Makefile
View File

@ -39,7 +39,7 @@ endif
# shared library major/minor numbers # shared library major/minor numbers
LIBMAJOR=$(BASETARGET).1 LIBMAJOR=$(BASETARGET).1
LIBMINOR=$(BASETARGET).1.0 LIBMINOR=$(BASETARGET).1.1
else else
TARGET1=axtls.lib TARGET1=axtls.lib
TARGET2=../$(STAGE)/axtls.dll TARGET2=../$(STAGE)/axtls.dll

1
ssl/aes.c
View File

@ -400,7 +400,6 @@ static void AES_encrypt(const AES_CTX *ctx, uint32_t *data)
a1 ^= tmp1 ^ AES_xtime(a1 ^ a2); a1 ^= tmp1 ^ AES_xtime(a1 ^ a2);
a2 ^= tmp1 ^ AES_xtime(a2 ^ a3); a2 ^= tmp1 ^ AES_xtime(a2 ^ a3);
a3 ^= tmp1 ^ AES_xtime(a3 ^ old_a0); a3 ^= tmp1 ^ AES_xtime(a3 ^ old_a0);
} }
tmp[row] = ((a0 << 24) | (a1 << 16) | (a2 << 8) | a3); tmp[row] = ((a0 << 24) | (a1 << 16) | (a2 << 8) | a3);

10
ssl/bigint.c
View File

@ -781,7 +781,9 @@ void bi_free_mod(BI_CTX *ctx, int mod_offset)
*/ */
static bigint *regular_multiply(BI_CTX *ctx, bigint *bia, bigint *bib) static bigint *regular_multiply(BI_CTX *ctx, bigint *bia, bigint *bib)
{ {
int i, j, i_plus_j, n = bia->size, t = bib->size; int i, j, i_plus_j;
int n = bia->size;
int t = bib->size;
bigint *biR = alloc(ctx, n + t); bigint *biR = alloc(ctx, n + t);
comp *sr = biR->comps; comp *sr = biR->comps;
comp *sa = bia->comps; comp *sa = bia->comps;
@ -1397,9 +1399,7 @@ bigint *bi_mod_power(BI_CTX *ctx, bigint *bi, bigint *biexp)
#ifdef CONFIG_BIGINT_SLIDING_WINDOW #ifdef CONFIG_BIGINT_SLIDING_WINDOW
for (j = i; j > 32; j /= 5) /* work out an optimum size */ for (j = i; j > 32; j /= 5) /* work out an optimum size */
{
window_size++; window_size++;
}
/* work out the slide constants */ /* work out the slide constants */
precompute_slide_window(ctx, window_size, bi); precompute_slide_window(ctx, window_size, bi);
@ -1420,16 +1420,12 @@ bigint *bi_mod_power(BI_CTX *ctx, bigint *bi, bigint *biexp)
int part_exp = 0; int part_exp = 0;
if (l < 0) /* LSB of exponent will always be 1 */ if (l < 0) /* LSB of exponent will always be 1 */
{
l = 0; l = 0;
}
else else
{ {
while (exp_bit_is_one(biexp, l) == 0) while (exp_bit_is_one(biexp, l) == 0)
{
l++; /* go back up */ l++; /* go back up */
} }
}
/* build up the section of the exponent */ /* build up the section of the exponent */
for (j = i; j >= l; j--) for (j = i; j >= l; j--)

10
ssl/bigint.h
View File

@ -74,14 +74,14 @@ bigint *bi_str_import(BI_CTX *ctx, const char *data);
* appropriate reduction technique (which is bi_mod() when doing classical * appropriate reduction technique (which is bi_mod() when doing classical
* reduction). * reduction).
*/ */
#if defined(CONFIG_BIGINT_CLASSICAL) #if defined(CONFIG_BIGINT_MONTGOMERY)
#define bi_residue(A, B) bi_mod(A, B) #define bi_residue(A, B) bi_mont(A, B)
bigint *bi_mont(BI_CTX *ctx, bigint *bixy);
#elif defined(CONFIG_BIGINT_BARRETT) #elif defined(CONFIG_BIGINT_BARRETT)
#define bi_residue(A, B) bi_barrett(A, B) #define bi_residue(A, B) bi_barrett(A, B)
bigint *bi_barrett(BI_CTX *ctx, bigint *bi); bigint *bi_barrett(BI_CTX *ctx, bigint *bi);
#else /* CONFIG_BIGINT_MONTGOMERY */ #else /* if defined(CONFIG_BIGINT_CLASSICAL) */
#define bi_residue(A, B) bi_mont(A, B) #define bi_residue(A, B) bi_mod(A, B)
bigint *bi_mont(BI_CTX *ctx, bigint *bixy);
#endif #endif
#ifdef CONFIG_BIGINT_SQUARE #ifdef CONFIG_BIGINT_SQUARE

21
ssl/crypto.h
View File

@ -143,7 +143,6 @@ typedef struct
bigint *qInv; /* q^-1 mod p */ bigint *qInv; /* q^-1 mod p */
#endif #endif
int num_octets; int num_octets;
bigint *sig_m; /* signature modulus */
BI_CTX *bi_ctx; BI_CTX *bi_ctx;
} RSA_CTX; } RSA_CTX;
@ -163,15 +162,14 @@ void RSA_pub_key_new(RSA_CTX **rsa_ctx,
const uint8_t *modulus, int mod_len, const uint8_t *modulus, int mod_len,
const uint8_t *pub_exp, int pub_len); const uint8_t *pub_exp, int pub_len);
void RSA_free(RSA_CTX *ctx); void RSA_free(RSA_CTX *ctx);
int RSA_decrypt(RSA_CTX *ctx, const uint8_t *in_data, uint8_t *out_data, int RSA_decrypt(const RSA_CTX *ctx, const uint8_t *in_data, uint8_t *out_data,
int is_decryption); int is_decryption);
bigint *RSA_private(RSA_CTX *c, bigint *bi_msg); bigint *RSA_private(const RSA_CTX *c, bigint *bi_msg);
#ifdef CONFIG_SSL_CERT_VERIFICATION #ifdef CONFIG_SSL_CERT_VERIFICATION
bigint *RSA_raw_sign_verify(RSA_CTX *c, bigint *bi_msg);
bigint *RSA_sign_verify(BI_CTX *ctx, const uint8_t *sig, int sig_len, bigint *RSA_sign_verify(BI_CTX *ctx, const uint8_t *sig, int sig_len,
bigint *modulus, bigint *pub_exp); bigint *modulus, bigint *pub_exp);
bigint *RSA_public(RSA_CTX *c, bigint *bi_msg); bigint *RSA_public(const RSA_CTX * c, bigint *bi_msg);
int RSA_encrypt(RSA_CTX *ctx, const uint8_t *in_data, uint16_t in_len, int RSA_encrypt(const RSA_CTX *ctx, const uint8_t *in_data, uint16_t in_len,
uint8_t *out_data, int is_signing); uint8_t *out_data, int is_signing);
void RSA_print(const RSA_CTX *ctx); void RSA_print(const RSA_CTX *ctx);
#endif #endif
@ -267,17 +265,6 @@ typedef void (*crypt_func)(void *, const uint8_t *, uint8_t *, int);
typedef void (*hmac_func)(const uint8_t *msg, int length, const uint8_t *key, typedef void (*hmac_func)(const uint8_t *msg, int length, const uint8_t *key,
int key_len, uint8_t *digest); int key_len, uint8_t *digest);
typedef struct
{
uint8_t *pre_data; /* include the ssl record bytes */
uint8_t *data; /* the regular ssl data */
int max_len;
int index;
} BUF_MEM;
BUF_MEM buf_new(void);
void buf_grow(BUF_MEM *bm, int len);
void buf_free(BUF_MEM *bm);
int get_file(const char *filename, uint8_t **buf); int get_file(const char *filename, uint8_t **buf);
#if defined(CONFIG_SSL_FULL_MODE) || defined(WIN32) || defined(CONFIG_DEBUG) #if defined(CONFIG_SSL_FULL_MODE) || defined(WIN32) || defined(CONFIG_DEBUG)

41
ssl/crypto_misc.c
View File

@ -29,8 +29,6 @@
#include "wincrypt.h" #include "wincrypt.h"
#endif #endif
#define BM_RECORD_OFFSET 5 /* same as SSL_RECORD_SIZE */
#ifndef WIN32 #ifndef WIN32
static int rng_fd = -1; static int rng_fd = -1;
#elif defined(CONFIG_WIN32_USE_CRYPTO_LIB) #elif defined(CONFIG_WIN32_USE_CRYPTO_LIB)
@ -44,45 +42,6 @@ static uint64_t rng_num;
static int rng_ref_count; static int rng_ref_count;
const char * const unsupported_str = "Error: feature not supported\n"; const char * const unsupported_str = "Error: feature not supported\n";
/**
* Allocate a new memory buffer
*/
BUF_MEM buf_new()
{
BUF_MEM bm;
bm.pre_data = (uint8_t *)calloc(1, 2048); /* start with this */
bm.data = bm.pre_data+BM_RECORD_OFFSET; /* some space at the start */
bm.max_len = 2048-BM_RECORD_OFFSET;
bm.index = 0;
return bm;
}
/**
* Grow a buffer if necessary
*/
void buf_grow(BUF_MEM *bm, int len)
{
if (len <= bm->max_len)
{
return;
}
/* add 1kB just to be sure */
bm->pre_data = (uint8_t *)realloc(bm->pre_data, len+1024+BM_RECORD_OFFSET);
bm->data = bm->pre_data+BM_RECORD_OFFSET;
bm->max_len = len + 1024;
}
/**
* Free a buffer
*/
void buf_free(BUF_MEM *bm)
{
free(bm->pre_data);
bm->pre_data = NULL;
bm->data = NULL;
}
#ifndef CONFIG_SSL_SKELETON_MODE #ifndef CONFIG_SSL_SKELETON_MODE
/** /**
* Retrieve a file and put it into memory * Retrieve a file and put it into memory

20
ssl/loader.c
View File

@ -76,9 +76,7 @@ EXP_FUNC int STDCALL ssl_obj_load(SSLCTX *ssl_ctx, int obj_type,
#endif #endif
} }
else else
{
ret = do_obj(ssl_ctx, obj_type, ssl_obj, password); ret = do_obj(ssl_ctx, obj_type, ssl_obj, password);
}
error: error:
ssl_obj_free(ssl_obj); ssl_obj_free(ssl_obj);
@ -149,15 +147,18 @@ static int do_obj(SSLCTX *ssl_ctx, int obj_type,
} }
/* /*
* Release things. * Clean up our mess.
*/ */
void ssl_obj_free(SSLObjLoader *ssl_obj) void ssl_obj_free(SSLObjLoader *ssl_obj)
{
if (ssl_obj)
{ {
free(ssl_obj->buf); free(ssl_obj->buf);
free(ssl_obj); free(ssl_obj);
} }
}
/** /*
* Support for PEM encoded keys/certificates. * Support for PEM encoded keys/certificates.
*/ */
#ifdef CONFIG_SSL_HAS_PEM #ifdef CONFIG_SSL_HAS_PEM
@ -234,14 +235,10 @@ static int base64_decode(const uint8_t *in, int len,
out[z++] = (uint8_t)((t>>16)&255); out[z++] = (uint8_t)((t>>16)&255);
if (g > 1) if (g > 1)
{
out[z++] = (uint8_t)((t>>8)&255); out[z++] = (uint8_t)((t>>8)&255);
}
if (g > 2) if (g > 2)
{
out[z++] = (uint8_t)(t&255); out[z++] = (uint8_t)(t&255);
}
y = t = 0; y = t = 0;
} }
@ -256,9 +253,7 @@ static int base64_decode(const uint8_t *in, int len,
error: error:
#ifdef CONFIG_SSL_FULL_MODE #ifdef CONFIG_SSL_FULL_MODE
if (ret < 0) if (ret < 0)
{
printf("Error: Invalid base64 file\n"); printf("Error: Invalid base64 file\n");
}
#endif #endif
return ret; return ret;
} }
@ -402,10 +397,7 @@ static int new_pem_obj(SSLCTX *ssl_ctx, int is_cacert, uint8_t *where,
/* In a format we can now understand - so process it */ /* In a format we can now understand - so process it */
if ((ret = do_obj(ssl_ctx, obj_type, ssl_obj, password))) if ((ret = do_obj(ssl_ctx, obj_type, ssl_obj, password)))
{
ssl_obj_free(ssl_obj);
goto error; goto error;
}
end += strlen(ends[i]); end += strlen(ends[i]);
remain -= strlen(ends[i]); remain -= strlen(ends[i]);
@ -415,7 +407,6 @@ static int new_pem_obj(SSLCTX *ssl_ctx, int is_cacert, uint8_t *where,
remain--; remain--;
} }
ssl_obj_free(ssl_obj);
break; break;
} }
} }
@ -428,6 +419,7 @@ static int new_pem_obj(SSLCTX *ssl_ctx, int is_cacert, uint8_t *where,
ret = new_pem_obj(ssl_ctx, is_cacert, end, remain, password); ret = new_pem_obj(ssl_ctx, is_cacert, end, remain, password);
error: error:
ssl_obj_free(ssl_obj);
return ret; return ret;
} }

5
ssl/md5.c
View File

@ -47,7 +47,7 @@ static void MD5Transform(uint32_t state[4], const uint8_t block[64]);
static void Encode(uint8_t *output, uint32_t *input, uint32_t len); static void Encode(uint8_t *output, uint32_t *input, uint32_t len);
static void Decode(uint32_t *output, const uint8_t *input, uint32_t len); static void Decode(uint32_t *output, const uint8_t *input, uint32_t len);
static uint8_t PADDING[64] = static const uint8_t PADDING[64] =
{ {
0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@ -114,8 +114,7 @@ void MD5Update(MD5_CTX *ctx, const uint8_t * msg, int len)
x = (uint32_t)((ctx->count[0] >> 3) & 0x3F); x = (uint32_t)((ctx->count[0] >> 3) & 0x3F);
/* Update number of bits */ /* Update number of bits */
if ((ctx->count[0] += ((uint32_t)len << 3)) if ((ctx->count[0] += ((uint32_t)len << 3)) < ((uint32_t)len << 3))
< ((uint32_t)len << 3))
ctx->count[1]++; ctx->count[1]++;
ctx->count[1] += ((uint32_t)len >> 29); ctx->count[1] += ((uint32_t)len >> 29);

1
ssl/p12.c
View File

@ -389,6 +389,7 @@ int pkcs12_decode(SSLCTX *ssl_ctx, SSLObjLoader *ssl_obj, const char *password)
/* get the salt */ /* get the salt */
if ((len = asn1_next_obj(buf, &offset, ASN1_OCTET_STRING)) < 0 || len != 8) if ((len = asn1_next_obj(buf, &offset, ASN1_OCTET_STRING)) < 0 || len != 8)
goto error; goto error;
salt = &buf[offset]; salt = &buf[offset];
/* work out what the mac should be */ /* work out what the mac should be */

4
ssl/rc4.c
View File

@ -36,9 +36,7 @@ void RC4_setup(RC4_CTX *ctx, const uint8_t *key, int length)
m = ctx->m; m = ctx->m;
for (i = 0; i < 256; i++) for (i = 0; i < 256; i++)
{
m[i] = i; m[i] = i;
}
for (i = 0; i < 256; i++) for (i = 0; i < 256; i++)
{ {
@ -48,11 +46,9 @@ void RC4_setup(RC4_CTX *ctx, const uint8_t *key, int length)
m[j] = a; m[j] = a;
if (++k >= length) if (++k >= length)
{
k = 0; k = 0;
} }
} }
}
/** /**
* Perform the encrypt/decrypt operation (can use it for either since * Perform the encrypt/decrypt operation (can use it for either since

19
ssl/rsa.c
View File

@ -28,7 +28,7 @@
#include "crypto.h" #include "crypto.h"
#ifdef CONFIG_BIGINT_CRT #ifdef CONFIG_BIGINT_CRT
static bigint *bi_crt(RSA_CTX *rsa, bigint *bi); static bigint *bi_crt(const RSA_CTX *rsa, bigint *bi);
#endif #endif
void RSA_priv_key_new(RSA_CTX **ctx, void RSA_priv_key_new(RSA_CTX **ctx,
@ -126,8 +126,8 @@ void RSA_free(RSA_CTX *rsa_ctx)
* @return The number of bytes that were originally encrypted. -1 on error. * @return The number of bytes that were originally encrypted. -1 on error.
* @see http://www.rsasecurity.com/rsalabs/node.asp?id=2125 * @see http://www.rsasecurity.com/rsalabs/node.asp?id=2125
*/ */
int RSA_decrypt(RSA_CTX *ctx, const uint8_t *in_data, uint8_t *out_data, int RSA_decrypt(const RSA_CTX *ctx, const uint8_t *in_data,
int is_decryption) uint8_t *out_data, int is_decryption)
{ {
int byte_size = ctx->num_octets; int byte_size = ctx->num_octets;
uint8_t *block; uint8_t *block;
@ -155,11 +155,10 @@ int RSA_decrypt(RSA_CTX *ctx, const uint8_t *in_data, uint8_t *out_data,
if (is_decryption == 0) /* PKCS1.5 signing pads with "0xff"s */ if (is_decryption == 0) /* PKCS1.5 signing pads with "0xff"s */
{ {
while (block[i++] == 0xff && i < byte_size); while (block[i++] == 0xff && i < byte_size);
if (block[i-2] != 0xff) if (block[i-2] != 0xff)
{
i = byte_size; /*ensure size is 0 */ i = byte_size; /*ensure size is 0 */
} }
}
else /* PKCS1.5 encryption padding is random */ else /* PKCS1.5 encryption padding is random */
#endif #endif
{ {
@ -169,9 +168,7 @@ int RSA_decrypt(RSA_CTX *ctx, const uint8_t *in_data, uint8_t *out_data,
/* get only the bit we want */ /* get only the bit we want */
if (size > 0) if (size > 0)
{
memcpy(out_data, &block[i], size); memcpy(out_data, &block[i], size);
}
free(block); free(block);
return size ? size : -1; return size ? size : -1;
@ -180,7 +177,7 @@ int RSA_decrypt(RSA_CTX *ctx, const uint8_t *in_data, uint8_t *out_data,
/** /**
* Performs m = c^d mod n * Performs m = c^d mod n
*/ */
bigint *RSA_private(RSA_CTX *c, bigint *bi_msg) bigint *RSA_private(const RSA_CTX *c, bigint *bi_msg)
{ {
#ifdef CONFIG_BIGINT_CRT #ifdef CONFIG_BIGINT_CRT
return bi_crt(c, bi_msg); return bi_crt(c, bi_msg);
@ -197,7 +194,7 @@ bigint *RSA_private(RSA_CTX *c, bigint *bi_msg)
* This should really be in bigint.c (and was at one stage), but needs * This should really be in bigint.c (and was at one stage), but needs
* access to the RSA_CTX context... * access to the RSA_CTX context...
*/ */
static bigint *bi_crt(RSA_CTX *rsa, bigint *bi) static bigint *bi_crt(const RSA_CTX *rsa, bigint *bi)
{ {
BI_CTX *ctx = rsa->bi_ctx; BI_CTX *ctx = rsa->bi_ctx;
bigint *m1, *m2, *h; bigint *m1, *m2, *h;
@ -245,7 +242,7 @@ void RSA_print(const RSA_CTX *rsa_ctx)
/** /**
* Performs c = m^e mod n * Performs c = m^e mod n
*/ */
bigint *RSA_public(RSA_CTX *c, bigint *bi_msg) bigint *RSA_public(const RSA_CTX * c, bigint *bi_msg)
{ {
c->bi_ctx->mod_offset = BIGINT_M_OFFSET; c->bi_ctx->mod_offset = BIGINT_M_OFFSET;
return bi_mod_power(c->bi_ctx, bi_msg, c->e); return bi_mod_power(c->bi_ctx, bi_msg, c->e);
@ -255,7 +252,7 @@ bigint *RSA_public(RSA_CTX *c, bigint *bi_msg)
* Use PKCS1.5 for encryption/signing. * Use PKCS1.5 for encryption/signing.
* see http://www.rsasecurity.com/rsalabs/node.asp?id=2125 * see http://www.rsasecurity.com/rsalabs/node.asp?id=2125
*/ */
int RSA_encrypt(RSA_CTX *ctx, const uint8_t *in_data, uint16_t in_len, int RSA_encrypt(const RSA_CTX *ctx, const uint8_t *in_data, uint16_t in_len,
uint8_t *out_data, int is_signing) uint8_t *out_data, int is_signing)
{ {
int byte_size = ctx->num_octets; int byte_size = ctx->num_octets;

6
ssl/sha1.c
View File

@ -57,17 +57,13 @@ void SHA1Update(SHA1_CTX *ctx, const uint8_t *msg, int len)
while (len--) while (len--)
{ {
ctx->Message_Block[ctx->Message_Block_Index++] = (*msg & 0xFF); ctx->Message_Block[ctx->Message_Block_Index++] = (*msg & 0xFF);
ctx->Length_Low += 8; ctx->Length_Low += 8;
if (ctx->Length_Low == 0) if (ctx->Length_Low == 0)
{
ctx->Length_High++; ctx->Length_High++;
}
if (ctx->Message_Block_Index == 64) if (ctx->Message_Block_Index == 64)
{
SHA1ProcessMessageBlock(ctx); SHA1ProcessMessageBlock(ctx);
}
msg++; msg++;
} }

17
ssl/ssl.h
View File

@ -150,14 +150,17 @@ extern "C" {
* @brief Establish a new client/server context. * @brief Establish a new client/server context.
* *
* This function is called before any client/server SSL connections are made. * This function is called before any client/server SSL connections are made.
* If multiple threads are used, then each thread will have its own SSLCTX
* context. Any number of connections may be made with a single
* context.
* *
* Each new connection will use the this context's private key and * Each new connection will use the this context's private key and
* certificate chain. If a different certificate chain is required, then a * certificate chain. If a different certificate chain is required, then a
* different context needs to be be used. * different context needs to be be used.
* *
* There are two threading models supported - a single thread with one
* SSLCTX can support any number of SSL connections - and multiple threads can
* support one SSLCTX object each (the default). But if a single SSLCTX
* object uses many SSL objects in individual threads, then the
* CONFIG_SSLCTX_MUTEXING option needs to be configured.
*
* @param options [in] Any particular options. At present the options * @param options [in] Any particular options. At present the options
* supported are: * supported are:
* - SSL_SERVER_VERIFY_LATER (client only): Don't stop a handshake if the server * - SSL_SERVER_VERIFY_LATER (client only): Don't stop a handshake if the server
@ -233,6 +236,7 @@ EXP_FUNC void STDCALL ssl_free(SSL *ssl);
/** /**
* @brief Read the SSL data stream. * @brief Read the SSL data stream.
* The socket must be in blocking mode.
* @param ssl [in] An SSL object reference. * @param ssl [in] An SSL object reference.
* @param in_data [out] If the read was successful, a pointer to the read * @param in_data [out] If the read was successful, a pointer to the read
* buffer will be here. Do NOT ever free this memory as this buffer is used in * buffer will be here. Do NOT ever free this memory as this buffer is used in
@ -249,6 +253,7 @@ EXP_FUNC int STDCALL ssl_read(SSL *ssl, uint8_t **in_data);
/** /**
* @brief Write to the SSL data stream. * @brief Write to the SSL data stream.
* The socket must be in blocking mode.
* @param ssl [in] An SSL obect reference. * @param ssl [in] An SSL obect reference.
* @param out_data [in] The data to be written * @param out_data [in] The data to be written
* @param out_len [in] The number of bytes to be written. * @param out_len [in] The number of bytes to be written.
@ -407,6 +412,12 @@ EXP_FUNC int STDCALL ssl_obj_load(SSLCTX *ssl_ctx, int obj_type, const char *fil
*/ */
EXP_FUNC int STDCALL ssl_obj_memory_load(SSLCTX *ssl_ctx, int obj_type, const uint8_t *data, int len, const char *password); EXP_FUNC int STDCALL ssl_obj_memory_load(SSLCTX *ssl_ctx, int obj_type, const uint8_t *data, int len, const char *password);
/**
* @brief Return the axTLS library version as a string.
* @note New API function for v1.1
*/
EXP_FUNC const char * STDCALL ssl_version(void);
/** @} */ /** @} */
#ifdef __cplusplus #ifdef __cplusplus

334
ssl/test/ssltest.c
View File

@ -1445,179 +1445,269 @@ cleanup:
return ret; return ret;
} }
#if 0 /**************************************************************************
* SSL Basic Testing (test a big packet handshake)
*
**************************************************************************/
static uint8_t basic_buf[256*1024];
static void do_basic(void)
{
int client_fd;
SSL *ssl_clnt;
SSLCTX *ssl_clnt_ctx = ssl_ctx_new(
DEFAULT_CLNT_OPTION, SSL_DEFAULT_CLNT_SESS);
usleep(200000); /* allow server to start */
if ((client_fd = client_socket_init(g_port)) < 0)
goto error;
if (ssl_obj_load(ssl_clnt_ctx, SSL_OBJ_X509_CACERT,
"../ssl/test/axTLS.ca_x509.cer", NULL))
goto error;
ssl_clnt = ssl_client_new(ssl_clnt_ctx, client_fd, NULL);
/* check the return status */
if (ssl_handshake_status(ssl_clnt))
{
printf("Client ");
ssl_display_error(ssl_handshake_status(ssl_clnt));
goto error;
}
ssl_write(ssl_clnt, basic_buf, sizeof(basic_buf));
ssl_free(ssl_clnt);
error:
ssl_ctx_free(ssl_clnt_ctx);
close(client_fd);
/* exit this thread */
}
static int SSL_basic_test(void)
{
int server_fd, client_fd, ret = 0, size = 0, offset = 0;
SSLCTX *ssl_svr_ctx = NULL;
struct sockaddr_in client_addr;
uint8_t *read_buf;
int clnt_len = sizeof(client_addr);
SSL *ssl_svr;
#ifndef WIN32
pthread_t thread;
#endif
memset(basic_buf, 0xA5, sizeof(basic_buf)/2);
memset(&basic_buf[sizeof(basic_buf)/2], 0x5A, sizeof(basic_buf)/2);
if ((server_fd = server_socket_init(&g_port)) < 0)
goto error;
ssl_svr_ctx = ssl_ctx_new(DEFAULT_SVR_OPTION, SSL_DEFAULT_SVR_SESS);
#ifndef WIN32
pthread_create(&thread, NULL,
(void *(*)(void *))do_basic, NULL);
pthread_detach(thread);
#else
CreateThread(NULL, 1024, (LPTHREAD_START_ROUTINE)do_basic, NULL, 0, NULL);
#endif
/* Wait for a client to connect */
if ((client_fd = accept(server_fd,
(struct sockaddr *) &client_addr, &clnt_len)) < 0)
{
ret = SSL_ERROR_SOCK_SETUP_FAILURE;
goto error;
}
/* we are ready to go */
ssl_svr = ssl_server_new(ssl_svr_ctx, client_fd);
do
{
while ((size = ssl_read(ssl_svr, &read_buf)) == SSL_OK);
if (size < SSL_OK) /* got some alert or something nasty */
{
printf("Server ");
ssl_display_error(size);
ret = size;
break;
}
else /* looks more promising */
{
if (memcmp(read_buf, &basic_buf[offset], size) != 0)
{
ret = SSL_NOT_OK;
break;
}
}
offset += size;
} while (offset < sizeof(basic_buf));
printf(ret == SSL_OK && offset == sizeof(basic_buf) ?
"SSL basic test passed\n" :
"SSL basic test failed\n");
TTY_FLUSH();
ssl_free(ssl_svr);
close(server_fd);
close(client_fd);
error:
ssl_ctx_free(ssl_svr_ctx);
return ret;
}
#if !defined(WIN32) && defined(CONFIG_SSL_CTX_MUTEXING)
/************************************************************************** /**************************************************************************
* Multi-Threading Tests * Multi-Threading Tests
* *
**************************************************************************/ **************************************************************************/
#define NUM_THREADS 1 #define NUM_THREADS 200
#define NUM_THREADS_STR "1"
static SSL *my_ssls[NUM_THREADS*3]; /* enough for all client fds */
typedef struct typedef struct
{ {
SSLCTX *ssl_ctx; SSLCTX *ssl_clnt_ctx;
int port; int port;
int thread_id; int thread_id;
} multi_t; } multi_t;
int do_connect(multi_t *multi_data) void do_multi_clnt(multi_t *multi_data)
{ {
int res = 1, client_fd, i; int res = 1, client_fd, i;
SSL *ssl = NULL; SSL *ssl = NULL;
char tmp[5]; char tmp[5];
/* make sure other threads work before this one */
if (multi_data->thread_id == NUM_THREADS)
{
sleep(2); /* sets the maximum time this test will run */
}
if ((client_fd = client_socket_init(multi_data->port)) < 0) if ((client_fd = client_socket_init(multi_data->port)) < 0)
goto client_test_exit; goto client_test_exit;
sleep(0);
ssl = ssl_client_new(multi_data->ssl_ctx, client_fd, NULL); sleep(1);
ssl = ssl_client_new(multi_data->ssl_clnt_ctx, client_fd, NULL);
if ((res = ssl_handshake_status(ssl))) if ((res = ssl_handshake_status(ssl)))
goto client_test_exit;
sprintf(tmp, "%d\n", multi_data->thread_id);
for (i = 0; i < 100; i++)
{ {
ssl_write(ssl, (uint8_t *)tmp, strlen(tmp)+1); printf("Client ");
ssl_display_error(res);
goto client_test_exit;
} }
res = 0; sprintf(tmp, "%d\n", multi_data->thread_id);
for (i = 0; i < 10; i++)
ssl_write(ssl, (uint8_t *)tmp, strlen(tmp)+1);
client_test_exit: client_test_exit:
ssl_free(ssl); ssl_free(ssl);
close(client_fd); close(client_fd);
free(multi_data); free(multi_data);
return 0;
} }
int multi_thread_test(void) void do_multi_svr(SSL *ssl)
{ {
int server_fd; uint8_t *read_buf;
SSLCTX *ssl_server_ctx = NULL; int *res_ptr = malloc(sizeof(int));
uint8_t buf[1024]; int res;
pthread_t threads[NUM_THREADS];
int i, res = 1;
struct sockaddr_in client_addr;
int clnt_len = sizeof(client_addr);
fd_set read_set;
int max_fd;
int death_total = 0;
SSLCTX *ssl_client_ctx = ssl_ctx_new(DEFAULT_CLNT_OPTION,
SSL_DEFAULT_CLNT_SESS, NULL);
printf("Do multi-threading test (takes a minute)\n");
FD_ZERO(&read_set);
if ((server_fd = server_socket_init(&g_port)) < 0)
goto error;
FD_SET(server_fd, &read_set);
max_fd = server_fd;
ssl_server_ctx = ssl_ctx_new(DEFAULT_SVR_OPTION|SSL_SERVER_VERIFY_LATER,
SSL_DEFAULT_SVR_SESS, NULL);
for (i = 0; i < NUM_THREADS; i++)
{
multi_t *multi_data = (multi_t *)malloc(sizeof(multi_t));
multi_data->ssl_ctx = ssl_server_ctx;
multi_data->port = g_port;
multi_data->thread_id = i+1;
if (pthread_create(&threads[i], NULL,
(void *(*)(void *))do_connect, (void *)multi_data) < 0)
goto error;
}
sleep(1);
for (;;) for (;;)
{ {
fd_set rdfs = read_set;
int n;
if ((n = select(max_fd+1, &rdfs, NULL, NULL, 0)) > 0)
{
while (n)
{
/* check for server */
if (FD_ISSET(server_fd, &rdfs))
{
int client_fd = accept(server_fd,
(struct sockaddr *)&client_addr, &clnt_len);
if (client_fd < 0)
goto error;
if (client_fd > max_fd) /* set max fd */
{
max_fd = client_fd;
}
my_ssls[client_fd] = ssl_server_new(
ssl_server_ctx, client_fd);
FD_SET(client_fd, &read_set);
if (--n == 0)
continue;
}
i = server_fd;
while (++i <= max_fd && n)
{
if (FD_ISSET(i, &rdfs))
{
SSL *ssl;
ssl = my_ssls[i];
res = ssl_read(ssl, &read_buf); res = ssl_read(ssl, &read_buf);
n--;
/* kill the client */ /* kill the client */
if (res != SSL_OK) if (res != SSL_OK)
{ {
if (res == SSL_ERROR_CONN_LOST) if (res == SSL_ERROR_CONN_LOST)
{ {
close(ssl->client_fd);
ssl_free(ssl); ssl_free(ssl);
my_ssls[i] = NULL; break;
close(i);
FD_CLR(i, &read_set);
death_total++;
} }
else if (res > 0) else if (res > 0)
{ {
if (strcmp(NUM_THREADS_STR "\n", /* do nothing */
(const char *)buf) == 0)
{
sleep(1); /* allow rest of data */
goto all_ok;
}
} }
else /* some problem */ else /* some problem */
{ {
printf("Got some problem %d\n", res); printf("Server ");
ssl_display_error(res);
goto error; goto error;
} }
} /* if */
} /* if */
} /* for */
}
} }
} }
all_ok: res = SSL_OK;
printf("Multi-thread test passed (%d)\n", death_total); error:
res = 0; *res_ptr = res;
pthread_exit(res_ptr);
}
int multi_thread_test(void)
{
int server_fd;
SSLCTX *ssl_server_ctx;
SSLCTX *ssl_clnt_ctx;
pthread_t clnt_threads[NUM_THREADS];
pthread_t svr_threads[NUM_THREADS];
int i, res = 0;
struct sockaddr_in client_addr;
int clnt_len = sizeof(client_addr);
printf("Do multi-threading test (takes a minute)\n");
ssl_server_ctx = ssl_ctx_new(DEFAULT_SVR_OPTION, SSL_DEFAULT_SVR_SESS);
ssl_clnt_ctx = ssl_ctx_new(DEFAULT_CLNT_OPTION, SSL_DEFAULT_CLNT_SESS);
if (ssl_obj_load(ssl_clnt_ctx, SSL_OBJ_X509_CACERT,
"../ssl/test/axTLS.ca_x509.cer", NULL))
goto error;
if ((server_fd = server_socket_init(&g_port)) < 0)
goto error;
for (i = 0; i < NUM_THREADS; i++)
{
multi_t *multi_data = (multi_t *)malloc(sizeof(multi_t));
multi_data->ssl_clnt_ctx = ssl_clnt_ctx;
multi_data->port = g_port;
multi_data->thread_id = i+1;
pthread_create(&clnt_threads[i], NULL,
(void *(*)(void *))do_multi_clnt, (void *)multi_data);
pthread_detach(clnt_threads[i]);
}
for (i = 0; i < NUM_THREADS; i++)
{
SSL *ssl_svr;
int client_fd = accept(server_fd,
(struct sockaddr *)&client_addr, &clnt_len);
if (client_fd < 0)
goto error;
ssl_svr = ssl_server_new(ssl_server_ctx, client_fd);
pthread_create(&svr_threads[i], NULL,
(void *(*)(void *))do_multi_svr, (void *)ssl_svr);
}
/* make sure we've run all of the threads */
for (i = 0; i < NUM_THREADS; i++)
{
void *thread_res;
pthread_join(svr_threads[i], &thread_res);
if (*((int *)thread_res) != 0)
res = 1;
free(thread_res);
}
if (res)
goto error;
printf("Multi-thread test passed (%d)\n", NUM_THREADS);
error: error:
ssl_ctx_free(ssl_server_ctx); ssl_ctx_free(ssl_server_ctx);
ssl_ctx_free(ssl_client_ctx); ssl_ctx_free(ssl_clnt_ctx);
close(server_fd); close(server_fd);
return res; return res;
} }
@ -1705,6 +1795,14 @@ int main(int argc, char *argv[])
} }
TTY_FLUSH(); TTY_FLUSH();
#if !defined(WIN32) && defined(CONFIG_SSL_CTX_MUTEXING)
if (multi_thread_test())
goto cleanup;
#endif
if (SSL_basic_test())
goto cleanup;
system("sh ../ssl/test/killopenssl.sh"); system("sh ../ssl/test/killopenssl.sh");
if (SSL_client_tests()) if (SSL_client_tests())

228
ssl/tls1.c
View File

@ -165,6 +165,8 @@ EXP_FUNC SSLCTX *STDCALL ssl_ctx_new(uint32_t options, int num_sessions)
ssl_ctx->num_sessions = num_sessions; ssl_ctx->num_sessions = num_sessions;
#endif #endif
SSL_CTX_MUTEX_INIT(ssl_ctx->mutex);
#if defined(CONFIG_SSL_USE_DEFAULT_KEY) || defined(CONFIG_SSL_SKELETON_MODE) #if defined(CONFIG_SSL_USE_DEFAULT_KEY) || defined(CONFIG_SSL_SKELETON_MODE)
if (~options & SSL_NO_DEFAULT_KEY) if (~options & SSL_NO_DEFAULT_KEY)
{ {
@ -201,7 +203,7 @@ EXP_FUNC void STDCALL ssl_ctx_free(SSLCTX *ssl_ctx)
if (ssl_ctx == NULL) if (ssl_ctx == NULL)
return; return;
ssl = ssl_ctx->sess_head; ssl = ssl_ctx->head;
/* clear out all the ssl entries */ /* clear out all the ssl entries */
while (ssl) while (ssl)
@ -214,9 +216,7 @@ EXP_FUNC void STDCALL ssl_ctx_free(SSLCTX *ssl_ctx)
#ifndef CONFIG_SSL_SKELETON_MODE #ifndef CONFIG_SSL_SKELETON_MODE
/* clear out all the sessions */ /* clear out all the sessions */
for (i = 0; i < ssl_ctx->num_sessions; i++) for (i = 0; i < ssl_ctx->num_sessions; i++)
{
session_free(ssl_ctx->ssl_sessions, i); session_free(ssl_ctx->ssl_sessions, i);
}
free(ssl_ctx->ssl_sessions); free(ssl_ctx->ssl_sessions);
#endif #endif
@ -232,6 +232,7 @@ EXP_FUNC void STDCALL ssl_ctx_free(SSLCTX *ssl_ctx)
remove_ca_certs(ssl_ctx->ca_cert_ctx); remove_ca_certs(ssl_ctx->ca_cert_ctx);
#endif #endif
ssl_ctx->chain_length = 0; ssl_ctx->chain_length = 0;
SSL_CTX_MUTEX_DESTROY(ssl_ctx->mutex);
RSA_free(ssl_ctx->rsa_ctx); RSA_free(ssl_ctx->rsa_ctx);
RNG_terminate(); RNG_terminate();
free(ssl_ctx); free(ssl_ctx);
@ -252,24 +253,20 @@ EXP_FUNC void STDCALL ssl_free(SSL *ssl)
ssl_ctx = ssl->ssl_ctx; ssl_ctx = ssl->ssl_ctx;
SSL_CTX_LOCK(ssl_ctx->mutex);
/* adjust the server SSL list */ /* adjust the server SSL list */
if (ssl->prev) if (ssl->prev)
{
ssl->prev->next = ssl->next; ssl->prev->next = ssl->next;
}
else else
{ ssl_ctx->head = ssl->next;
ssl_ctx->sess_head = ssl->next;
}
if (ssl->next) if (ssl->next)
{
ssl->next->prev = ssl->prev; ssl->next->prev = ssl->prev;
}
else else
{ ssl_ctx->tail = ssl->prev;
ssl_ctx->sess_tail = ssl->prev;
} SSL_CTX_UNLOCK(ssl_ctx->mutex);
/* may already be free - but be sure */ /* may already be free - but be sure */
free(ssl->all_pkts); free(ssl->all_pkts);
@ -278,7 +275,6 @@ EXP_FUNC void STDCALL ssl_free(SSL *ssl)
free(ssl->encrypt_ctx); free(ssl->encrypt_ctx);
free(ssl->decrypt_ctx); free(ssl->decrypt_ctx);
free(ssl->master_secret); free(ssl->master_secret);
buf_free(&ssl->bm_buf);
#ifdef CONFIG_SSL_CERT_VERIFICATION #ifdef CONFIG_SSL_CERT_VERIFICATION
x509_free(ssl->x509_ctx); x509_free(ssl->x509_ctx);
#endif #endif
@ -315,15 +311,28 @@ EXP_FUNC int STDCALL ssl_read(SSL *ssl, uint8_t **in_data)
EXP_FUNC int STDCALL ssl_write(SSL *ssl, const uint8_t *out_data, int out_len) EXP_FUNC int STDCALL ssl_write(SSL *ssl, const uint8_t *out_data, int out_len)
{ {
int ret = send_packet(ssl, PT_APP_PROTOCOL_DATA, out_data, out_len); int n = out_len, nw, i, tot = 0;
/* make sure there is no problem with overflow due to padding etc */ /* maximum size of a TLS packet is around 16kB, so fragment */
if (ret > out_len) do
{ {
ret = out_len; nw = n;
if (nw > RT_MAX_PLAIN_LENGTH) /* fragment if necessary */
nw = RT_MAX_PLAIN_LENGTH;
if ((i = send_packet(ssl, PT_APP_PROTOCOL_DATA,
&out_data[tot], nw)) <= 0)
{
out_len = i; /* an error */
break;
} }
return ret; tot += i;
n -= i;
} while (n > 0);
return out_len;
} }
/** /**
@ -411,9 +420,7 @@ int add_cert_auth(SSLCTX *ssl_ctx, const uint8_t *buf, int len)
/* recurse? */ /* recurse? */
if (len > 0) if (len > 0)
{
ret = add_cert_auth(ssl_ctx, &buf[offset], len); ret = add_cert_auth(ssl_ctx, &buf[offset], len);
}
error: error:
return ret; return ret;
@ -459,17 +466,24 @@ EXP_FUNC const char * STDCALL ssl_get_cert_dn(SSL *ssl, int component)
*/ */
EXP_FUNC SSL * STDCALL ssl_find(SSLCTX *ssl_ctx, int client_fd) EXP_FUNC SSL * STDCALL ssl_find(SSLCTX *ssl_ctx, int client_fd)
{ {
SSL *ssl = ssl_ctx->sess_head; SSL *ssl;
SSL_CTX_LOCK(ssl_ctx->mutex);
ssl = ssl_ctx->head;
/* search through all the ssl entries */ /* search through all the ssl entries */
while (ssl) while (ssl)
{ {
if (ssl->client_fd == client_fd) if (ssl->client_fd == client_fd)
{
SSL_CTX_UNLOCK(ssl_ctx->mutex);
return ssl; return ssl;
}
ssl = ssl->next; ssl = ssl->next;
} }
SSL_CTX_UNLOCK(ssl_ctx->mutex);
return NULL; return NULL;
} }
@ -526,31 +540,33 @@ SSL *ssl_new(SSLCTX *ssl_ctx, int client_fd)
SSL *ssl = (SSL *)calloc(1, sizeof(SSL)); SSL *ssl = (SSL *)calloc(1, sizeof(SSL));
ssl->ssl_ctx = ssl_ctx; ssl->ssl_ctx = ssl_ctx;
ssl->need_bytes = SSL_RECORD_SIZE; /* need a record */ ssl->need_bytes = SSL_RECORD_SIZE; /* need a record */
ssl->bm_buf = buf_new();
ssl->client_fd = client_fd; ssl->client_fd = client_fd;
ssl->flag = SSL_NEED_RECORD; ssl->flag = SSL_NEED_RECORD;
ssl->certs = ssl_ctx->certs; ssl->certs = ssl_ctx->certs;
ssl->chain_length = ssl_ctx->chain_length; ssl->chain_length = ssl_ctx->chain_length;
ssl->bm_data = ssl->bm_all_data+BM_RECORD_OFFSET; /* space at the start */
#ifdef CONFIG_ENABLE_VERIFICATION #ifdef CONFIG_ENABLE_VERIFICATION
ssl->ca_cert_ctx = ssl_ctx->ca_cert_ctx; ssl->ca_cert_ctx = ssl_ctx->ca_cert_ctx;
#endif #endif
/* a bit hacky but saves a few bytes of memory */ /* a bit hacky but saves a few bytes of memory */
ssl->flag |= ssl_ctx->options; ssl->flag |= ssl_ctx->options;
SSL_CTX_LOCK(ssl_ctx->mutex);
/* build up a linked list, so we can remove it all later */ if (ssl_ctx->head == NULL)
if (ssl_ctx->sess_head == NULL)
{ {
ssl_ctx->sess_head = ssl; ssl_ctx->head = ssl;
ssl_ctx->sess_tail = ssl; ssl_ctx->tail = ssl;
} }
else else
{ {
ssl->prev = ssl_ctx->sess_tail; ssl->prev = ssl_ctx->tail;
ssl_ctx->sess_tail->next = ssl; ssl_ctx->tail->next = ssl;
ssl_ctx->sess_tail = ssl; ssl_ctx->tail = ssl;
} }
SSL_CTX_UNLOCK(ssl_ctx->mutex);
return ssl; return ssl;
} }
@ -905,32 +921,30 @@ static void *crypt_new(SSL *ssl, uint8_t *key, uint8_t *iv, int is_decrypt)
*/ */
static int send_raw_packet(SSL *ssl, uint8_t protocol) static int send_raw_packet(SSL *ssl, uint8_t protocol)
{ {
uint8_t *rec_buf = ssl->bm_buf.pre_data; uint8_t *rec_buf = ssl->bm_all_data;
int pkt_size = SSL_RECORD_SIZE+ssl->bm_buf.index; int pkt_size = SSL_RECORD_SIZE+ssl->bm_index;
int ret; int ret;
rec_buf[0] = protocol; rec_buf[0] = protocol;
rec_buf[1] = 0x03; /* version = 3.1 (TLS) */ rec_buf[1] = 0x03; /* version = 3.1 (TLS) */
rec_buf[2] = 0x01; rec_buf[2] = 0x01;
rec_buf[3] = ssl->bm_buf.index >> 8; rec_buf[3] = ssl->bm_index >> 8;
rec_buf[4] = ssl->bm_buf.index & 0xff; rec_buf[4] = ssl->bm_index & 0xff;
DISPLAY_BYTES(ssl, "sending %d bytes", ssl->bm_buf.pre_data, DISPLAY_BYTES(ssl, "sending %d bytes", ssl->bm_all_data,
pkt_size, pkt_size); pkt_size, pkt_size);
ret = SOCKET_WRITE(ssl->client_fd, ssl->bm_buf.pre_data, pkt_size); if ((ret = SOCKET_WRITE(ssl->client_fd,
ssl->bm_all_data, pkt_size)) < 0)
ret = SSL_ERROR_CONN_LOST;
SET_SSL_FLAG(SSL_NEED_RECORD); /* reset for next time */ SET_SSL_FLAG(SSL_NEED_RECORD); /* reset for next time */
ssl->bm_buf.index = 0; ssl->bm_index = 0;
if (ret < 0) if (protocol != PT_APP_PROTOCOL_DATA)
{
ret = SSL_ERROR_CONN_LOST;
}
else if (protocol != PT_APP_PROTOCOL_DATA)
{ {
/* always return SSL_OK during handshake */ /* always return SSL_OK during handshake */
return ret = SSL_OK; ret = SSL_OK;
} }
return ret; return ret;
@ -942,18 +956,16 @@ static int send_raw_packet(SSL *ssl, uint8_t protocol)
int send_packet(SSL *ssl, uint8_t protocol, const uint8_t *in, int length) int send_packet(SSL *ssl, uint8_t protocol, const uint8_t *in, int length)
{ {
int msg_length = length; int msg_length = length;
ssl->bm_buf.index = msg_length; int ret, pad_bytes = 0;
buf_grow(&ssl->bm_buf, msg_length+32); ssl->bm_index = msg_length;
/* if our state is bad, don't bother */ /* if our state is bad, don't bother */
if (ssl->hs_status == SSL_ERROR_DEAD) if (ssl->hs_status == SSL_ERROR_DEAD)
{
return SSL_ERROR_CONN_LOST; return SSL_ERROR_CONN_LOST;
}
if (in) /* has the buffer already been initialised? */ if (in) /* has the buffer already been initialised? */
{ {
memcpy(ssl->bm_buf.data, in, length); memcpy(ssl->bm_data, in, length);
} }
if (IS_SET_SSL_FLAG(SSL_TX_ENCRYPTED)) if (IS_SET_SSL_FLAG(SSL_TX_ENCRYPTED))
@ -966,55 +978,56 @@ int send_packet(SSL *ssl, uint8_t protocol, const uint8_t *in, int length)
if (protocol == PT_HANDSHAKE_PROTOCOL) if (protocol == PT_HANDSHAKE_PROTOCOL)
{ {
DISPLAY_STATE(ssl, 1, ssl->bm_buf.data[0], 0); DISPLAY_STATE(ssl, 1, ssl->bm_data[0], 0);
if (ssl->bm_buf.data[0] != HS_HELLO_REQUEST) if (ssl->bm_data[0] != HS_HELLO_REQUEST)
{ {
add_packet(ssl, ssl->bm_buf.data, ssl->bm_buf.index); add_packet(ssl, ssl->bm_data, ssl->bm_index);
} }
} }
/* add the packet digest */ /* add the packet digest */
msg_length += ssl->cipher_info->digest_size; msg_length += ssl->cipher_info->digest_size;
ssl->bm_buf.index = msg_length; ssl->bm_index = msg_length;
add_hmac_digest(ssl, mode, ssl->bm_buf.data, length, add_hmac_digest(ssl, mode, ssl->bm_data, length,
&ssl->bm_buf.data[length]); &ssl->bm_data[length]);
/* add padding? */ /* add padding? */
if (ssl->cipher_info->padding_size) if (ssl->cipher_info->padding_size)
{ {
int last_blk_size = msg_length%ssl->cipher_info->padding_size; int last_blk_size = msg_length%ssl->cipher_info->padding_size;
int pad_bytes = ssl->cipher_info->padding_size - last_blk_size; pad_bytes = ssl->cipher_info->padding_size - last_blk_size;
/* ensure we always have at least 1 padding byte */ /* ensure we always have at least 1 padding byte */
if (pad_bytes == 0) if (pad_bytes == 0)
{
pad_bytes += ssl->cipher_info->padding_size; pad_bytes += ssl->cipher_info->padding_size;
}
memset(&ssl->bm_buf.data[msg_length], pad_bytes-1, pad_bytes); memset(&ssl->bm_data[msg_length], pad_bytes-1, pad_bytes);
msg_length += pad_bytes; msg_length += pad_bytes;
ssl->bm_buf.index = msg_length; ssl->bm_index = msg_length;
} }
DISPLAY_BYTES(ssl, "unencrypted write", ssl->bm_buf.data, msg_length); DISPLAY_BYTES(ssl, "unencrypted write", ssl->bm_data, msg_length);
increment_write_sequence(ssl); increment_write_sequence(ssl);
/* now encrypt the packet */ /* now encrypt the packet */
ssl->cipher_info->encrypt(ssl->encrypt_ctx, ssl->bm_buf.data, ssl->cipher_info->encrypt(ssl->encrypt_ctx, ssl->bm_data,
ssl->bm_buf.data, msg_length); ssl->bm_data, msg_length);
} }
else if (protocol == PT_HANDSHAKE_PROTOCOL) else if (protocol == PT_HANDSHAKE_PROTOCOL)
{ {
DISPLAY_STATE(ssl, 1, ssl->bm_buf.data[0], 0); DISPLAY_STATE(ssl, 1, ssl->bm_data[0], 0);
if (ssl->bm_buf.data[0] != HS_HELLO_REQUEST) if (ssl->bm_data[0] != HS_HELLO_REQUEST)
{ {
add_packet(ssl, ssl->bm_buf.data, ssl->bm_buf.index); add_packet(ssl, ssl->bm_data, ssl->bm_index);
} }
} }
return send_raw_packet(ssl, protocol); if ((ret = send_raw_packet(ssl, protocol)) <= 0)
return ret;
return length; /* just return what we wanted to send */
} }
/** /**
@ -1125,9 +1138,8 @@ int basic_read(SSL *ssl, uint8_t **in_data)
int is_client = IS_SET_SSL_FLAG(SSL_IS_CLIENT); int is_client = IS_SET_SSL_FLAG(SSL_IS_CLIENT);
uint8_t *buf; uint8_t *buf;
buf_grow(&ssl->bm_buf, ssl->need_bytes); buf = ssl->bm_data;
buf = ssl->bm_buf.data; read_len = SOCKET_READ(ssl->client_fd, &buf[ssl->bm_index],
read_len = SOCKET_READ(ssl->client_fd, &buf[ssl->bm_buf.index],
ssl->need_bytes-ssl->got_bytes); ssl->need_bytes-ssl->got_bytes);
/* connection has gone, so die */ /* connection has gone, so die */
@ -1139,17 +1151,16 @@ int basic_read(SSL *ssl, uint8_t **in_data)
} }
DISPLAY_BYTES(ssl, "received %d bytes", DISPLAY_BYTES(ssl, "received %d bytes",
&ssl->bm_buf.data[ssl->bm_buf.index], read_len, read_len); &ssl->bm_data[ssl->bm_index], read_len, read_len);
ssl->got_bytes += read_len; ssl->got_bytes += read_len;
ssl->bm_buf.index += read_len; ssl->bm_index += read_len;
/* haven't quite got what we want, so try again later */ /* haven't quite got what we want, so try again later */
if (ssl->got_bytes < ssl->need_bytes) if (ssl->got_bytes < ssl->need_bytes)
{
return SSL_OK; return SSL_OK;
}
read_len = ssl->got_bytes;
ssl->got_bytes = 0; ssl->got_bytes = 0;
if (IS_SET_SSL_FLAG(SSL_NEED_RECORD)) if (IS_SET_SSL_FLAG(SSL_NEED_RECORD))
@ -1162,14 +1173,21 @@ int basic_read(SSL *ssl, uint8_t **in_data)
add_packet(ssl, &buf[2], 3); add_packet(ssl, &buf[2], 3);
ret = process_sslv23_client_hello(ssl); ret = process_sslv23_client_hello(ssl);
#else #else
printf("Error: no SSLv23 handshaking allowed\n"); printf("Error: no SSLv23 handshaking allowed\n"); TTY_FLUSH();
TTY_FLUSH();
ret = SSL_ERROR_NOT_SUPPORTED; ret = SSL_ERROR_NOT_SUPPORTED;
#endif #endif
goto error; /* not an error - just get out of here */ goto error; /* not an error - just get out of here */
} }
ssl->need_bytes = (buf[3] << 8) + buf[4]; ssl->need_bytes = (buf[3] << 8) + buf[4];
/* do we violate the spec with the message size? */
if (ssl->need_bytes > RT_MAX_PLAIN_LENGTH+RT_EXTRA-BM_RECORD_OFFSET)
{
ret = SSL_ERROR_INVALID_PROT_MSG;
goto error;
}
CLR_SSL_FLAG(SSL_NEED_RECORD); CLR_SSL_FLAG(SSL_NEED_RECORD);
memcpy(ssl->record_buf, buf, 3); /* store for hmac */ memcpy(ssl->record_buf, buf, 3); /* store for hmac */
is_record = 1; is_record = 1;
@ -1182,9 +1200,7 @@ int basic_read(SSL *ssl, uint8_t **in_data)
} }
if (is_record) if (is_record)
{
ssl->record_type = buf[0]; ssl->record_type = buf[0];
}
else if (IS_SET_SSL_FLAG(SSL_RX_ENCRYPTED)) else if (IS_SET_SSL_FLAG(SSL_RX_ENCRYPTED))
{ {
ssl->cipher_info->decrypt(ssl->decrypt_ctx, buf, buf, read_len); ssl->cipher_info->decrypt(ssl->decrypt_ctx, buf, buf, read_len);
@ -1224,7 +1240,7 @@ int basic_read(SSL *ssl, uint8_t **in_data)
break; break;
case PT_APP_PROTOCOL_DATA: case PT_APP_PROTOCOL_DATA:
*in_data = ssl->bm_buf.data; /* point to the work buffer */ *in_data = ssl->bm_data; /* point to the work buffer */
(*in_data)[read_len] = 0; /* null terminate just in case */ (*in_data)[read_len] = 0; /* null terminate just in case */
ret = read_len; ret = read_len;
break; break;
@ -1242,12 +1258,10 @@ int basic_read(SSL *ssl, uint8_t **in_data)
} }
error: error:
ssl->bm_buf.index = 0; /* reset to go again */ ssl->bm_index = 0; /* reset to go again */
if (ret < SSL_OK && in_data) /* if all wrong, then clear this buffer ptr */ if (ret < SSL_OK && in_data) /* if all wrong, then clear this buffer ptr */
{
*in_data = NULL; *in_data = NULL;
}
return ret; return ret;
} }
@ -1277,13 +1291,11 @@ static int do_handshake(SSL *ssl, uint8_t *buf, int read_len)
} }
hs_len += SSL_HS_HDR_SIZE; /* adjust for when adding packets */ hs_len += SSL_HS_HDR_SIZE; /* adjust for when adding packets */
ssl->bm_buf.index = hs_len; /* store the size and check later */ ssl->bm_index = hs_len; /* store the size and check later */
DISPLAY_STATE(ssl, 0, handshake_type, 0); DISPLAY_STATE(ssl, 0, handshake_type, 0);
if (handshake_type != HS_CERT_VERIFY && handshake_type != HS_HELLO_REQUEST) if (handshake_type != HS_CERT_VERIFY && handshake_type != HS_HELLO_REQUEST)
{
add_packet(ssl, buf, hs_len); add_packet(ssl, buf, hs_len);
}
#if defined(CONFIG_SSL_ENABLE_CLIENT) #if defined(CONFIG_SSL_ENABLE_CLIENT)
ret = is_client ? ret = is_client ?
@ -1295,9 +1307,7 @@ static int do_handshake(SSL *ssl, uint8_t *buf, int read_len)
/* just use recursion to get the rest */ /* just use recursion to get the rest */
if (hs_len < read_len && ret == SSL_OK) if (hs_len < read_len && ret == SSL_OK)
{
ret = do_handshake(ssl, &buf[hs_len], read_len-hs_len); ret = do_handshake(ssl, &buf[hs_len], read_len-hs_len);
}
error: error:
return ret; return ret;
@ -1322,7 +1332,7 @@ int send_change_cipher_spec(SSL *ssl)
*/ */
int send_finished(SSL *ssl) int send_finished(SSL *ssl)
{ {
uint8_t *buf = ssl->bm_buf.data; uint8_t *buf = ssl->bm_data;
buf[0] = HS_FINISHED; buf[0] = HS_FINISHED;
buf[1] = 0; buf[1] = 0;
@ -1365,9 +1375,7 @@ int send_alert(SSL *ssl, int error_code)
#ifdef CONFIG_SSL_FULL_MODE #ifdef CONFIG_SSL_FULL_MODE
if (IS_SET_SSL_FLAG(SSL_DISPLAY_STATES)) if (IS_SET_SSL_FLAG(SSL_DISPLAY_STATES))
{
ssl_display_error(error_code); ssl_display_error(error_code);
}
#endif #endif
switch (error_code) switch (error_code)
@ -1424,26 +1432,22 @@ int send_alert(SSL *ssl, int error_code)
*/ */
int process_finished(SSL *ssl, int hs_len) int process_finished(SSL *ssl, int hs_len)
{ {
uint8_t *buf = ssl->bm_buf.data; uint8_t *buf = ssl->bm_data;
int ret = SSL_OK; int ret = SSL_OK;
int is_client = IS_SET_SSL_FLAG(SSL_IS_CLIENT); int is_client = IS_SET_SSL_FLAG(SSL_IS_CLIENT);
int resume = IS_SET_SSL_FLAG(SSL_SESSION_RESUME); int resume = IS_SET_SSL_FLAG(SSL_SESSION_RESUME);
PARANOIA_CHECK(ssl->bm_buf.index, SSL_FINISHED_HASH_SIZE+4); PARANOIA_CHECK(ssl->bm_index, SSL_FINISHED_HASH_SIZE+4);
/* check that we all work before we continue */ /* check that we all work before we continue */
if (memcmp(ssl->final_finish_mac, &buf[4], SSL_FINISHED_HASH_SIZE)) if (memcmp(ssl->final_finish_mac, &buf[4], SSL_FINISHED_HASH_SIZE))
{
return SSL_ERROR_FINISHED_INVALID; return SSL_ERROR_FINISHED_INVALID;
}
if ((!is_client && !resume) || (is_client && resume)) if ((!is_client && !resume) || (is_client && resume))
{ {
if ((ret = send_change_cipher_spec(ssl)) == SSL_OK) if ((ret = send_change_cipher_spec(ssl)) == SSL_OK)
{
ret = send_finished(ssl); ret = send_finished(ssl);
} }
}
/* Don't need this stuff anymore */ /* Don't need this stuff anymore */
free(ssl->all_pkts); free(ssl->all_pkts);
@ -1470,7 +1474,7 @@ error:
int send_certificate(SSL *ssl) int send_certificate(SSL *ssl)
{ {
int i = 0; int i = 0;
uint8_t *buf = ssl->bm_buf.data; uint8_t *buf = ssl->bm_data;
int offset = 7; int offset = 7;
int chain_length; int chain_length;
@ -1485,7 +1489,6 @@ int send_certificate(SSL *ssl)
buf[offset++] = 0; buf[offset++] = 0;
buf[offset++] = cert->size >> 8; /* cert 1 length */ buf[offset++] = cert->size >> 8; /* cert 1 length */
buf[offset++] = cert->size & 0xff; buf[offset++] = cert->size & 0xff;
buf_grow(&ssl->bm_buf, offset + cert->size);
memcpy(&buf[offset], cert->buf, cert->size); memcpy(&buf[offset], cert->buf, cert->size);
offset += cert->size; offset += cert->size;
i++; i++;
@ -1497,7 +1500,7 @@ int send_certificate(SSL *ssl)
chain_length += 3; chain_length += 3;
buf[2] = chain_length >> 8; /* handshake length */ buf[2] = chain_length >> 8; /* handshake length */
buf[3] = chain_length & 0xff; buf[3] = chain_length & 0xff;
ssl->bm_buf.index = offset; ssl->bm_index = offset;
return send_packet(ssl, PT_HANDSHAKE_PROTOCOL, NULL, offset); return send_packet(ssl, PT_HANDSHAKE_PROTOCOL, NULL, offset);
} }
@ -1516,10 +1519,9 @@ SSL_SESS *ssl_session_update(int max_sessions,
/* no sessions? Then bail */ /* no sessions? Then bail */
if (max_sessions == 0) if (max_sessions == 0)
{
return NULL; return NULL;
}
SSL_CTX_LOCK(ssl->ssl_ctx->mutex);
if (session_id) if (session_id)
{ {
for (i = 0; i < max_sessions; i++) for (i = 0; i < max_sessions; i++)
@ -1543,6 +1545,7 @@ SSL_SESS *ssl_session_update(int max_sessions,
memcpy(ssl->master_secret, memcpy(ssl->master_secret,
ssl_sessions[i]->master_secret, SSL_SECRET_SIZE); ssl_sessions[i]->master_secret, SSL_SECRET_SIZE);
SET_SSL_FLAG(SSL_SESSION_RESUME); SET_SSL_FLAG(SSL_SESSION_RESUME);
SSL_CTX_UNLOCK(ssl->ssl_ctx->mutex);
return ssl_sessions[i]; /* a session was found */ return ssl_sessions[i]; /* a session was found */
} }
} }
@ -1558,6 +1561,7 @@ SSL_SESS *ssl_session_update(int max_sessions,
ssl_sessions[i] = (SSL_SESS *)calloc(1, sizeof(SSL_SESS)); ssl_sessions[i] = (SSL_SESS *)calloc(1, sizeof(SSL_SESS));
ssl_sessions[i]->conn_time = tm; ssl_sessions[i]->conn_time = tm;
ssl->session_index = i; ssl->session_index = i;
SSL_CTX_UNLOCK(ssl->ssl_ctx->mutex);
return ssl_sessions[i]; /* return the session object */ return ssl_sessions[i]; /* return the session object */
} }
else if (ssl_sessions[i]->conn_time <= oldest_sess_time) else if (ssl_sessions[i]->conn_time <= oldest_sess_time)
@ -1573,6 +1577,7 @@ SSL_SESS *ssl_session_update(int max_sessions,
oldest_sess->conn_time = tm; oldest_sess->conn_time = tm;
memset(oldest_sess->session_id, 0, sizeof(SSL_SESSION_ID_SIZE)); memset(oldest_sess->session_id, 0, sizeof(SSL_SESSION_ID_SIZE));
memset(oldest_sess->master_secret, 0, sizeof(SSL_SECRET_SIZE)); memset(oldest_sess->master_secret, 0, sizeof(SSL_SECRET_SIZE));
SSL_CTX_UNLOCK(ssl->ssl_ctx->mutex);
return oldest_sess; return oldest_sess;
} }
@ -1593,11 +1598,15 @@ static void session_free(SSL_SESS *ssl_sessions[], int sess_index)
*/ */
void kill_ssl_session(SSL_SESS **ssl_sessions, SSL *ssl) void kill_ssl_session(SSL_SESS **ssl_sessions, SSL *ssl)
{ {
SSL_CTX_LOCK(ssl->ssl_ctx->mutex);
if (ssl->ssl_ctx->num_sessions) if (ssl->ssl_ctx->num_sessions)
{ {
session_free(ssl_sessions, ssl->session_index); session_free(ssl_sessions, ssl->session_index);
ssl->session = NULL; ssl->session = NULL;
} }
SSL_CTX_UNLOCK(ssl->ssl_ctx->mutex);
} }
#endif /* CONFIG_SSL_SKELETON_MODE */ #endif /* CONFIG_SSL_SKELETON_MODE */
@ -1684,10 +1693,10 @@ EXP_FUNC int STDCALL ssl_verify_cert(SSL *ssl)
int process_certificate(SSL *ssl, X509_CTX **x509_ctx) int process_certificate(SSL *ssl, X509_CTX **x509_ctx)
{ {
int ret = SSL_OK; int ret = SSL_OK;
int pkt_size = ssl->bm_buf.index; int pkt_size = ssl->bm_index;
int cert_size, offset = 5; int cert_size, offset = 5;
int total_cert_size = (ssl->bm_buf.data[offset]<<8) + int total_cert_size = (ssl->bm_data[offset]<<8) +
ssl->bm_buf.data[offset+1]; ssl->bm_data[offset+1];
int is_client = IS_SET_SSL_FLAG(SSL_IS_CLIENT); int is_client = IS_SET_SSL_FLAG(SSL_IS_CLIENT);
X509_CTX **chain = x509_ctx; X509_CTX **chain = x509_ctx;
offset += 2; offset += 2;
@ -1697,10 +1706,10 @@ int process_certificate(SSL *ssl, X509_CTX **x509_ctx)
while (offset < total_cert_size) while (offset < total_cert_size)
{ {
offset++; /* skip empty char */ offset++; /* skip empty char */
cert_size = (ssl->bm_buf.data[offset]<<8) + ssl->bm_buf.data[offset+1]; cert_size = (ssl->bm_data[offset]<<8) + ssl->bm_data[offset+1];
offset += 2; offset += 2;
if (x509_new(&ssl->bm_buf.data[offset], NULL, chain)) if (x509_new(&ssl->bm_data[offset], NULL, chain))
{ {
ret = SSL_ERROR_BAD_CERTIFICATE; ret = SSL_ERROR_BAD_CERTIFICATE;
goto error; goto error;
@ -1983,6 +1992,15 @@ void DISPLAY_ALERT(SSL *ssl, int alert)
#endif /* CONFIG_SSL_FULL_MODE */ #endif /* CONFIG_SSL_FULL_MODE */
/**
* Return the version of this library.
*/
EXP_FUNC const char * STDCALL ssl_version()
{
static const char * axtls_version = AXTLS_VERSION " " __DATE__;
return axtls_version;
}
/** /**
* Enable the various language bindings to work regardless of the * Enable the various language bindings to work regardless of the
* configuration - they just return an error statement and a bad return code. * configuration - they just return an error statement and a bad return code.

39
ssl/tls1.h
View File

@ -28,6 +28,31 @@
extern "C" { extern "C" {
#endif #endif
#include "version.h"
/* Mutexing definitions */
#if defined(CONFIG_SSLCTX_MUTEXING)
#if defined(WIN32)
#define SSL_CTX_MUTEX_TYPE HANDLE
#define SSL_CTX_MUTEX_INIT(A) A=CreateMutex(0, FALSE, 0)
#define SSL_CTX_MUTEX_DESTROY(A) CloseHandle(A)
#define SSL_CTX_LOCK(A) WaitForSingleObject(A, INFINITE)
#define SSL_CTX_UNLOCK(A) ReleaseMutex(A)
#else
#include <pthread.h>
#define SSL_CTX_MUTEX_TYPE pthread_mutex_t
#define SSL_CTX_MUTEX_INIT(A) pthread_mutex_init(&A, NULL)
#define SSL_CTX_MUTEX_DESTROY(A) pthread_mutex_destroy(&A)
#define SSL_CTX_LOCK(A) pthread_mutex_lock(&A)
#define SSL_CTX_UNLOCK(A) pthread_mutex_unlock(&A)
#endif
#else /* no mutexing */
#define SSL_CTX_MUTEX_INIT(A)
#define SSL_CTX_MUTEX_DESTROY(A)
#define SSL_CTX_LOCK(A)
#define SSL_CTX_UNLOCK(A)
#endif
#define SSL_RANDOM_SIZE 32 #define SSL_RANDOM_SIZE 32
#define SSL_SECRET_SIZE 48 #define SSL_SECRET_SIZE 48
#define SSL_FINISHED_HASH_SIZE 12 #define SSL_FINISHED_HASH_SIZE 12
@ -52,6 +77,9 @@ extern "C" {
#define IS_SET_SSL_FLAG(A) (ssl->flag & A) #define IS_SET_SSL_FLAG(A) (ssl->flag & A)
#define MAX_KEY_BYTE_SIZE 512 /* for a 4096 bit key */ #define MAX_KEY_BYTE_SIZE 512 /* for a 4096 bit key */
#define RT_MAX_PLAIN_LENGTH 16384
#define RT_EXTRA 1024
#define BM_RECORD_OFFSET 5
#ifdef CONFIG_SSL_SKELETON_MODE #ifdef CONFIG_SSL_SKELETON_MODE
#define NUM_PROTOCOLS 1 #define NUM_PROTOCOLS 1
@ -138,7 +166,9 @@ struct _SSL
uint8_t *key_block; uint8_t *key_block;
void *encrypt_ctx; void *encrypt_ctx;
void *decrypt_ctx; void *decrypt_ctx;
BUF_MEM bm_buf; uint8_t bm_all_data[RT_MAX_PLAIN_LENGTH+RT_EXTRA];
uint8_t *bm_data;
int bm_index;
struct _SSL *next; /* doubly linked list */ struct _SSL *next; /* doubly linked list */
struct _SSL *prev; struct _SSL *prev;
SSL_CERT *certs; SSL_CERT *certs;
@ -172,13 +202,16 @@ struct _SSLCTX
#ifdef CONFIG_SSL_CERT_VERIFICATION #ifdef CONFIG_SSL_CERT_VERIFICATION
CA_CERT_CTX *ca_cert_ctx; CA_CERT_CTX *ca_cert_ctx;
#endif #endif
SSL *sess_head; SSL *head;
SSL *sess_tail; SSL *tail;
SSL_CERT certs[CONFIG_SSL_MAX_CERTS]; SSL_CERT certs[CONFIG_SSL_MAX_CERTS];
#ifndef CONFIG_SSL_SKELETON_MODE #ifndef CONFIG_SSL_SKELETON_MODE
uint16_t num_sessions; uint16_t num_sessions;
SSL_SESS **ssl_sessions; SSL_SESS **ssl_sessions;
#endif #endif
#ifdef CONFIG_SSLCTX_MUTEXING
SSL_CTX_MUTEX_TYPE mutex;
#endif
}; };
typedef struct _SSLCTX SSLCTX; typedef struct _SSLCTX SSLCTX;

23
ssl/tls1_clnt.c
View File

@ -117,7 +117,7 @@ int do_client_connect(SSL *ssl)
int ret = SSL_OK; int ret = SSL_OK;
send_client_hello(ssl); /* send the client hello */ send_client_hello(ssl); /* send the client hello */
ssl->bm_buf.index = 0; ssl->bm_index = 0;
ssl->next_state = HS_SERVER_HELLO; ssl->next_state = HS_SERVER_HELLO;
ssl->hs_status = SSL_NOT_OK; /* not connected */ ssl->hs_status = SSL_NOT_OK; /* not connected */
@ -151,7 +151,7 @@ int do_client_connect(SSL *ssl)
*/ */
static int send_client_hello(SSL *ssl) static int send_client_hello(SSL *ssl)
{ {
uint8_t *buf = ssl->bm_buf.data; uint8_t *buf = ssl->bm_data;
time_t tm = time(NULL); time_t tm = time(NULL);
uint8_t *tm_ptr = &buf[6]; /* time will go here */ uint8_t *tm_ptr = &buf[6]; /* time will go here */
int i, offset; int i, offset;
@ -208,8 +208,8 @@ static int send_client_hello(SSL *ssl)
*/ */
static int process_server_hello(SSL *ssl) static int process_server_hello(SSL *ssl)
{ {
uint8_t *buf = ssl->bm_buf.data; uint8_t *buf = ssl->bm_data;
int pkt_size = ssl->bm_buf.index; int pkt_size = ssl->bm_index;
int offset; int offset;
int version = (buf[4] << 4) + buf[5]; int version = (buf[4] << 4) + buf[5];
int num_sessions = ssl->ssl_ctx->num_sessions; int num_sessions = ssl->ssl_ctx->num_sessions;
@ -217,9 +217,7 @@ static int process_server_hello(SSL *ssl)
/* check that we are talking to a TLSv1 server */ /* check that we are talking to a TLSv1 server */
if (version != 0x31) if (version != 0x31)
{
return SSL_ERROR_INVALID_VERSION; return SSL_ERROR_INVALID_VERSION;
}
/* get the server random value */ /* get the server random value */
memcpy(ssl->server_random, &buf[6], SSL_RANDOM_SIZE); memcpy(ssl->server_random, &buf[6], SSL_RANDOM_SIZE);
@ -260,7 +258,7 @@ static int process_server_hello_done(SSL *ssl)
*/ */
static int send_client_key_xchg(SSL *ssl) static int send_client_key_xchg(SSL *ssl)
{ {
uint8_t *buf = ssl->bm_buf.data; uint8_t *buf = ssl->bm_data;
uint8_t premaster_secret[SSL_SECRET_SIZE]; uint8_t premaster_secret[SSL_SECRET_SIZE];
int enc_secret_size = -1; int enc_secret_size = -1;
@ -271,8 +269,13 @@ static int send_client_key_xchg(SSL *ssl)
premaster_secret[1] = 0x01; premaster_secret[1] = 0x01;
get_random(SSL_SECRET_SIZE-2, &premaster_secret[2]); get_random(SSL_SECRET_SIZE-2, &premaster_secret[2]);
DISPLAY_RSA(ssl, "send_client_key_xchg", ssl->x509_ctx->rsa_ctx); DISPLAY_RSA(ssl, "send_client_key_xchg", ssl->x509_ctx->rsa_ctx);
/* rsa_ctx->bi_ctx is not thread-safe */
SSL_CTX_LOCK(ssl->ssl_ctx->mutex);
enc_secret_size = RSA_encrypt(ssl->x509_ctx->rsa_ctx, premaster_secret, enc_secret_size = RSA_encrypt(ssl->x509_ctx->rsa_ctx, premaster_secret,
SSL_SECRET_SIZE, &buf[6], 0); SSL_SECRET_SIZE, &buf[6], 0);
SSL_CTX_UNLOCK(ssl->ssl_ctx->mutex);
buf[2] = (enc_secret_size + 2) >> 8; buf[2] = (enc_secret_size + 2) >> 8;
buf[3] = (enc_secret_size + 2) & 0xff; buf[3] = (enc_secret_size + 2) & 0xff;
buf[4] = enc_secret_size >> 8; buf[4] = enc_secret_size >> 8;
@ -298,7 +301,7 @@ static int process_cert_req(SSL *ssl)
*/ */
static int send_cert_verify(SSL *ssl) static int send_cert_verify(SSL *ssl)
{ {
uint8_t *buf = ssl->bm_buf.data; uint8_t *buf = ssl->bm_data;
uint8_t dgst[MD5_SIZE+SHA1_SIZE]; uint8_t dgst[MD5_SIZE+SHA1_SIZE];
RSA_CTX *rsa_ctx = ssl->ssl_ctx->rsa_ctx; RSA_CTX *rsa_ctx = ssl->ssl_ctx->rsa_ctx;
int n, ret; int n, ret;
@ -309,7 +312,11 @@ static int send_cert_verify(SSL *ssl)
buf[1] = 0; buf[1] = 0;
finished_digest(ssl, NULL, dgst); /* calculate the digest */ finished_digest(ssl, NULL, dgst); /* calculate the digest */
/* rsa_ctx->bi_ctx is not thread-safe */
SSL_CTX_LOCK(ssl->ssl_ctx->mutex);
n = RSA_encrypt(rsa_ctx, dgst, sizeof(dgst), &buf[6], 1); n = RSA_encrypt(rsa_ctx, dgst, sizeof(dgst), &buf[6], 1);
SSL_CTX_UNLOCK(ssl->ssl_ctx->mutex);
if (n == 0) if (n == 0)
{ {

29
ssl/tls1_svr.c
View File

@ -45,10 +45,7 @@ EXP_FUNC SSL * STDCALL ssl_server_new(SSLCTX *ssl_ctx, int client_fd)
#ifdef CONFIG_SSL_FULL_MODE #ifdef CONFIG_SSL_FULL_MODE
if (ssl_ctx->chain_length == 0) if (ssl_ctx->chain_length == 0)
{ printf("Warning - no server certificate defined\n"); TTY_FLUSH();
printf("Warning - no server certificate defined\n");
TTY_FLUSH();
}
#endif #endif
return ssl; return ssl;
@ -67,9 +64,7 @@ int do_svr_handshake(SSL *ssl, int handshake_type, uint8_t *buf, int hs_len)
{ {
case HS_CLIENT_HELLO: case HS_CLIENT_HELLO:
if ((ret = process_client_hello(ssl)) == SSL_OK) if ((ret = process_client_hello(ssl)) == SSL_OK)
{
ret = send_server_hello_sequence(ssl); ret = send_server_hello_sequence(ssl);
}
break; break;
#ifdef CONFIG_SSL_CERT_VERIFICATION #ifdef CONFIG_SSL_CERT_VERIFICATION
@ -107,9 +102,9 @@ int do_svr_handshake(SSL *ssl, int handshake_type, uint8_t *buf, int hs_len)
*/ */
static int process_client_hello(SSL *ssl) static int process_client_hello(SSL *ssl)
{ {
uint8_t *buf = ssl->bm_buf.data; uint8_t *buf = ssl->bm_data;
uint8_t *record_buf = ssl->record_buf; uint8_t *record_buf = ssl->record_buf;
int pkt_size = ssl->bm_buf.index; int pkt_size = ssl->bm_index;
int i, j, cs_len, id_len, offset = 6 + SSL_RANDOM_SIZE; int i, j, cs_len, id_len, offset = 6 + SSL_RANDOM_SIZE;
int version = (record_buf[1] << 4) + record_buf[2]; int version = (record_buf[1] << 4) + record_buf[2];
int ret = SSL_OK; int ret = SSL_OK;
@ -169,7 +164,7 @@ error:
*/ */
int process_sslv23_client_hello(SSL *ssl) int process_sslv23_client_hello(SSL *ssl)
{ {
uint8_t *buf = ssl->bm_buf.data; uint8_t *buf = ssl->bm_data;
int bytes_needed = ((buf[0] & 0x7f) << 8) + buf[1]; int bytes_needed = ((buf[0] & 0x7f) << 8) + buf[1];
int version = (buf[3] << 4) + buf[4]; int version = (buf[3] << 4) + buf[4];
int ret = SSL_OK; int ret = SSL_OK;
@ -291,7 +286,7 @@ static int send_server_hello_sequence(SSL *ssl)
*/ */
static int send_server_hello(SSL *ssl) static int send_server_hello(SSL *ssl)
{ {
uint8_t *buf = ssl->bm_buf.data; uint8_t *buf = ssl->bm_data;
int offset = 0; int offset = 0;
buf[0] = HS_SERVER_HELLO; buf[0] = HS_SERVER_HELLO;
@ -358,8 +353,8 @@ static int send_server_hello_done(SSL *ssl)
*/ */
static int process_client_key_xchg(SSL *ssl) static int process_client_key_xchg(SSL *ssl)
{ {
uint8_t *buf = ssl->bm_buf.data; uint8_t *buf = ssl->bm_data;
int pkt_size = ssl->bm_buf.index; int pkt_size = ssl->bm_index;
int premaster_size, secret_length = (buf[2] << 8) + buf[3]; int premaster_size, secret_length = (buf[2] << 8) + buf[3];
uint8_t premaster_secret[MAX_KEY_BYTE_SIZE]; uint8_t premaster_secret[MAX_KEY_BYTE_SIZE];
RSA_CTX *rsa_ctx = ssl->ssl_ctx->rsa_ctx; RSA_CTX *rsa_ctx = ssl->ssl_ctx->rsa_ctx;
@ -370,12 +365,14 @@ static int process_client_key_xchg(SSL *ssl)
/* is there an extra size field? */ /* is there an extra size field? */
if ((secret_length - 2) == rsa_ctx->num_octets) if ((secret_length - 2) == rsa_ctx->num_octets)
{
offset += 2; offset += 2;
}
PARANOIA_CHECK(pkt_size, rsa_ctx->num_octets+offset); PARANOIA_CHECK(pkt_size, rsa_ctx->num_octets+offset);
/* rsa_ctx->bi_ctx is not thread-safe */
SSL_CTX_LOCK(ssl->ssl_ctx->mutex);
premaster_size = RSA_decrypt(rsa_ctx, &buf[offset], premaster_secret, 1); premaster_size = RSA_decrypt(rsa_ctx, &buf[offset], premaster_secret, 1);
SSL_CTX_UNLOCK(ssl->ssl_ctx->mutex);
if (premaster_size != SSL_SECRET_SIZE || if (premaster_size != SSL_SECRET_SIZE ||
premaster_secret[0] != 0x03 || /* check version is 3.1 (TLS) */ premaster_secret[0] != 0x03 || /* check version is 3.1 (TLS) */
@ -420,8 +417,8 @@ static int send_certificate_request(SSL *ssl)
*/ */
static int process_cert_verify(SSL *ssl) static int process_cert_verify(SSL *ssl)
{ {
uint8_t *buf = ssl->bm_buf.data; uint8_t *buf = ssl->bm_data;
int pkt_size = ssl->bm_buf.index; int pkt_size = ssl->bm_index;
uint8_t dgst_buf[MAX_KEY_BYTE_SIZE]; uint8_t dgst_buf[MAX_KEY_BYTE_SIZE];
uint8_t dgst[MD5_SIZE+SHA1_SIZE]; uint8_t dgst[MD5_SIZE+SHA1_SIZE];
X509_CTX *x509_ctx = ssl->x509_ctx; X509_CTX *x509_ctx = ssl->x509_ctx;