Skip to content

Commit

Permalink
cut calls to legacy no-op folly::ssl::init
Browse files Browse the repository at this point in the history
Summary: The current requirement is openssl >= v1.1.0, which automatically initializes itself. Given this requirement, the folly routines to initialize openssl are now no-ops and legacy. Cut calls to them.

Reviewed By: Filip-F

Differential Revision: D55020932

fbshipit-source-id: 7b7de9e0b91148cfbf01bb2510ed754f7f204693
  • Loading branch information
yfeldblum authored and facebook-github-bot committed Mar 25, 2024
1 parent 5787aa9 commit edd804b
Show file tree
Hide file tree
Showing 5 changed files with 0 additions and 15 deletions.
4 changes: 0 additions & 4 deletions thrift/lib/py3/ssl.pxd
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,6 @@ from thrift.py3.client cimport cRequestChannel_ptr, ClientType
from thrift.py3.common cimport Protocol


cdef extern from "folly/ssl/Init.h" namespace "folly::ssl" nogil:
void init()


cdef extern from "folly/io/async/SSLContext.h":
cdef cppclass cSSLVersion "folly::SSLContext::SSLVersion":
bint operator==(cSSLVersion&)
Expand Down
3 changes: 0 additions & 3 deletions thrift/lib/py3/ssl.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,6 @@ from enum import Enum
import os


init() # folly::ssl::init()


class SSLVersion(Enum):
TLSv1_2 = <int> (cTLSv1_2)

Expand Down
4 changes: 0 additions & 4 deletions thrift/lib/python/client/ssl.pxd
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,6 @@ from thrift.python.client.request_channel cimport cRequestChannel_ptr, ClientTyp
from thrift.python.serializer cimport Protocol as cProtocol


cdef extern from "folly/ssl/Init.h" namespace "folly::ssl" nogil:
void init()


cdef extern from "folly/io/async/SSLContext.h":
cdef cppclass cSSLVersion "folly::SSLContext::SSLVersion":
bint operator==(cSSLVersion&)
Expand Down
3 changes: 0 additions & 3 deletions thrift/lib/python/client/ssl.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,6 @@ from libcpp.memory cimport make_shared
from libcpp.utility cimport move as cmove


init() # folly::ssl::init()


class SSLVersion(Enum):
TLSv1_2 = <int> (cTLSv1_2)

Expand Down
1 change: 0 additions & 1 deletion thrift/perf/cpp/Cpp2Server.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
#include <folly/Random.h>
#include <folly/String.h>
#include <folly/init/Init.h>
#include <folly/ssl/Init.h>

#include <thrift/lib/cpp2/server/ThriftServer.h>
#include <thrift/perf/cpp/AsyncLoadHandler2.h>
Expand Down

0 comments on commit edd804b

Please sign in to comment.