2 files changed, 13 insertions, 1 deletions
diff --git a/xen/crypto/rijndael.c b/xen/crypto/rijndael.c
index f7496187d3..b7cd0d1acd 100644
--- a/xen/crypto/rijndael.c
+++ b/xen/crypto/rijndael.c
@@ -806,6 +806,8 @@ rijndaelKeySetupEnc(u32 rk[/*4*(Nr + 1)*/], const u8 cipherKey[], int keyBits)
 	return 0;
 }
 
+#ifdef NEED_RIJNDAEL_DECRYPT
+
 /**
  * Expand the cipher key into the decryption key schedule.
  *
@@ -854,6 +856,8 @@ rijndaelKeySetupDec(u32 rk[/*4*(Nr + 1)*/], const u8 cipherKey[], int keyBits)
 	return Nr;
 }
 
+#endif /* NEED_RIJNDAEL_DECRYPT */
+
 void
 rijndaelEncrypt(const u32 rk[/*4*(Nr + 1)*/], int Nr, const u8 pt[16],
     u8 ct[16])
@@ -1038,6 +1042,8 @@ rijndaelEncrypt(const u32 rk[/*4*(Nr + 1)*/], int Nr, const u8 pt[16],
 	PUTU32(ct + 12, s3);
 }
 
+#ifdef NEED_RIJNDAEL_DECRYPT
+
 static void
 rijndaelDecrypt(const u32 rk[/*4*(Nr + 1)*/], int Nr, const u8 ct[16],
     u8 pt[16])
@@ -1222,6 +1228,10 @@ rijndaelDecrypt(const u32 rk[/*4*(Nr + 1)*/], int Nr, const u8 ct[16],
 	PUTU32(pt + 12, s3);
 }
 
+#endif /* NEED_RIJNDAEL_DECRYPT */
+
+#ifdef NEED_RIJNDAEL_WRAPPERS
+
 /* setup key context for encryption only */
 int
 rijndael_set_key_enc_only(rijndael_ctx *ctx, const u_char *key, int bits)
@@ -1267,3 +1277,5 @@ rijndael_encrypt(rijndael_ctx *ctx, const u_char *src, u_char *dst)
 {
 	rijndaelEncrypt(ctx->ek, ctx->Nr, src, dst);
 }
+
+#endif /* NEED_RIJNDAEL_WRAPPERS */
diff --git a/xen/crypto/vmac.c b/xen/crypto/vmac.c
index 1e9bafa0ba..8f2f3727b1 100644
--- a/xen/crypto/vmac.c
+++ b/xen/crypto/vmac.c
@@ -722,7 +722,7 @@ static void poly_step_func(uint64_t *ahi, uint64_t *alo, const uint64_t *kh,
 
 /* ----------------------------------------------------------------------- */
 
-void vhash_abort(vmac_ctx_t *ctx)
+static void vhash_abort(vmac_ctx_t *ctx)
 {
     ctx->polytmp[0] = ctx->polykey[0] ;
     ctx->polytmp[1] = ctx->polykey[1] ;