Move more of the public key implementation code out of the shared pk/pubkey

directory and into algorithm specific modules.

Even now, disabling a public key algorithm does leave some 'residual' code,
but much less than before.

Mark if_algo to only load if needed (if RW or RSA is loaded). However there seems
to be a bug in the dependency handling in configure.pl - even if rsa and rw
are disabled with --disable-modules, if_algo continues to be built. Will
have to look at this later.

19 files changed, 13 insertions, 13 deletions

diff --git a/src/pk/pubkey/dh_core.cpp b/src/pk/dh/dh_core.cpp
index a0586c444..a0586c444 100644
--- a/src/pk/pubkey/dh_core.cpp
+++ b/src/pk/dh/dh_core.cpp
diff --git a/src/pk/pubkey/dh_core.h b/src/pk/dh/dh_core.h
index 3735f31e1..3735f31e1 100644
--- a/src/pk/pubkey/dh_core.h
+++ b/src/pk/dh/dh_core.h
diff --git a/src/pk/dh/info.txt b/src/pk/dh/info.txt
index 34e77ddb8..3765644c8 100644
--- a/src/pk/dh/info.txt
+++ b/src/pk/dh/info.txt
@@ -7,6 +7,8 @@ load_on auto
 <add>
 dh.cpp
 dh.h
+dh_core.cpp
+dh_core.h
 </add>
 
 <requires>
diff --git a/src/pk/pubkey/dsa_core.cpp b/src/pk/dsa/dsa_core.cpp
index aba1e61fb..aba1e61fb 100644
--- a/src/pk/pubkey/dsa_core.cpp
+++ b/src/pk/dsa/dsa_core.cpp
diff --git a/src/pk/pubkey/dsa_core.h b/src/pk/dsa/dsa_core.h
index 467f3c23f..467f3c23f 100644
--- a/src/pk/pubkey/dsa_core.h
+++ b/src/pk/dsa/dsa_core.h
diff --git a/src/pk/dsa/info.txt b/src/pk/dsa/info.txt
index 74cd08144..e98f33ca9 100644
--- a/src/pk/dsa/info.txt
+++ b/src/pk/dsa/info.txt
@@ -7,6 +7,8 @@ load_on auto
 <add>
 dsa.cpp
 dsa.h
+dsa_core.cpp
+dsa_core.h
 </add>
 
 <requires>
diff --git a/src/pk/pubkey/ecc_core.cpp b/src/pk/ecdsa/ecc_core.cpp
index 8d1d48b49..8d1d48b49 100644
--- a/src/pk/pubkey/ecc_core.cpp
+++ b/src/pk/ecdsa/ecc_core.cpp
diff --git a/src/pk/pubkey/ecc_core.h b/src/pk/ecdsa/ecc_core.h
index 1124eaa2f..1124eaa2f 100644
--- a/src/pk/pubkey/ecc_core.h
+++ b/src/pk/ecdsa/ecc_core.h
diff --git a/src/pk/ecdsa/info.txt b/src/pk/ecdsa/info.txt
index 19891d52b..699c62214 100644
--- a/src/pk/ecdsa/info.txt
+++ b/src/pk/ecdsa/info.txt
@@ -7,6 +7,8 @@ load_on auto
 <add>
 ec.cpp
 ec.h
+ecc_core.cpp
+ecc_core.h
 ecdsa.cpp
 ecdsa.h
 </add>
diff --git a/src/pk/pubkey/elg_core.cpp b/src/pk/elgamal/elg_core.cpp
index 1181e7534..1181e7534 100644
--- a/src/pk/pubkey/elg_core.cpp
+++ b/src/pk/elgamal/elg_core.cpp
diff --git a/src/pk/pubkey/elg_core.h b/src/pk/elgamal/elg_core.h
index 67966a452..67966a452 100644
--- a/src/pk/pubkey/elg_core.h
+++ b/src/pk/elgamal/elg_core.h
diff --git a/src/pk/elgamal/info.txt b/src/pk/elgamal/info.txt
index 541c7905e..96586480b 100644
--- a/src/pk/elgamal/info.txt
+++ b/src/pk/elgamal/info.txt
@@ -7,6 +7,8 @@ load_on auto
 <add>
 elgamal.cpp
 elgamal.h
+elg_core.cpp
+elg_core.h
 </add>
 
 <requires>
diff --git a/src/pk/pubkey/if_core.cpp b/src/pk/if_algo/if_core.cpp
index 97cacf9d8..97cacf9d8 100644
--- a/src/pk/pubkey/if_core.cpp
+++ b/src/pk/if_algo/if_core.cpp
diff --git a/src/pk/pubkey/if_core.h b/src/pk/if_algo/if_core.h
index b6afad950..b6afad950 100644
--- a/src/pk/pubkey/if_core.h
+++ b/src/pk/if_algo/if_core.h
diff --git a/src/pk/if_algo/info.txt b/src/pk/if_algo/info.txt
index e8d582c00..af1726414 100644
--- a/src/pk/if_algo/info.txt
+++ b/src/pk/if_algo/info.txt
@@ -2,11 +2,13 @@ realname "Integer Factorization Algorithms"
 
 define IF_PUBLIC_KEY_FAMILY
 
-load_on auto
+load_on required
 
 <add>
 if_algo.cpp
 if_algo.h
+if_core.cpp
+if_core.h
 </add>
 
 <requires>
diff --git a/src/pk/nr/info.txt b/src/pk/nr/info.txt
index 4032a9825..f7325d984 100644
--- a/src/pk/nr/info.txt
+++ b/src/pk/nr/info.txt
@@ -7,6 +7,8 @@ load_on auto
 <add>
 nr.cpp
 nr.h
+nr_core.cpp
+nr_core.h
 </add>
 
 <requires>
diff --git a/src/pk/pubkey/nr_core.cpp b/src/pk/nr/nr_core.cpp
index f9dfa4024..f9dfa4024 100644
--- a/src/pk/pubkey/nr_core.cpp
+++ b/src/pk/nr/nr_core.cpp
diff --git a/src/pk/pubkey/nr_core.h b/src/pk/nr/nr_core.h
index 416e31619..416e31619 100644
--- a/src/pk/pubkey/nr_core.h
+++ b/src/pk/nr/nr_core.h
diff --git a/src/pk/pubkey/info.txt b/src/pk/pubkey/info.txt
index 1c58c0e89..8c97aa744 100644
--- a/src/pk/pubkey/info.txt
+++ b/src/pk/pubkey/info.txt
@@ -11,21 +11,9 @@ asn1
 </requires>
 
 <add>
-dh_core.cpp
-dh_core.h
 dh_op.cpp
-dsa_core.cpp
-dsa_core.h
 dsa_op.cpp
-ecc_core.cpp
-ecc_core.h
-elg_core.cpp
-elg_core.h
 elg_op.cpp
-if_core.cpp
-if_core.h
-nr_core.cpp
-nr_core.h
 nr_op.cpp
 pk_algs.cpp
 pk_algs.h