summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-02-01 16:00:38 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2012-02-01 16:00:38 -0800
commitce106ad31016b5da1168496cd0454a6290555f84 (patch)
tree07127240fcbe41ed0e2169ec2bbb79d67375b00d /include
parent18d3e0d7507949d776e50667d0a4e44b13d3e1ac (diff)
parenta99e7e5f36c55e561a64280f5099078c31839076 (diff)
downloadlinux-ce106ad31016b5da1168496cd0454a6290555f84.tar.bz2
Merge branch 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
* 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: lib: Fix 32-bit sparc udiv_qrnnd() definition in mpilib's longlong.h lib: Fix multiple definitions of clz_tab lib/digsig: checks for NULL return value lib/mpi: added missing NULL check lib/mpi: added comment on divide by 0 case lib/mpi: check for possible zero length lib/digsig: pkcs_1_v1_5_decode_emsa cleanup lib/digsig: additional sanity checks against badly formated key payload lib/mpi: removed unused functions lib/mpi: checks for zero divisor length lib/mpi: return error code on dividing by zero lib/mpi: replaced MPI_NULL with normal NULL lib/mpi: added missing NULL check
Diffstat (limited to 'include')
-rw-r--r--include/linux/mpi.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/mpi.h b/include/linux/mpi.h
index 06f88994ccaa..d02cca6cc8ce 100644
--- a/include/linux/mpi.h
+++ b/include/linux/mpi.h
@@ -57,8 +57,6 @@ struct gcry_mpi {
typedef struct gcry_mpi *MPI;
-#define MPI_NULL NULL
-
#define mpi_get_nlimbs(a) ((a)->nlimbs)
#define mpi_is_neg(a) ((a)->sign)