SunnyQjm/ndn-cxx
1
0 Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

security: dissolve private header security/impl/openssl.hpp

Browse Source 
It no longer serves a purpose

Change-Id: Ic145460c139dbda969976644352fed3f44fd32ec
This commit is contained in:
Davide Pesavento committed 2022-06-13 21:47:23 -04:00
1 parent 58de07ae20
commit 80d671f996
23 files changed
+53 -75
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ndn-cxx/impl/common-pch.hpp
+1 -2
View File
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
* Copyright (c) 2013-2021 Regents of the University of California.
* Copyright (c) 2013-2022 Regents of the University of California.
*
* This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
*
@@ -26,7 +26,6 @@
// and included before anything else
#include "ndn-cxx/detail/common.hpp"
#include "ndn-cxx/security/impl/openssl.hpp"
// STL headers to precompile
#include <atomic>
ndn-cxx/security/impl/openssl-helper.hpp
+3 -1
View File
@@ -22,9 +22,11 @@
#ifndef NDN_CXX_SECURITY_IMPL_OPENSSL_HELPER_HPP
#define NDN_CXX_SECURITY_IMPL_OPENSSL_HELPER_HPP
#include "ndn-cxx/security/impl/openssl.hpp"
#include "ndn-cxx/security/security-common.hpp"
#include <openssl/bio.h>
#include <openssl/evp.h>
namespace ndn {
namespace security {
namespace detail {
ndn-cxx/security/impl/openssl.hpp
-45
View File
@@ -1,45 +0,0 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
* Copyright (c) 2013-2021 Regents of the University of California.
*
* This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
*
* ndn-cxx library is free software: you can redistribute it and/or modify it under the
* terms of the GNU Lesser General Public License as published by the Free Software
* Foundation, either version 3 of the License, or (at your option) any later version.
*
* ndn-cxx library is distributed in the hope that it will be useful, but WITHOUT ANY
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
*
* You should have received copies of the GNU General Public License and GNU Lesser
* General Public License along with ndn-cxx, e.g., in COPYING.md file. If not, see
* <http://www.gnu.org/licenses/>.
*
* See AUTHORS.md for complete list of ndn-cxx authors and contributors.
*/
#ifndef NDN_CXX_SECURITY_IMPL_OPENSSL_HPP
#define NDN_CXX_SECURITY_IMPL_OPENSSL_HPP
// suppress deprecation warnings on macOS >= 10.7
#if defined(__APPLE__) && defined(__clang__)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
#endif
#include <openssl/bio.h>
#include <openssl/crypto.h>
#include <openssl/ec.h>
#include <openssl/err.h>
#include <openssl/evp.h>
#include <openssl/pem.h>
#include <openssl/rand.h>
#include <openssl/rsa.h>
#include <openssl/x509.h>
#if defined(__APPLE__) && defined(__clang__)
#pragma clang diagnostic pop
#endif
#endif // NDN_CXX_SECURITY_IMPL_OPENSSL_HPP
ndn-cxx/security/transform/base64-decode.cpp
+4 -2
View File
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
* Copyright (c) 2013-2021 Regents of the University of California.
* Copyright (c) 2013-2022 Regents of the University of California.
*
* This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
*
@@ -20,7 +20,9 @@
*/
#include "ndn-cxx/security/transform/base64-decode.hpp"
#include "ndn-cxx/security/impl/openssl.hpp"
#include <openssl/bio.h>
#include <openssl/evp.h>
namespace ndn {
namespace security {
ndn-cxx/security/transform/base64-encode.cpp
+4 -2
View File
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
* Copyright (c) 2013-2021 Regents of the University of California.
* Copyright (c) 2013-2022 Regents of the University of California.
*
* This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
*
@@ -20,7 +20,9 @@
*/
#include "ndn-cxx/security/transform/base64-encode.hpp"
#include "ndn-cxx/security/impl/openssl.hpp"
#include <openssl/bio.h>
#include <openssl/evp.h>
namespace ndn {
namespace security {
ndn-cxx/security/transform/block-cipher.cpp
+3 -1
View File
@@ -20,7 +20,9 @@
*/
#include "ndn-cxx/security/transform/block-cipher.hpp"
#include "ndn-cxx/security/impl/openssl.hpp"
#include <openssl/bio.h>
#include <openssl/evp.h>
#include <boost/lexical_cast.hpp>
ndn-cxx/security/transform/private-key.cpp
+5
View File
@@ -37,6 +37,11 @@
#include <boost/lexical_cast.hpp>
#include <cstring>
#include <openssl/ec.h>
#include <openssl/pem.h>
#include <openssl/rsa.h>
#include <openssl/x509.h>
#define ENSURE_PRIVATE_KEY_LOADED(key) \
do { \
if ((key) == nullptr) \
ndn-cxx/security/transform/public-key.cpp
+3
View File
@@ -28,6 +28,9 @@
#include "ndn-cxx/security/impl/openssl-helper.hpp"
#include "ndn-cxx/encoding/buffer-stream.hpp"
#include <openssl/rsa.h>
#include <openssl/x509.h>
#define ENSURE_PUBLIC_KEY_LOADED(key) \
do { \
if ((key) == nullptr) \
ndn-cxx/security/verification-helpers.cpp
+2 -1
View File
@@ -25,7 +25,6 @@
#include "ndn-cxx/encoding/buffer-stream.hpp"
#include "ndn-cxx/interest.hpp"
#include "ndn-cxx/security/certificate.hpp"
#include "ndn-cxx/security/impl/openssl.hpp"
#include "ndn-cxx/security/pib/key.hpp"
#include "ndn-cxx/security/tpm/tpm.hpp"
#include "ndn-cxx/security/transform/bool-sink.hpp"
@@ -35,6 +34,8 @@
#include "ndn-cxx/security/transform/stream-sink.hpp"
#include "ndn-cxx/security/transform/verifier-filter.hpp"
#include <openssl/crypto.h>
namespace ndn {
namespace security {
ndn-cxx/util/random.cpp
+4 -2
View File
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
* Copyright (c) 2013-2021 Regents of the University of California.
* Copyright (c) 2013-2022 Regents of the University of California.
*
* This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
*
@@ -20,7 +20,9 @@
*/
#include "ndn-cxx/util/random.hpp"
#include "ndn-cxx/security/impl/openssl.hpp"
#include <openssl/err.h>
#include <openssl/rand.h>
namespace ndn {
namespace random {
ndn-cxx/util/sha256.cpp
+2 -1
View File
@@ -21,11 +21,12 @@
#include "ndn-cxx/util/sha256.hpp"
#include "ndn-cxx/util/string-helper.hpp"
#include "ndn-cxx/security/impl/openssl.hpp"
#include "ndn-cxx/security/transform/digest-filter.hpp"
#include "ndn-cxx/security/transform/stream-sink.hpp"
#include "ndn-cxx/security/transform/stream-source.hpp"
#include <openssl/crypto.h>
namespace ndn {
namespace util {
tests/unit/security/key-chain.t.cpp
+1 -1
View File
@@ -20,7 +20,6 @@
*/
#include "ndn-cxx/security/key-chain.hpp"
#include "ndn-cxx/security/impl/openssl.hpp"
#include "ndn-cxx/security/transform/private-key.hpp"
#include "ndn-cxx/security/verification-helpers.hpp"
@@ -29,6 +28,7 @@
#include "tests/unit/clock-fixture.hpp"
#include "tests/unit/test-home-env-saver.hpp"
#include <openssl/opensslv.h>
#include <boost/mpl/vector.hpp>
namespace ndn {
tests/unit/security/signing-info.t.cpp
+2 -2
View File
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
* Copyright (c) 2013-2021 Regents of the University of California.
* Copyright (c) 2013-2022 Regents of the University of California.
*
* This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
*
@@ -20,10 +20,10 @@
*/
#include "ndn-cxx/security/signing-info.hpp"
#include "ndn-cxx/security/impl/openssl.hpp"
#include "tests/boost-test.hpp"
#include <openssl/opensslv.h>
#include <boost/lexical_cast.hpp>
#include <sstream>
tests/unit/security/tpm/back-end.t.cpp
+1 -1
View File
@@ -22,7 +22,6 @@
#include "ndn-cxx/security/tpm/back-end.hpp"
#include "ndn-cxx/encoding/buffer-stream.hpp"
#include "ndn-cxx/security/impl/openssl.hpp"
#include "ndn-cxx/security/pib/key.hpp"
#include "ndn-cxx/security/transform/bool-sink.hpp"
#include "ndn-cxx/security/transform/buffer-source.hpp"
@@ -38,6 +37,7 @@
#include "tests/boost-test.hpp"
#include <openssl/opensslv.h>
#include <boost/mpl/vector.hpp>
#include <set>
tests/unit/security/transform/digest-filter.t.cpp
+2 -1
View File
@@ -22,13 +22,14 @@
#include "ndn-cxx/security/transform/digest-filter.hpp"
#include "ndn-cxx/encoding/buffer-stream.hpp"
#include "ndn-cxx/security/impl/openssl.hpp"
#include "ndn-cxx/security/transform/buffer-source.hpp"
#include "ndn-cxx/security/transform/step-source.hpp"
#include "ndn-cxx/security/transform/stream-sink.hpp"
#include "tests/boost-test.hpp"
#include <openssl/evp.h>
namespace ndn {
namespace security {
namespace transform {
tests/unit/security/transform/private-key.t.cpp
+1 -2
View File
@@ -22,7 +22,6 @@
#include "ndn-cxx/security/transform/private-key.hpp"
#include "ndn-cxx/encoding/buffer-stream.hpp"
#include "ndn-cxx/security/impl/openssl.hpp"
#include "ndn-cxx/security/key-params.hpp"
#include "ndn-cxx/security/transform/base64-decode.hpp"
#include "ndn-cxx/security/transform/bool-sink.hpp"
@@ -35,8 +34,8 @@
#include "tests/boost-test.hpp"
#include <openssl/opensslv.h>
#include <boost/mpl/vector.hpp>
#include <sstream>
namespace ndn {
tests/unit/security/transform/verifier-filter.t.cpp
+2 -1
View File
@@ -22,7 +22,6 @@
#include "ndn-cxx/security/transform/verifier-filter.hpp"
#include "ndn-cxx/encoding/buffer-stream.hpp"
#include "ndn-cxx/security/impl/openssl.hpp"
#include "ndn-cxx/security/key-params.hpp"
#include "ndn-cxx/security/transform/base64-decode.hpp"
#include "ndn-cxx/security/transform/bool-sink.hpp"
@@ -34,6 +33,8 @@
#include "tests/boost-test.hpp"
#include <openssl/opensslv.h>
namespace ndn {
namespace security {
namespace transform {
tests/unit/security/verification-helpers.t.cpp
+1 -1
View File
@@ -20,13 +20,13 @@
*/
#include "ndn-cxx/security/verification-helpers.hpp"
#include "ndn-cxx/security/impl/openssl.hpp"
#include "ndn-cxx/security/transform/public-key.hpp"
// #include "ndn-cxx/util/string-helper.hpp"
#include "tests/key-chain-fixture.hpp"
#include "tests/test-common.hpp"
#include <openssl/opensslv.h>
#include <boost/mpl/vector.hpp>
namespace ndn {
tests/unit/util/random.t.cpp
+2 -1
View File
@@ -20,10 +20,11 @@
*/
#include "ndn-cxx/util/random.hpp"
#include "ndn-cxx/security/impl/openssl.hpp"
#include "tests/boost-test.hpp"
#include <openssl/rand.h>
#include <array>
#include <thread>
tools/ndnsec/export.cpp
+3 -2
View File
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
* Copyright (c) 2013-2021 Regents of the University of California.
* Copyright (c) 2013-2022 Regents of the University of California.
*
* This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
*
@@ -22,9 +22,10 @@
#include "ndnsec.hpp"
#include "util.hpp"
#include "ndn-cxx/security/impl/openssl.hpp"
#include "ndn-cxx/util/scope.hpp"
#include <openssl/crypto.h>
namespace ndn {
namespace ndnsec {
tools/ndnsec/import.cpp
+3 -2
View File
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
* Copyright (c) 2013-2021 Regents of the University of California.
* Copyright (c) 2013-2022 Regents of the University of California.
*
* This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
*
@@ -22,9 +22,10 @@
#include "ndnsec.hpp"
#include "util.hpp"
#include "ndn-cxx/security/impl/openssl.hpp"
#include "ndn-cxx/util/scope.hpp"
#include <openssl/crypto.h>
namespace ndn {
namespace ndnsec {
tools/ndnsec/unlock-tpm.cpp
+2 -2
View File
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
* Copyright (c) 2013-2021 Regents of the University of California.
* Copyright (c) 2013-2022 Regents of the University of California.
*
* This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
*
@@ -22,7 +22,7 @@
#include "ndnsec.hpp"
#include "util.hpp"
#include "ndn-cxx/security/impl/openssl.hpp"
#include <openssl/crypto.h>
#include <cerrno>
#include <cstring>
tools/ndnsec/util.cpp
+2 -2
View File
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
* Copyright (c) 2013-2021 Regents of the University of California.
* Copyright (c) 2013-2022 Regents of the University of California.
*
* This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
*
@@ -21,7 +21,7 @@
#include "util.hpp"
#include "ndn-cxx/security/impl/openssl.hpp"
#include <openssl/crypto.h>
#include <unistd.h>