[haiku-commits] haiku: hrev46683 - src/kits/network/libnetapi
- From: pulkomandy@xxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Wed, 15 Jan 2014 23:31:54 +0100 (CET)
hrev46683 adds 1 changeset to branch 'master'
old head: 66a7f29f59a4b9a9d014f77aeeb64f27a479200a
new head: 159d1fb69a57dfe50cafdbc9af1b9e99548e24f7
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=159d1fb+%5E66a7f29
----------------------------------------------------------------------------
159d1fb: Style fixes, build fix with OpenSSL disabled.
[ Adrien Destugues <pulkomandy@xxxxxxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev46683
Commit: 159d1fb69a57dfe50cafdbc9af1b9e99548e24f7
URL: http://cgit.haiku-os.org/haiku/commit/?id=159d1fb
Author: Adrien Destugues <pulkomandy@xxxxxxxxxxxxx>
Date: Wed Jan 15 21:36:04 2014 UTC
----------------------------------------------------------------------------
4 files changed, 57 insertions(+), 6 deletions(-)
src/kits/network/libnetapi/Certificate.cpp | 52 +++++++++++++++++++++++++
src/kits/network/libnetapi/FileRequest.cpp | 3 +-
src/kits/network/libnetapi/Jamfile | 5 ++-
src/kits/network/libnetapi/SecureSocket.cpp | 3 +-
----------------------------------------------------------------------------
diff --git a/src/kits/network/libnetapi/Certificate.cpp
b/src/kits/network/libnetapi/Certificate.cpp
index d11f24e..3f711a8 100644
--- a/src/kits/network/libnetapi/Certificate.cpp
+++ b/src/kits/network/libnetapi/Certificate.cpp
@@ -11,6 +11,9 @@
#include "CertificatePrivate.h"
+#ifdef OPENSSL_ENABLED
+
+
static time_t parse_ASN1(ASN1_GENERALIZEDTIME *asn1)
{
// Get the raw string data out of the ASN1 container. It looks like
this:
@@ -103,3 +106,52 @@ BCertificate::Private::Private(X509* data)
: fX509(data)
{
}
+
+#else
+
+
+BCertificate::BCertificate(Private* data)
+{
+}
+
+
+BCertificate::~BCertificate()
+{
+}
+
+
+BString
+BCertificate::String()
+{
+ return BString();
+}
+
+
+bigtime_t
+BCertificate::StartDate()
+{
+ return B_NOT_SUPPORTED;
+}
+
+
+bigtime_t
+BCertificate::ExpirationDate()
+{
+ return B_NOT_SUPPORTED;
+}
+
+
+BString
+BCertificate::Issuer()
+{
+ return BString();
+}
+
+
+BString
+BCertificate::Subject()
+{
+}
+
+
+#endif
diff --git a/src/kits/network/libnetapi/FileRequest.cpp
b/src/kits/network/libnetapi/FileRequest.cpp
index 162af3d..28aa1db 100644
--- a/src/kits/network/libnetapi/FileRequest.cpp
+++ b/src/kits/network/libnetapi/FileRequest.cpp
@@ -43,8 +43,7 @@ status_t
BFileRequest::_ProtocolLoop()
{
BNode node(fUrl.Path().String());
- if (node.IsSymLink())
- {
+ if (node.IsSymLink()) {
// Traverse the symlink and start over
BEntry entry(fUrl.Path().String(), true);
node = BNode(&entry);
diff --git a/src/kits/network/libnetapi/Jamfile
b/src/kits/network/libnetapi/Jamfile
index a5e06de..b91385e 100644
--- a/src/kits/network/libnetapi/Jamfile
+++ b/src/kits/network/libnetapi/Jamfile
@@ -14,10 +14,10 @@ for architectureObject in [ MultiArchSubDirSetup ] {
if [ FIsBuildFeatureEnabled openssl ] {
SubDirC++Flags -DOPENSSL_ENABLED ;
UseBuildFeatureHeaders openssl ;
- sslSources = SSL.cpp Certificate.cpp ;
+ sslSources = SSL.cpp ;
md5Sources = ;
Includes [ FGristFiles $(sslSources) SecureSocket.cpp
- HttpAuthentication.cpp ]
+ HttpAuthentication.cpp Certificate.cpp ]
: [ BuildFeatureAttribute openssl : headers ] ;
# Dependency needed to trigger
downloading/unzipping the package before
# compiling the files.
@@ -37,6 +37,7 @@ for architectureObject in [ MultiArchSubDirSetup ] {
NetDebug.cpp
$(sslSources)
+ Certificate.cpp
NetworkAddress.cpp
NetworkAddressResolver.cpp
diff --git a/src/kits/network/libnetapi/SecureSocket.cpp
b/src/kits/network/libnetapi/SecureSocket.cpp
index 3e9727e..b2979d7 100644
--- a/src/kits/network/libnetapi/SecureSocket.cpp
+++ b/src/kits/network/libnetapi/SecureSocket.cpp
@@ -174,8 +174,7 @@ BSecureSocket::Connect(const BNetworkAddress& peer,
bigtime_t timeout)
TRACE("SSLConnection can't connect\n");
BSocket::Disconnect();
- switch(SSL_get_error(fPrivate->fSSL, sslStatus))
- {
+ switch (SSL_get_error(fPrivate->fSSL, sslStatus)) {
case SSL_ERROR_NONE:
// Shouldn't happen...
return B_NO_ERROR;
Other related posts:
