Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security

Pull security subsystem updates from James Morris:
 "Nothing groundbreaking for this kernel, just cleanups and fixes, and a
  couple of Smack enhancements."

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: (21 commits)
  Smack: Maintainer Record
  Smack: don't show empty rules when /smack/load or /smack/load2 is read
  Smack: user access check bounds
  Smack: onlycap limits on CAP_MAC_ADMIN
  Smack: fix smack_new_inode bogosities
  ima: audit is compiled only when enabled
  ima: ima_initialized is set only if successful
  ima: add policy for pseudo fs
  ima: remove unused cleanup functions
  ima: free securityfs violations file
  ima: use full pathnames in measurement list
  security: Fix nommu build.
  samples: seccomp: add .gitignore for untracked executables
  tpm: check the chip reference before using it
  TPM: fix memleak when register hardware fails
  TPM: chip disabled state erronously being reported as error
  MAINTAINERS: TPM maintainers' contacts update
  Merge branches 'next-queue' and 'next' into next
  Remove unused code from MPI library
  Revert "crypto: GnuPG based MPI lib - additional sources (part 4)"
  ...

1 files changed, 0 insertions, 162 deletions

diff --git a/lib/mpi/mpi-bit.c b/lib/mpi/mpi-bit.c
index 0c505361da19..568724804f29 100644
--- a/lib/mpi/mpi-bit.c
+++ b/lib/mpi/mpi-bit.c
@@ -54,165 +54,3 @@ unsigned mpi_get_nbits(MPI a)
         return n;
 }
 EXPORT_SYMBOL_GPL(mpi_get_nbits);
-
-/****************
- * Test whether bit N is set.
- */
-int mpi_test_bit(MPI a, unsigned n)
-{
-        unsigned limbno, bitno;
-        mpi_limb_t limb;
-
-        limbno = n / BITS_PER_MPI_LIMB;
-        bitno = n % BITS_PER_MPI_LIMB;
-
-        if (limbno >= a->nlimbs)
-                return 0;       /* too far left: this is a 0 */
-        limb = a->d[limbno];
-        return (limb & (A_LIMB_1 << bitno)) ? 1 : 0;
-}
-
-/****************
- * Set bit N of A.
- */
-int mpi_set_bit(MPI a, unsigned n)
-{
-        unsigned limbno, bitno;
-
-        limbno = n / BITS_PER_MPI_LIMB;
-        bitno = n % BITS_PER_MPI_LIMB;
-
-        if (limbno >= a->nlimbs) {      /* resize */
-                if (a->alloced >= limbno)
-                        if (mpi_resize(a, limbno + 1) < 0)
-                                return -ENOMEM;
-                a->nlimbs = limbno + 1;
-        }
-        a->d[limbno] |= (A_LIMB_1 << bitno);
-        return 0;
-}
-
-/****************
- * Set bit N of A. and clear all bits above
- */
-int mpi_set_highbit(MPI a, unsigned n)
-{
-        unsigned limbno, bitno;
-
-        limbno = n / BITS_PER_MPI_LIMB;
-        bitno = n % BITS_PER_MPI_LIMB;
-
-        if (limbno >= a->nlimbs) {      /* resize */
-                if (a->alloced >= limbno)
-                        if (mpi_resize(a, limbno + 1) < 0)
-                                return -ENOMEM;
-                a->nlimbs = limbno + 1;
-        }
-        a->d[limbno] |= (A_LIMB_1 << bitno);
-        for (bitno++; bitno < BITS_PER_MPI_LIMB; bitno++)
-                a->d[limbno] &= ~(A_LIMB_1 << bitno);
-        a->nlimbs = limbno + 1;
-        return 0;
-}
-
-/****************
- * clear bit N of A and all bits above
- */
-void mpi_clear_highbit(MPI a, unsigned n)
-{
-        unsigned limbno, bitno;
-
-        limbno = n / BITS_PER_MPI_LIMB;
-        bitno = n % BITS_PER_MPI_LIMB;
-
-        if (limbno >= a->nlimbs)
-                return;         /* not allocated, so need to clear bits :-) */
-
-        for (; bitno < BITS_PER_MPI_LIMB; bitno++)
-                a->d[limbno] &= ~(A_LIMB_1 << bitno);
-        a->nlimbs = limbno + 1;
-}
-
-/****************
- * Clear bit N of A.
- */
-void mpi_clear_bit(MPI a, unsigned n)
-{
-        unsigned limbno, bitno;
-
-        limbno = n / BITS_PER_MPI_LIMB;
-        bitno = n % BITS_PER_MPI_LIMB;
-
-        if (limbno >= a->nlimbs)
-                return;         /* don't need to clear this bit, it's to far to left */
-        a->d[limbno] &= ~(A_LIMB_1 << bitno);
-}
-
-/****************
- * Shift A by N bits to the right
- * FIXME: should use alloc_limb if X and A are same.
- */
-int mpi_rshift(MPI x, MPI a, unsigned n)
-{
-        mpi_ptr_t xp;
-        mpi_size_t xsize;
-
-        xsize = a->nlimbs;
-        x->sign = a->sign;
-        if (RESIZE_IF_NEEDED(x, (size_t) xsize) < 0)
-                return -ENOMEM;
-        xp = x->d;
-
-        if (xsize) {
-                mpihelp_rshift(xp, a->d, xsize, n);
-                MPN_NORMALIZE(xp, xsize);
-        }
-        x->nlimbs = xsize;
-        return 0;
-}
-
-/****************
- * Shift A by COUNT limbs to the left
- * This is used only within the MPI library
- */
-int mpi_lshift_limbs(MPI a, unsigned int count)
-{
-        const int n = a->nlimbs;
-        mpi_ptr_t ap;
-        int i;
-
-        if (!count || !n)
-                return 0;
-
-        if (RESIZE_IF_NEEDED(a, n + count) < 0)
-                return -ENOMEM;
-
-        ap = a->d;
-        for (i = n - 1; i >= 0; i--)
-                ap[i + count] = ap[i];
-        for (i = 0; i < count; i++)
-                ap[i] = 0;
-        a->nlimbs += count;
-        return 0;
-}
-
-/****************
- * Shift A by COUNT limbs to the right
- * This is used only within the MPI library
- */
-void mpi_rshift_limbs(MPI a, unsigned int count)
-{
-        mpi_ptr_t ap = a->d;
-        mpi_size_t n = a->nlimbs;
-        unsigned int i;
-
-        if (count >= n) {
-                a->nlimbs = 0;
-                return;
-        }
-
-        for (i = 0; i < n - count; i++)
-                ap[i] = ap[i + count];
-        ap[i] = 0;
-        a->nlimbs -= count;
-}