Remove dead code in connection context store
Summary: ^ It was used by rsocket. Reviewed By: fabiomassimo Differential Revision: D36246038 fbshipit-source-id: 8bdc77d9e1ecf22402436e0102b5522ed36aff27
This commit is contained in:
committed by
Facebook GitHub Bot
parent
63dde6e5cf
commit
216c926ca5
@@ -80,20 +80,6 @@ std::string ConnectionContextStore::getCertificateSigningRequest() {
|
|||||||
return csr;
|
return csr;
|
||||||
}
|
}
|
||||||
|
|
||||||
std::shared_ptr<folly::SSLContext> ConnectionContextStore::getSSLContext() {
|
|
||||||
std::shared_ptr<folly::SSLContext> sslContext =
|
|
||||||
std::make_shared<folly::SSLContext>();
|
|
||||||
sslContext->loadTrustedCertificates(
|
|
||||||
absoluteFilePath(FLIPPER_CA_FILE_NAME).c_str());
|
|
||||||
sslContext->setVerificationOption(
|
|
||||||
folly::SSLContext::SSLVerifyPeerEnum::VERIFY);
|
|
||||||
sslContext->loadCertKeyPairFromFiles(
|
|
||||||
absoluteFilePath(CLIENT_CERT_FILE_NAME).c_str(),
|
|
||||||
absoluteFilePath(PRIVATE_KEY_FILE).c_str());
|
|
||||||
sslContext->authenticate(true, false);
|
|
||||||
return sslContext;
|
|
||||||
}
|
|
||||||
|
|
||||||
std::string ConnectionContextStore::getDeviceId() {
|
std::string ConnectionContextStore::getDeviceId() {
|
||||||
/* On android we can't reliably get the serial of the current device
|
/* On android we can't reliably get the serial of the current device
|
||||||
So rely on our locally written config, which is provided by the
|
So rely on our locally written config, which is provided by the
|
||||||
|
|||||||
@@ -9,7 +9,6 @@
|
|||||||
|
|
||||||
#include <folly/Optional.h>
|
#include <folly/Optional.h>
|
||||||
#include <folly/dynamic.h>
|
#include <folly/dynamic.h>
|
||||||
#include <folly/io/async/SSLContext.h>
|
|
||||||
#include <string>
|
#include <string>
|
||||||
#include "FlipperCertificateExchangeMedium.h"
|
#include "FlipperCertificateExchangeMedium.h"
|
||||||
#include "FlipperInitConfig.h"
|
#include "FlipperInitConfig.h"
|
||||||
@@ -30,7 +29,6 @@ class ConnectionContextStore {
|
|||||||
ConnectionContextStore(DeviceData deviceData);
|
ConnectionContextStore(DeviceData deviceData);
|
||||||
bool hasRequiredFiles();
|
bool hasRequiredFiles();
|
||||||
std::string getCertificateSigningRequest();
|
std::string getCertificateSigningRequest();
|
||||||
std::shared_ptr<folly::SSLContext> getSSLContext();
|
|
||||||
std::string getCertificateDirectoryPath();
|
std::string getCertificateDirectoryPath();
|
||||||
std::string getCACertificatePath();
|
std::string getCACertificatePath();
|
||||||
std::string getDeviceId();
|
std::string getDeviceId();
|
||||||
|
|||||||
@@ -20,9 +20,6 @@ class ConnectionContextStoreMock : public ConnectionContextStore {
|
|||||||
std::string createCertificateSigningRequest() {
|
std::string createCertificateSigningRequest() {
|
||||||
return "thisIsACsr";
|
return "thisIsACsr";
|
||||||
}
|
}
|
||||||
std::shared_ptr<folly::SSLContext> getSSLContext() {
|
|
||||||
return nullptr;
|
|
||||||
}
|
|
||||||
folly::dynamic getConnectionConfig() {
|
folly::dynamic getConnectionConfig() {
|
||||||
return nullptr;
|
return nullptr;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user