github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-07-11 22:03:01 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

Core, Core/SSL: GetP7Signature

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@10340 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2016-10-21 10:47:46 +00:00
parent ad88e55270
commit 2455bce793
6 changed files with 83 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

44
uppsrc/Core/SSL/P7S.icpp Normal file
View file

@ -0,0 +1,44 @@
#include "SSL.h"
namespace Upp {
String GetP7Signature_imp(const void *data, int length, const String& cert_pem, const String& pkey_pem)
{
SslCertificate x509;
SslKey pkey;
if(!x509.Load(cert_pem))
return Null;
if(!pkey.Load(pkey_pem))
return Null;
SslStream in;
in.OpenBuffer((const char *)data, length);
PKCS7 *p7 = PKCS7_sign(x509, pkey, NULL, in, PKCS7_DETACHED|PKCS7_STREAM|PKCS7_BINARY);
if (!p7)
return Null;
SslStream out;
out.CreateBuffer();
String r;
if (SMIME_write_PKCS7(out, p7, in, PKCS7_DETACHED|PKCS7_STREAM|PKCS7_BINARY)) {
SslStream out1;
out1.CreateBuffer();
i2d_PKCS7_bio(out1, p7);
r = out1.GetResult();
}
PKCS7_free(p7);
return r;
}
extern String (*GetP7Signature__)(const void *data, int length, const String& cert_pem, const String& pkey_pem);
INITBLOCK {
GetP7Signature__ = GetP7Signature_imp;
}
}

3
uppsrc/Core/SSL/SSL.upp
View file

@ -20,5 +20,6 @@ file
SSL.h,
Util.cpp,
InitExit.icpp,
Socket.icpp;
Socket.icpp,
P7S.icpp;

3
uppsrc/Core/SSL/init
View file

@ -6,4 +6,7 @@
#define BLITZ_INDEX__ F20fd197ce515f45c6284ecc270cf38ca
#include "Socket.icpp"
#undef BLITZ_INDEX__
#define BLITZ_INDEX__ F2102a4fa3eba4dcfabd989be82ccd052
#include "P7S.icpp"
#undef BLITZ_INDEX__
#endif

14
uppsrc/Core/Util.cpp
View file

@ -874,4 +874,18 @@ WString Replace(const WString& s, const VectorMap<WString, WString>& fr)
return Replace__<wchar>(s, fr.GetKeys(), fr.GetValues());
}
String (*GetP7Signature__)(const void *data, int length, const String& cert_pem, const String& pkey_pem);
String GetP7Signature(const void *data, int length, const String& cert_pem, const String& pkey_pem)
{
ASSERT_(GetP7Signature__, "Missing SSL support (Core/SSL)");
return (*GetP7Signature__)(data, length, cert_pem, pkey_pem);
}
String GetP7Signature(const String& data, const String& cert_pem, const String& pkey_pem)
{
return GetP7Signature(data, data.GetLength(), cert_pem, pkey_pem);
}
}

3
uppsrc/Core/Util.h
View file

@ -487,3 +487,6 @@ String Replace(const String& s, const Vector<String>& find, const Vector<String
String Replace(const String& s, const VectorMap<String, String>& fr);
WString Replace(const WString& s, const Vector<WString>& find, const Vector<WString>& replace);
WString Replace(const WString& s, const VectorMap<WString, WString>& fr);
String GetP7Signature(const void *data, int length, const String& cert_pem, const String& pkey_pem);
String GetP7Signature(const String& data, const String& cert_pem, const String& pkey_pem);

18
uppsrc/Core/src.tpp/Util$en-us.tpp
View file

@ -49,4 +49,20 @@ pattern is always used (if patterns:replases are `"hell`":`"hello`"
and `"hello`":`"hell`", then replacing within `"hell hello`" produces
`"hello hell`").&]
[s3;%% &]
[s0;%% ]]
[s4; &]
[s5;:Upp`:`:GetP7Signature`(const void`*`,int`,const Upp`:`:String`&`,const Upp`:`:String`&`): [_^Upp`:`:String^ S
tring]_[* GetP7Signature]([@(0.0.255) const]_[@(0.0.255) void]_`*[*@3 data],
[@(0.0.255) int]_[*@3 length], [@(0.0.255) const]_[_^Upp`:`:String^ String][@(0.0.255) `&]_
[*@3 cert`_pem], [@(0.0.255) const]_[_^Upp`:`:String^ String][@(0.0.255) `&]_[*@3 pkey`_pem
])&]
[s5;:Upp`:`:GetP7Signature`(const Upp`:`:String`&`,const Upp`:`:String`&`,const Upp`:`:String`&`): [_^Upp`:`:String^ S
tring]_[* GetP7Signature]([@(0.0.255) const]_[_^Upp`:`:String^ String][@(0.0.255) `&]_[*@3 d
ata], [@(0.0.255) const]_[_^Upp`:`:String^ String][@(0.0.255) `&]_[*@3 cert`_pem],
[@(0.0.255) const]_[_^Upp`:`:String^ String][@(0.0.255) `&]_[*@3 pkey`_pem])&]
[s2;%% Computes P7S signature in binary format of [%-*@3 data] bytes.
[%-*@3 cert`_pem] (X509 public key) and [%-*@3 pkey`_pem] (X509 private
key) should be in [^https`:`/`/en`.wikipedia`.org`/wiki`/Privacy`-enhanced`_Electronic`_Mail`.^ P
EM] format. Requires Core/SSL. Returns signature in binary format
(e.g. needs to be base64 encoded for SMIME emails). Returns Null
in case of error.&]
[s3;%% ]]