Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
3fe937b1
Commit
3fe937b1
authored
18 years ago
by
msvensson@neptunus.(none)
Browse files
Options
Browse Files
Download
Plain Diff
Merge 192.168.0.20:mysql/yassl_import/my50-yassl_import
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
parents
31765bfb
4ba0e7e3
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
54 additions
and
8 deletions
+54
-8
extra/yassl/include/yassl_error.hpp
extra/yassl/include/yassl_error.hpp
+2
-2
extra/yassl/mySTL/stdexcept.hpp
extra/yassl/mySTL/stdexcept.hpp
+0
-2
extra/yassl/src/yassl_error.cpp
extra/yassl/src/yassl_error.cpp
+3
-0
extra/yassl/src/yassl_int.cpp
extra/yassl/src/yassl_int.cpp
+8
-3
extra/yassl/taocrypt/src/integer.cpp
extra/yassl/taocrypt/src/integer.cpp
+4
-1
extra/yassl/taocrypt/src/misc.cpp
extra/yassl/taocrypt/src/misc.cpp
+13
-0
extra/yassl/taocrypt/taocrypt.vcproj
extra/yassl/taocrypt/taocrypt.vcproj
+24
-0
No files found.
extra/yassl/include/yassl_error.hpp
View file @
3fe937b1
...
@@ -26,7 +26,6 @@
...
@@ -26,7 +26,6 @@
#ifndef yaSSL_ERROR_HPP
#ifndef yaSSL_ERROR_HPP
#define yaSSL_ERROR_HPP
#define yaSSL_ERROR_HPP
#include "stdexcept.hpp"
namespace
yaSSL
{
namespace
yaSSL
{
...
@@ -63,7 +62,7 @@ enum { MAX_ERROR_SZ = 80 };
...
@@ -63,7 +62,7 @@ enum { MAX_ERROR_SZ = 80 };
void
SetErrorString
(
YasslError
,
char
*
);
void
SetErrorString
(
YasslError
,
char
*
);
/* remove for now, if go back to exceptions use this wrapper
// Base class for all yaSSL exceptions
// Base class for all yaSSL exceptions
class Error : public mySTL::runtime_error {
class Error : public mySTL::runtime_error {
YasslError error_;
YasslError error_;
...
@@ -75,6 +74,7 @@ public:
...
@@ -75,6 +74,7 @@ public:
YasslError get_number() const;
YasslError get_number() const;
Library get_lib() const;
Library get_lib() const;
};
};
*/
}
// naemspace
}
// naemspace
...
...
This diff is collapsed.
Click to expand it.
extra/yassl/mySTL/stdexcept.hpp
View file @
3fe937b1
...
@@ -46,10 +46,8 @@ public:
...
@@ -46,10 +46,8 @@ public:
// for compiler generated call, never used
// for compiler generated call, never used
static
void
operator
delete
(
void
*
)
{
assert
(
0
);
}
static
void
operator
delete
(
void
*
)
{
assert
(
0
);
}
private:
private:
#if defined(__hpux)
// don't allow dynamic creation of exceptions
// don't allow dynamic creation of exceptions
static
void
*
operator
new
(
size_t
);
static
void
*
operator
new
(
size_t
);
#endif
};
};
...
...
This diff is collapsed.
Click to expand it.
extra/yassl/src/yassl_error.cpp
View file @
3fe937b1
...
@@ -27,10 +27,12 @@
...
@@ -27,10 +27,12 @@
#include "yassl_error.hpp"
#include "yassl_error.hpp"
#include "error.hpp" // TaoCrypt error numbers
#include "error.hpp" // TaoCrypt error numbers
#include "openssl/ssl.h" // SSL_ERROR_WANT_READ
#include "openssl/ssl.h" // SSL_ERROR_WANT_READ
#include <string.h> // strncpy
namespace
yaSSL
{
namespace
yaSSL
{
/* may bring back in future
Error::Error(const char* s, YasslError e, Library l)
Error::Error(const char* s, YasslError e, Library l)
: mySTL::runtime_error(s), error_(e), lib_(l)
: mySTL::runtime_error(s), error_(e), lib_(l)
{
{
...
@@ -48,6 +50,7 @@ Library Error::get_lib() const
...
@@ -48,6 +50,7 @@ Library Error::get_lib() const
return lib_;
return lib_;
}
}
*/
void
SetErrorString
(
YasslError
error
,
char
*
buffer
)
void
SetErrorString
(
YasslError
error
,
char
*
buffer
)
...
...
This diff is collapsed.
Click to expand it.
extra/yassl/src/yassl_int.cpp
View file @
3fe937b1
...
@@ -2106,9 +2106,14 @@ ASN1_STRING* StringHolder::GetString()
...
@@ -2106,9 +2106,14 @@ ASN1_STRING* StringHolder::GetString()
extern
"C"
void
yaSSL_CleanUp
()
extern
"C"
void
yaSSL_CleanUp
()
{
{
TaoCrypt
::
CleanUp
();
TaoCrypt
::
CleanUp
();
ysDelete
(
yaSSL
::
cryptProviderInstance
);
yaSSL
::
ysDelete
(
yaSSL
::
cryptProviderInstance
);
ysDelete
(
yaSSL
::
sslFactoryInstance
);
yaSSL
::
ysDelete
(
yaSSL
::
sslFactoryInstance
);
ysDelete
(
yaSSL
::
sessionsInstance
);
yaSSL
::
ysDelete
(
yaSSL
::
sessionsInstance
);
// In case user calls more than once, prevent seg fault
yaSSL
::
cryptProviderInstance
=
0
;
yaSSL
::
sslFactoryInstance
=
0
;
yaSSL
::
sessionsInstance
=
0
;
}
}
...
...
This diff is collapsed.
Click to expand it.
extra/yassl/taocrypt/src/integer.cpp
View file @
3fe937b1
...
@@ -2735,8 +2735,11 @@ void CleanUp()
...
@@ -2735,8 +2735,11 @@ void CleanUp()
{
{
tcDelete
(
one
);
tcDelete
(
one
);
tcDelete
(
zero
);
tcDelete
(
zero
);
}
// In case user calls more than once, prevent seg fault
one
=
0
;
zero
=
0
;
}
Integer
::
Integer
(
RandomNumberGenerator
&
rng
,
const
Integer
&
min
,
Integer
::
Integer
(
RandomNumberGenerator
&
rng
,
const
Integer
&
min
,
const
Integer
&
max
)
const
Integer
&
max
)
...
...
This diff is collapsed.
Click to expand it.
extra/yassl/taocrypt/src/misc.cpp
View file @
3fe937b1
...
@@ -81,6 +81,19 @@ extern "C" {
...
@@ -81,6 +81,19 @@ extern "C" {
}
}
#if defined(__ICC) || defined(__INTEL_COMPILER)
extern
"C"
{
int
__cxa_pure_virtual
()
{
assert
(
"Pure virtual method called."
==
"Aborted"
);
return
0
;
}
}
// extern "C"
#endif
#endif // YASSL_PURE_C
#endif // YASSL_PURE_C
...
...
This diff is collapsed.
Click to expand it.
extra/yassl/taocrypt/taocrypt.vcproj
View file @
3fe937b1
...
@@ -396,6 +396,27 @@
...
@@ -396,6 +396,27 @@
PreprocessorDefinitions=
""
/>
PreprocessorDefinitions=
""
/>
</FileConfiguration>
</FileConfiguration>
</File>
</File>
<File
RelativePath=
"src\md4.cpp"
>
<FileConfiguration
Name=
"Debug|Win32"
>
<Tool
Name=
"VCCLCompilerTool"
Optimization=
"0"
AdditionalIncludeDirectories=
""
PreprocessorDefinitions=
""
BasicRuntimeChecks=
"3"
BrowseInformation=
"1"
/>
</FileConfiguration>
<FileConfiguration
Name=
"Release|Win32"
>
<Tool
Name=
"VCCLCompilerTool"
Optimization=
"2"
AdditionalIncludeDirectories=
""
PreprocessorDefinitions=
""
/>
</FileConfiguration>
</File>
<File
<File
RelativePath=
"src\md5.cpp"
>
RelativePath=
"src\md5.cpp"
>
<FileConfiguration
<FileConfiguration
...
@@ -571,6 +592,9 @@
...
@@ -571,6 +592,9 @@
<File
<File
RelativePath=
"include\md2.hpp"
>
RelativePath=
"include\md2.hpp"
>
</File>
</File>
<File
RelativePath=
"include\md4.hpp"
>
</File>
<File
<File
RelativePath=
"include\md5.hpp"
>
RelativePath=
"include\md5.hpp"
>
</File>
</File>
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment