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, 68 deletions

diff --git a/lib/mpi/mpi-cmp.c b/lib/mpi/mpi-cmp.c
deleted file mode 100644
index 914bc42a8a80..000000000000
--- a/lib/mpi/mpi-cmp.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/* mpi-cmp.c  -  MPI functions
- * Copyright (C) 1998, 1999 Free Software Foundation, Inc.
- *
- * This file is part of GnuPG.
- *
- * GnuPG is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * GnuPG is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#include "mpi-internal.h"
-
-int mpi_cmp_ui(MPI u, unsigned long v)
-{
-        mpi_limb_t limb = v;
-
-        mpi_normalize(u);
-        if (!u->nlimbs && !limb)
-                return 0;
-        if (u->sign)
-                return -1;
-        if (u->nlimbs > 1)
-                return 1;
-
-        if (u->d[0] == limb)
-                return 0;
-        else if (u->d[0] > limb)
-                return 1;
-        else
-                return -1;
-}
-
-int mpi_cmp(MPI u, MPI v)
-{
-        mpi_size_t usize, vsize;
-        int cmp;
-
-        mpi_normalize(u);
-        mpi_normalize(v);
-        usize = u->nlimbs;
-        vsize = v->nlimbs;
-        if (!u->sign && v->sign)
-                return 1;
-        if (u->sign && !v->sign)
-                return -1;
-        if (usize != vsize && !u->sign && !v->sign)
-                return usize - vsize;
-        if (usize != vsize && u->sign && v->sign)
-                return vsize + usize;
-        if (!usize)
-                return 0;
-        cmp = mpihelp_cmp(u->d, v->d, usize);
-        if (!cmp)
-                return 0;
-        if ((cmp < 0 ? 1 : 0) == (u->sign ? 1 : 0))
-                return 1;
-        return -1;
-}