Move cert/x509 to top level and pem and pbes2 to pubkey.

The `cert` dir was just an artifact of having previously supported
CVC (smartcard cert format), removed a long time ago.

The pem and pbes2 code is directly related to the pubkey code,
in fact the only caller of pbes2 (likely anywhere, not just
in the library) is in pkcs8.cpp

43 files changed, 0 insertions, 0 deletions

diff --git a/src/lib/misc/pbes2/info.txt b/src/lib/pubkey/pbes2/info.txt
index ed88ac3eb..ed88ac3eb 100644
--- a/src/lib/misc/pbes2/info.txt
+++ b/src/lib/pubkey/pbes2/info.txt
diff --git a/src/lib/misc/pbes2/pbes2.cpp b/src/lib/pubkey/pbes2/pbes2.cpp
index c66b293e8..c66b293e8 100644
--- a/src/lib/misc/pbes2/pbes2.cpp
+++ b/src/lib/pubkey/pbes2/pbes2.cpp
diff --git a/src/lib/misc/pbes2/pbes2.h b/src/lib/pubkey/pbes2/pbes2.h
index 7c8c4095d..7c8c4095d 100644
--- a/src/lib/misc/pbes2/pbes2.h
+++ b/src/lib/pubkey/pbes2/pbes2.h
diff --git a/src/lib/misc/pem/info.txt b/src/lib/pubkey/pem/info.txt
index 9340a7cef..9340a7cef 100644
--- a/src/lib/misc/pem/info.txt
+++ b/src/lib/pubkey/pem/info.txt
diff --git a/src/lib/misc/pem/pem.cpp b/src/lib/pubkey/pem/pem.cpp
index 83b48c07b..83b48c07b 100644
--- a/src/lib/misc/pem/pem.cpp
+++ b/src/lib/pubkey/pem/pem.cpp
diff --git a/src/lib/misc/pem/pem.h b/src/lib/pubkey/pem/pem.h
index acbd40a77..acbd40a77 100644
--- a/src/lib/misc/pem/pem.h
+++ b/src/lib/pubkey/pem/pem.h
diff --git a/src/lib/cert/x509/cert_status.h b/src/lib/x509/cert_status.h
index b69bd1832..b69bd1832 100644
--- a/src/lib/cert/x509/cert_status.h
+++ b/src/lib/x509/cert_status.h
diff --git a/src/lib/cert/x509/certstor.cpp b/src/lib/x509/certstor.cpp
index 24cd84de7..24cd84de7 100644
--- a/src/lib/cert/x509/certstor.cpp
+++ b/src/lib/x509/certstor.cpp
diff --git a/src/lib/cert/x509/certstor.h b/src/lib/x509/certstor.h
index 56176739b..56176739b 100644
--- a/src/lib/cert/x509/certstor.h
+++ b/src/lib/x509/certstor.h
diff --git a/src/lib/cert/x509/certstor_sql/certstor_sql.cpp b/src/lib/x509/certstor_sql/certstor_sql.cpp
index dfb8c5d78..dfb8c5d78 100644
--- a/src/lib/cert/x509/certstor_sql/certstor_sql.cpp
+++ b/src/lib/x509/certstor_sql/certstor_sql.cpp
diff --git a/src/lib/cert/x509/certstor_sql/certstor_sql.h b/src/lib/x509/certstor_sql/certstor_sql.h
index 0025884f9..0025884f9 100644
--- a/src/lib/cert/x509/certstor_sql/certstor_sql.h
+++ b/src/lib/x509/certstor_sql/certstor_sql.h
diff --git a/src/lib/cert/x509/certstor_sql/info.txt b/src/lib/x509/certstor_sql/info.txt
index cfdd521a2..cfdd521a2 100644
--- a/src/lib/cert/x509/certstor_sql/info.txt
+++ b/src/lib/x509/certstor_sql/info.txt
diff --git a/src/lib/cert/x509/certstor_sqlite3/certstor_sqlite.cpp b/src/lib/x509/certstor_sqlite3/certstor_sqlite.cpp
index b7c066483..b7c066483 100644
--- a/src/lib/cert/x509/certstor_sqlite3/certstor_sqlite.cpp
+++ b/src/lib/x509/certstor_sqlite3/certstor_sqlite.cpp
diff --git a/src/lib/cert/x509/certstor_sqlite3/certstor_sqlite.h b/src/lib/x509/certstor_sqlite3/certstor_sqlite.h
index d1a1e3d21..d1a1e3d21 100644
--- a/src/lib/cert/x509/certstor_sqlite3/certstor_sqlite.h
+++ b/src/lib/x509/certstor_sqlite3/certstor_sqlite.h
diff --git a/src/lib/cert/x509/certstor_sqlite3/info.txt b/src/lib/x509/certstor_sqlite3/info.txt
index d5e50fc95..d5e50fc95 100644
--- a/src/lib/cert/x509/certstor_sqlite3/info.txt
+++ b/src/lib/x509/certstor_sqlite3/info.txt
diff --git a/src/lib/cert/x509/crl_ent.cpp b/src/lib/x509/crl_ent.cpp
index 7074f0609..7074f0609 100644
--- a/src/lib/cert/x509/crl_ent.cpp
+++ b/src/lib/x509/crl_ent.cpp
diff --git a/src/lib/cert/x509/crl_ent.h b/src/lib/x509/crl_ent.h
index 6600621e5..6600621e5 100644
--- a/src/lib/cert/x509/crl_ent.h
+++ b/src/lib/x509/crl_ent.h
diff --git a/src/lib/cert/x509/info.txt b/src/lib/x509/info.txt
index be1e879c3..be1e879c3 100644
--- a/src/lib/cert/x509/info.txt
+++ b/src/lib/x509/info.txt
diff --git a/src/lib/cert/x509/key_constraint.cpp b/src/lib/x509/key_constraint.cpp
index 30d1cb3b8..30d1cb3b8 100644
--- a/src/lib/cert/x509/key_constraint.cpp
+++ b/src/lib/x509/key_constraint.cpp
diff --git a/src/lib/cert/x509/key_constraint.h b/src/lib/x509/key_constraint.h
index 02c65acec..02c65acec 100644
--- a/src/lib/cert/x509/key_constraint.h
+++ b/src/lib/x509/key_constraint.h
diff --git a/src/lib/cert/x509/name_constraint.cpp b/src/lib/x509/name_constraint.cpp
index e4d69c6ac..e4d69c6ac 100644
--- a/src/lib/cert/x509/name_constraint.cpp
+++ b/src/lib/x509/name_constraint.cpp
diff --git a/src/lib/cert/x509/name_constraint.h b/src/lib/x509/name_constraint.h
index 43d7fcbcb..43d7fcbcb 100644
--- a/src/lib/cert/x509/name_constraint.h
+++ b/src/lib/x509/name_constraint.h
diff --git a/src/lib/cert/x509/ocsp.cpp b/src/lib/x509/ocsp.cpp
index 761c5b436..761c5b436 100644
--- a/src/lib/cert/x509/ocsp.cpp
+++ b/src/lib/x509/ocsp.cpp
diff --git a/src/lib/cert/x509/ocsp.h b/src/lib/x509/ocsp.h
index fe1796984..fe1796984 100644
--- a/src/lib/cert/x509/ocsp.h
+++ b/src/lib/x509/ocsp.h
diff --git a/src/lib/cert/x509/ocsp_types.cpp b/src/lib/x509/ocsp_types.cpp
index d470c2fa1..d470c2fa1 100644
--- a/src/lib/cert/x509/ocsp_types.cpp
+++ b/src/lib/x509/ocsp_types.cpp
diff --git a/src/lib/cert/x509/ocsp_types.h b/src/lib/x509/ocsp_types.h
index 6df8ac17f..6df8ac17f 100644
--- a/src/lib/cert/x509/ocsp_types.h
+++ b/src/lib/x509/ocsp_types.h
diff --git a/src/lib/cert/x509/pkcs10.cpp b/src/lib/x509/pkcs10.cpp
index ccd22454b..ccd22454b 100644
--- a/src/lib/cert/x509/pkcs10.cpp
+++ b/src/lib/x509/pkcs10.cpp
diff --git a/src/lib/cert/x509/pkcs10.h b/src/lib/x509/pkcs10.h
index c7a9ec300..c7a9ec300 100644
--- a/src/lib/cert/x509/pkcs10.h
+++ b/src/lib/x509/pkcs10.h
diff --git a/src/lib/cert/x509/x509_ca.cpp b/src/lib/x509/x509_ca.cpp
index 179d903c4..179d903c4 100644
--- a/src/lib/cert/x509/x509_ca.cpp
+++ b/src/lib/x509/x509_ca.cpp
diff --git a/src/lib/cert/x509/x509_ca.h b/src/lib/x509/x509_ca.h
index c96a709d5..c96a709d5 100644
--- a/src/lib/cert/x509/x509_ca.h
+++ b/src/lib/x509/x509_ca.h
diff --git a/src/lib/cert/x509/x509_crl.cpp b/src/lib/x509/x509_crl.cpp
index 8eb4c01db..8eb4c01db 100644
--- a/src/lib/cert/x509/x509_crl.cpp
+++ b/src/lib/x509/x509_crl.cpp
diff --git a/src/lib/cert/x509/x509_crl.h b/src/lib/x509/x509_crl.h
index e11ea8f48..e11ea8f48 100644
--- a/src/lib/cert/x509/x509_crl.h
+++ b/src/lib/x509/x509_crl.h
diff --git a/src/lib/cert/x509/x509_ext.cpp b/src/lib/x509/x509_ext.cpp
index 23340f784..23340f784 100644
--- a/src/lib/cert/x509/x509_ext.cpp
+++ b/src/lib/x509/x509_ext.cpp
diff --git a/src/lib/cert/x509/x509_ext.h b/src/lib/x509/x509_ext.h
index b1984fa94..b1984fa94 100644
--- a/src/lib/cert/x509/x509_ext.h
+++ b/src/lib/x509/x509_ext.h
diff --git a/src/lib/cert/x509/x509_obj.cpp b/src/lib/x509/x509_obj.cpp
index 3c5d2a9b4..3c5d2a9b4 100644
--- a/src/lib/cert/x509/x509_obj.cpp
+++ b/src/lib/x509/x509_obj.cpp
diff --git a/src/lib/cert/x509/x509_obj.h b/src/lib/x509/x509_obj.h
index 40324775c..40324775c 100644
--- a/src/lib/cert/x509/x509_obj.h
+++ b/src/lib/x509/x509_obj.h
diff --git a/src/lib/cert/x509/x509cert.cpp b/src/lib/x509/x509cert.cpp
index f56495a79..f56495a79 100644
--- a/src/lib/cert/x509/x509cert.cpp
+++ b/src/lib/x509/x509cert.cpp
diff --git a/src/lib/cert/x509/x509cert.h b/src/lib/x509/x509cert.h
index acdba7e02..acdba7e02 100644
--- a/src/lib/cert/x509/x509cert.h
+++ b/src/lib/x509/x509cert.h
diff --git a/src/lib/cert/x509/x509opt.cpp b/src/lib/x509/x509opt.cpp
index 2dd2098fe..2dd2098fe 100644
--- a/src/lib/cert/x509/x509opt.cpp
+++ b/src/lib/x509/x509opt.cpp
diff --git a/src/lib/cert/x509/x509path.cpp b/src/lib/x509/x509path.cpp
index f0b07e5fc..f0b07e5fc 100644
--- a/src/lib/cert/x509/x509path.cpp
+++ b/src/lib/x509/x509path.cpp
diff --git a/src/lib/cert/x509/x509path.h b/src/lib/x509/x509path.h
index f65652e59..f65652e59 100644
--- a/src/lib/cert/x509/x509path.h
+++ b/src/lib/x509/x509path.h
diff --git a/src/lib/cert/x509/x509self.cpp b/src/lib/x509/x509self.cpp
index a59632858..a59632858 100644
--- a/src/lib/cert/x509/x509self.cpp
+++ b/src/lib/x509/x509self.cpp
diff --git a/src/lib/cert/x509/x509self.h b/src/lib/x509/x509self.h
index 401b2eb2f..401b2eb2f 100644
--- a/src/lib/cert/x509/x509self.h
+++ b/src/lib/x509/x509self.h