From 66e62915d2565013458b83218e489a1f2aa6ab82 Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Thu, 22 Apr 2021 17:57:56 +0100
Subject: [PATCH] Move a few stray header files into the crypto subdir.

sshblowf.h (as was) is 100% internal to that directory. And mpint_i.h
and ecc.h are specialist enough that it's reasonable to ask clients
outside the crypto directory to include them with a subdirectory path,
to hint that it's an unusual thing to be doing.
---
 crypto/bcrypt.c                 | 2 +-
 crypto/blowfish.c               | 2 +-
 sshblowf.h => crypto/blowfish.h | 0
 ecc.h => crypto/ecc.h           | 0
 mpint_i.h => crypto/mpint_i.h   | 0
 mpunsafe.c                      | 2 +-
 testcrypt.c                     | 2 +-
 testsc.c                        | 2 +-
 8 files changed, 5 insertions(+), 5 deletions(-)
 rename sshblowf.h => crypto/blowfish.h (100%)
 rename ecc.h => crypto/ecc.h (100%)
 rename mpint_i.h => crypto/mpint_i.h (100%)

diff --git a/crypto/bcrypt.c b/crypto/bcrypt.c
index 7cdd44ed..2b29b037 100644
--- a/crypto/bcrypt.c
+++ b/crypto/bcrypt.c
@@ -9,7 +9,7 @@
 #include <stddef.h>
 #include <string.h>
 #include "ssh.h"
-#include "sshblowf.h"
+#include "blowfish.h"
 
 BlowfishContext *bcrypt_setup(const unsigned char *key, int keybytes,
                               const unsigned char *salt, int saltbytes)
diff --git a/crypto/blowfish.c b/crypto/blowfish.c
index c74f06c0..e8886898 100644
--- a/crypto/blowfish.c
+++ b/crypto/blowfish.c
@@ -7,7 +7,7 @@
 #include <assert.h>
 #include <stdio.h>
 #include "ssh.h"
-#include "sshblowf.h"
+#include "blowfish.h"
 
 struct BlowfishContext {
     uint32_t S0[256], S1[256], S2[256], S3[256], P[18];
diff --git a/sshblowf.h b/crypto/blowfish.h
similarity index 100%
rename from sshblowf.h
rename to crypto/blowfish.h
diff --git a/ecc.h b/crypto/ecc.h
similarity index 100%
rename from ecc.h
rename to crypto/ecc.h
diff --git a/mpint_i.h b/crypto/mpint_i.h
similarity index 100%
rename from mpint_i.h
rename to crypto/mpint_i.h
diff --git a/mpunsafe.c b/mpunsafe.c
index beec13fa..a6130018 100644
--- a/mpunsafe.c
+++ b/mpunsafe.c
@@ -7,7 +7,7 @@
 #include "puttymem.h"
 
 #include "mpint.h"
-#include "mpint_i.h"
+#include "crypto/mpint_i.h"
 
 /*
  * This global symbol is also defined in ssh2kex-client.c, to ensure
diff --git a/testcrypt.c b/testcrypt.c
index 1948da08..a370a667 100644
--- a/testcrypt.c
+++ b/testcrypt.c
@@ -34,7 +34,7 @@
 #include "sshkeygen.h"
 #include "misc.h"
 #include "mpint.h"
-#include "ecc.h"
+#include "crypto/ecc.h"
 
 static NORETURN PRINTF_LIKE(1, 2) void fatal_error(const char *p, ...)
 {
diff --git a/testsc.c b/testsc.c
index b182d382..a3e8b5d0 100644
--- a/testsc.c
+++ b/testsc.c
@@ -79,7 +79,7 @@
 #include "ssh.h"
 #include "misc.h"
 #include "mpint.h"
-#include "ecc.h"
+#include "crypto/ecc.h"
 
 static NORETURN PRINTF_LIKE(1, 2) void fatal_error(const char *p, ...)
 {