lib: rsa: Remove #ifdefs from rsa.h

It is no longer necessary to implement rsa_() functions as no-ops
depending on config options. It is merely sufficient to provide the
prototypes, as the rsa code is no longer linked when unused.

Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/include/u-boot/rsa.h b/include/u-boot/rsa.h
index bc564d56fa30673ee3ec66caba8d5817be94f2af..89a9c4caa0a0156f5605c95d2b8cd89c775d756b 100644 (file)
--- a/include/u-boot/rsa.h
+++ b/include/u-boot/rsa.h
@@ -31,7 +31,6 @@ struct rsa_public_key {
 
 struct image_sign_info;
 
-#if IMAGE_ENABLE_SIGN
 /**
  * sign() - calculate and return signature for given input data
  *
@@ -66,22 +65,7 @@ int rsa_sign(struct image_sign_info *info,
                other -ve value on error
 */
 int rsa_add_verify_data(struct image_sign_info *info, void *keydest);
-#else
-static inline int rsa_sign(struct image_sign_info *info,
-               const struct image_region region[], int region_count,
-               uint8_t **sigp, uint *sig_len)
-{
-       return -ENXIO;
-}
-
-static inline int rsa_add_verify_data(struct image_sign_info *info,
-                                     void *keydest)
-{
-       return -ENXIO;
-}
-#endif
 
-#if IMAGE_ENABLE_VERIFY
 /**
  * rsa_verify_hash() - Verify a signature against a hash
  *
@@ -124,37 +108,6 @@ int padding_pss_verify(struct image_sign_info *info,
                       uint8_t *msg, int msg_len,
                       const uint8_t *hash, int hash_len);
 #endif /* CONFIG_FIT_RSASSA_PSS */
-#else
-static inline int rsa_verify_hash(struct image_sign_info *info,
-                                 const uint8_t *hash,
-                                 uint8_t *sig, uint sig_len)
-{
-       return -ENXIO;
-}
-
-static inline int rsa_verify(struct image_sign_info *info,
-               const struct image_region region[], int region_count,
-               uint8_t *sig, uint sig_len)
-{
-       return -ENXIO;
-}
-
-static inline int padding_pkcs_15_verify(struct image_sign_info *info,
-                                        uint8_t *msg, int msg_len,
-                                        const uint8_t *hash, int hash_len)
-{
-       return -ENXIO;
-}
-
-#ifdef CONFIG_FIT_RSASSA_PSS
-static inline int padding_pss_verify(struct image_sign_info *info,
-                                    uint8_t *msg, int msg_len,
-                                    const uint8_t *hash, int hash_len)
-{
-       return -ENXIO;
-}
-#endif /* CONFIG_FIT_RSASSA_PSS */
-#endif
 
 #define RSA_DEFAULT_PADDING_NAME               "pkcs-1.5"