Commit ce106ad3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 18d3e0d7 a99e7e5f

arch/sparc/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ config SPARC 
config SPARC32

	def_bool !64BIT

	select GENERIC_ATOMIC64

	select CLZ_TAB



config SPARC64

	def_bool 64BIT

arch/sparc/lib/divdi3.S

+1 −15
Original line number Diff line number Diff line
@@ -17,23 +17,9 @@ along with GNU CC; see the file COPYING. If not, write to 
the Free Software Foundation, 59 Temple Place - Suite 330,

Boston, MA 02111-1307, USA.  */



	.data

	.align 8

	.globl	__clz_tab

__clz_tab:

	.byte	0,1,2,2,3,3,3,3,4,4,4,4,4,4,4,4,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5

	.byte	6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6

	.byte	7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7

	.byte	7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7

	.byte	8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8

	.byte	8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8

	.byte	8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8

	.byte	8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8

	.size	 __clz_tab,256

	.global .udiv



	.text

	.align 4

	.global .udiv

	.globl __divdi3

__divdi3:

	save %sp,-104,%sp

include/linux/mpi.h

+0 −2
Original line number Diff line number Diff line
@@ -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)

lib/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -279,6 +279,9 @@ config AVERAGE 


	  If unsure, say N.



config CLZ_TAB

	bool



config CORDIC

	tristate "CORDIC algorithm"

	help
@@ -287,6 +290,7 @@ config CORDIC 


config MPILIB

	tristate

	select CLZ_TAB

	help

	  Multiprecision maths library from GnuPG.

	  It is used to implement RSA digital signature verification,

lib/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -121,6 +121,8 @@ obj-$(CONFIG_DQL) += dynamic_queue_limits.o 
obj-$(CONFIG_MPILIB) += mpi/

obj-$(CONFIG_SIGNATURE) += digsig.o



obj-$(CONFIG_CLZ_TAB) += clz_tab.o



hostprogs-y	:= gen_crc32table

clean-files	:= crc32table.h

CRA Git | Maintained and supported by SUSTech CRA and CCSE