Commit 96530eea authored by Patrick Steuer's avatar Patrick Steuer Committed by Andy Polyakov
Browse files

s390x assembly pack: add KMA code path for aes-gcm. 

Signed-off-by: default avatarPatrick Steuer <patrick.steuer@de.ibm.com>

Reviewed-by: default avatarAndy Polyakov <appro@openssl.org>
Reviewed-by: default avatarTim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4634)
parent e21a8430

crypto/build.info

+2 −0
Changes for crypto/build.info: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -31,6 +31,8 @@ GENERATE[arm64cpuid.S]=arm64cpuid.pl $(PERLASM_SCHEME) 
INCLUDE[arm64cpuid.o]=.

GENERATE[armv4cpuid.S]=armv4cpuid.pl $(PERLASM_SCHEME)

INCLUDE[armv4cpuid.o]=.

GENERATE[s390xcpuid.S]=s390xcpuid.pl $(PERLASM_SCHEME)

INCLUDE[s390xcpuid.o]=.



IF[{- $config{target} =~ /^(?:Cygwin|mingw|VC-)/ -}]

  SHARED_SOURCE[../libcrypto]=dllmain.c

crypto/evp/e_aes.c

+735 −0

File changed.

Preview size limit exceeded, changes collapsed.

crypto/s390x_arch.h

+11 −0
Changes for crypto/s390x_arch.h: 11 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -12,6 +12,11 @@ 


# ifndef __ASSEMBLER__



void s390x_km(const unsigned char *in, size_t len, unsigned char *out,

              unsigned int fc, void *param);

void s390x_kma(const unsigned char *aad, size_t alen, const unsigned char *in,

               size_t len, unsigned char *out, unsigned int fc, void *param);



/*

 * The field elements of OPENSSL_s390xcap_P are the 64-bit words returned by

 * the STFLE instruction followed by the 64-bit word pairs returned by
@@ -79,4 +84,10 @@ extern struct OPENSSL_s390xcap_st OPENSSL_s390xcap_P; 
/* prno */

# define S390X_TRNG		114



/* Register 0 Flags */

# define S390X_DECRYPT		0x80

# define S390X_KMA_LPC		0x100

# define S390X_KMA_LAAD		0x200

# define S390X_KMA_HS		0x400



#endif

crypto/s390xcpuid.S→crypto/s390xcpuid.pl

100644 → 100755
+99 −28

File changed and moved.File mode changed from 100644 to 100755.

Preview size limit exceeded, changes collapsed.