Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace Cyrus SASL MD5 with Colin Plumb's MD5 #450

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+258 −816
Open

Replace Cyrus SASL MD5 with Colin Plumb's MD5 #450

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build-android/dependencies/cyrus-sasl/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ function build {
if test ! -f "$current_dir/$package_name-$build_version/include/sasl/sasl.h" ; then
mkdir -p "$current_dir/$package_name-$build_version"
mkdir -p "$current_dir/$package_name-$build_version/include/sasl"
public_headers="hmac-md5.h md5.h md5global.h sasl.h saslplug.h saslutil.h prop.h"
public_headers="md5.h sasl.h saslplug.h saslutil.h prop.h"
cd "$current_dir/src/$ARCHIVE/include"
cp -R $public_headers "$current_dir/$package_name-$build_version/include/sasl"
fi
Expand Down
4 changes: 0 additions & 4 deletions build-mac/libetpan.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -653,7 +653,6 @@
C6F9E858105335BC0059C3BA /* clist.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = clist.h; sourceTree = "<group>"; };
C6F9E859105335BC0059C3BA /* connect.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = connect.c; sourceTree = "<group>"; };
C6F9E85A105335BC0059C3BA /* connect.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = connect.h; sourceTree = "<group>"; };
C6F9E85B105335BC0059C3BA /* hmac-md5.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "hmac-md5.h"; sourceTree = "<group>"; };
C6F9E85C105335BC0059C3BA /* mail.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mail.h; sourceTree = "<group>"; };
C6F9E85D105335BC0059C3BA /* mail_cache_db.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mail_cache_db.c; sourceTree = "<group>"; };
C6F9E85E105335BC0059C3BA /* mail_cache_db.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mail_cache_db.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -681,7 +680,6 @@
C6F9E874105335BC0059C3BA /* mailstream_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailstream_types.h; sourceTree = "<group>"; };
C6F9E878105335BC0059C3BA /* md5.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = md5.c; sourceTree = "<group>"; };
C6F9E879105335BC0059C3BA /* md5.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = md5.h; sourceTree = "<group>"; };
C6F9E87A105335BC0059C3BA /* md5global.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = md5global.h; sourceTree = "<group>"; };
C6F9E87B105335BC0059C3BA /* mmapstring.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mmapstring.c; sourceTree = "<group>"; };
C6F9E87C105335BC0059C3BA /* mmapstring.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mmapstring.h; sourceTree = "<group>"; };
C6F9E87D105335BC0059C3BA /* mmapstring_private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mmapstring_private.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1089,7 +1087,6 @@
C6F9E858105335BC0059C3BA /* clist.h */,
C6F9E859105335BC0059C3BA /* connect.c */,
C6F9E85A105335BC0059C3BA /* connect.h */,
C6F9E85B105335BC0059C3BA /* hmac-md5.h */,
C6F9E85C105335BC0059C3BA /* mail.h */,
C6F9E85D105335BC0059C3BA /* mail_cache_db.c */,
C6F9E85E105335BC0059C3BA /* mail_cache_db.h */,
Expand Down Expand Up @@ -1121,7 +1118,6 @@
C6F9E874105335BC0059C3BA /* mailstream_types.h */,
C6F9E878105335BC0059C3BA /* md5.c */,
C6F9E879105335BC0059C3BA /* md5.h */,
C6F9E87A105335BC0059C3BA /* md5global.h */,
BD5495471BEAC5EB00E7974E /* md5namespace.h */,
C6F9E87B105335BC0059C3BA /* mmapstring.c */,
C6F9E87C105335BC0059C3BA /* mmapstring.h */,
Expand Down
2 changes: 0 additions & 2 deletions build-windows/libetpan/libetpan.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,7 +410,6 @@ build_headers.bat
<ClInclude Include="..\..\src\data-types\chash.h" />
<ClInclude Include="..\..\src\data-types\clist.h" />
<ClInclude Include="..\..\src\data-types\connect.h" />
<ClInclude Include="..\..\src\data-types\hmac-md5.h" />
<ClInclude Include="..\..\src\data-types\mail.h" />
<ClInclude Include="..\..\src\data-types\maillock.h" />
<ClInclude Include="..\..\src\data-types\mailsasl.h" />
Expand All @@ -430,7 +429,6 @@ build_headers.bat
<ClInclude Include="..\..\src\data-types\mail_cache_db.h" />
<ClInclude Include="..\..\src\data-types\mail_cache_db_types.h" />
<ClInclude Include="..\..\src\data-types\md5.h" />
<ClInclude Include="..\..\src\data-types\md5global.h" />
<ClInclude Include="..\..\src\data-types\mmapstring.h" />
<ClInclude Include="..\..\src\data-types\mmapstring_private.h" />
<ClInclude Include="..\..\src\data-types\timeutils.h" />
Expand Down
8 changes: 1 addition & 7 deletions build-windows/libetpan/libetpan.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -656,9 +656,6 @@
<ClInclude Include="..\..\src\data-types\connect.h">
<Filter>Source Files\datatypes</Filter>
</ClInclude>
<ClInclude Include="..\..\src\data-types\hmac-md5.h">
<Filter>Source Files\datatypes</Filter>
</ClInclude>
<ClInclude Include="..\..\src\data-types\mail.h">
<Filter>Source Files\datatypes</Filter>
</ClInclude>
Expand Down Expand Up @@ -713,9 +710,6 @@
<ClInclude Include="..\..\src\data-types\md5.h">
<Filter>Source Files\datatypes</Filter>
</ClInclude>
<ClInclude Include="..\..\src\data-types\md5global.h">
<Filter>Source Files\datatypes</Filter>
</ClInclude>
<ClInclude Include="..\..\src\data-types\mmapstring.h">
<Filter>Source Files\datatypes</Filter>
</ClInclude>
Expand Down Expand Up @@ -1235,4 +1229,4 @@
<Filter>Source Files</Filter>
</CustomBuild>
</ItemGroup>
</Project>
</Project>
4 changes: 1 addition & 3 deletions doc/DOCUMENTATION
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,9 +335,7 @@ cinthash.[ch] -- a hash table which keys are integers
(should be removed and replaced with chash)
clist.[ch] -- a double-linked list
connect.[ch] -- easy interface to connect a TCP server
hmac_md5.h
md5.[ch]
md5global.h -- MD5 calculation
md5.[ch] -- MD5 calculation
mail.h -- some constants
maildb_helper.[ch] -- wrappers to DB 2.x 3.x or 4.x
maillock.[ch] -- safely lock a given file
Expand Down
4 changes: 2 additions & 2 deletions src/data-types/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ AM_CPPFLAGS = -I$(top_builddir)/include

noinst_LTLIBRARIES = libdata-types.la

libdata_types_la_SOURCES = connect.h connect.c base64.h hmac-md5.h \
md5global.h md5namespace.h md5.h md5.c mmapstring.c mailstream_helper.c \
libdata_types_la_SOURCES = connect.h connect.c base64.h \
md5namespace.h md5.h md5.c mmapstring.c mailstream_helper.c \
mailstream_low.c mailstream.c mailstream_socket.c \
mailstream_ssl.c carray.c clist.c chash.c \
charconv.c maillock.c base64.c mail_cache_db_types.h \
Expand Down
94 changes: 0 additions & 94 deletions src/data-types/hmac-md5.h
View file
Open in desktop

This file was deleted.

Loading