- fix RSA and DSA FIPS selftests
- reenable fixed x86_64 camellia assembler code (#521127)
This commit is contained in:
		
							parent
							
								
									2d8446ff1a
								
							
						
					
					
						commit
						75f7276f8b
					
				
							
								
								
									
										12
									
								
								openssl-1.0.0-beta3-camellia-rounds.patch
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										12
									
								
								openssl-1.0.0-beta3-camellia-rounds.patch
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,12 @@ | ||||
| diff -up openssl-1.0.0-beta3/crypto/camellia/asm/cmll-x86_64.pl.rounds openssl-1.0.0-beta3/crypto/camellia/asm/cmll-x86_64.pl
 | ||||
| --- openssl-1.0.0-beta3/crypto/camellia/asm/cmll-x86_64.pl.rounds	2009-09-15 12:09:08.000000000 +0200
 | ||||
| +++ openssl-1.0.0-beta3/crypto/camellia/asm/cmll-x86_64.pl	2009-09-15 12:09:48.000000000 +0200
 | ||||
| @@ -656,7 +656,7 @@ Camellia_cbc_encrypt:
 | ||||
|  	mov	%rsi,$out		# out argument | ||||
|  	mov	%r8,%rbx		# ivp argument | ||||
|  	mov	%rcx,$key		# key argument | ||||
| -	mov	272(%rcx),$keyend	# grandRounds
 | ||||
| +	mov	272(%rcx),${keyend}d	# grandRounds
 | ||||
|   | ||||
|  	mov	%r8,$_ivp | ||||
|  	mov	%rbp,$_rsp | ||||
| @ -1,12 +0,0 @@ | ||||
| diff -up openssl-1.0.0-beta3/Configure.cmll-noasm openssl-1.0.0-beta3/Configure
 | ||||
| --- openssl-1.0.0-beta3/Configure.cmll-noasm	2009-09-04 13:44:53.000000000 +0200
 | ||||
| +++ openssl-1.0.0-beta3/Configure	2009-09-04 13:46:08.000000000 +0200
 | ||||
| @@ -125,7 +125,7 @@ my $x86_asm="x86cpuid.o:bn-586.o co-586.
 | ||||
|   | ||||
|  my $x86_elf_asm="$x86_asm:elf"; | ||||
|   | ||||
| -my $x86_64_asm="x86_64cpuid.o:x86_64-gcc.o x86_64-mont.o::aes-x86_64.o::md5-x86_64.o:sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o::rc4-x86_64.o:::wp-x86_64.o:cmll-x86_64.o cmll_misc.o";
 | ||||
| +my $x86_64_asm="x86_64cpuid.o:x86_64-gcc.o x86_64-mont.o::aes-x86_64.o::md5-x86_64.o:sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o::rc4-x86_64.o:::wp-x86_64.o:";
 | ||||
|  my $ia64_asm="ia64cpuid.o:bn-ia64.o::aes_core.o aes_cbc.o aes-ia64.o::md5-ia64.o:sha1-ia64.o sha256-ia64.o sha512-ia64.o::rc4-ia64.o rc4_skey.o:::::void"; | ||||
|  my $sparcv9_asm="sparcv9cap.o sparccpuid.o:bn-sparcv9.o sparcv9-mont.o sparcv9a-mont.o:des_enc-sparc.o fcrypt_b.o:aes_core.o aes_cbc.o aes-sparcv9.o:::sha1-sparcv9.o sha256-sparcv9.o sha512-sparcv9.o:::::::void"; | ||||
|  my $sparcv8_asm=":sparcv8.o:des_enc-sparc.o fcrypt_b.o:::::::::::void"; | ||||
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
							
								
								
									
										10
									
								
								openssl.spec
									
									
									
									
									
								
							
							
						
						
									
										10
									
								
								openssl.spec
									
									
									
									
									
								
							| @ -23,7 +23,7 @@ | ||||
| Summary: A general purpose cryptography library with TLS implementation | ||||
| Name: openssl | ||||
| Version: 1.0.0 | ||||
| Release: 0.7.%{beta}%{?dist} | ||||
| Release: 0.8.%{beta}%{?dist} | ||||
| # We remove certain patented algorithms from the openssl source tarball | ||||
| # with the hobble-openssl script which is included below. | ||||
| Source: openssl-%{version}-%{beta}-usa.tar.bz2 | ||||
| @ -63,10 +63,10 @@ Patch49: openssl-0.9.8k-algo-doc.patch | ||||
| Patch50: openssl-1.0.0-beta3-curl.patch | ||||
| Patch51: openssl-1.0.0-beta3-const.patch | ||||
| Patch52: openssl-1.0.0-beta3-dss1.patch | ||||
| Patch53: openssl-1.0.0-beta3-cmll-noasm.patch | ||||
| # Backported fixes including security fixes | ||||
| Patch60: openssl-1.0.0-beta3-namingstr.patch | ||||
| Patch61: openssl-1.0.0-beta3-namingblk.patch | ||||
| Patch62: openssl-1.0.0-beta3-camellia-rounds.patch | ||||
| 
 | ||||
| License: OpenSSL | ||||
| Group: System Environment/Libraries | ||||
| @ -148,9 +148,9 @@ from other formats to the formats used by the OpenSSL toolkit. | ||||
| %patch50 -p1 -b .curl | ||||
| %patch51 -p1 -b .const | ||||
| %patch52 -p1 -b .dss1 | ||||
| %patch53 -p1 -b .cmll-noasm | ||||
| %patch60 -p1 -b .namingstr | ||||
| %patch61 -p1 -b .namingblk | ||||
| %patch62 -p1 -b .cmll-rounds | ||||
| 
 | ||||
| # Modify the various perl scripts to reference perl in the right location. | ||||
| perl util/perlpath.pl `dirname %{__perl}` | ||||
| @ -399,6 +399,10 @@ rm -rf $RPM_BUILD_ROOT/%{_libdir}/fipscanister.* | ||||
| %postun -p /sbin/ldconfig | ||||
| 
 | ||||
| %changelog | ||||
| * Wed Sep 30 2009 Tomas Mraz <tmraz@redhat.com> 1.0.0-0.8.beta3 | ||||
| - fix RSA and DSA FIPS selftests | ||||
| - reenable fixed x86_64 camellia assembler code (#521127) | ||||
| 
 | ||||
| * Fri Sep  4 2009 Tomas Mraz <tmraz@redhat.com> 1.0.0-0.7.beta3 | ||||
| - temporarily disable x86_64 camellia assembler code (#521127) | ||||
| 
 | ||||
|  | ||||
		Loading…
	
		Reference in New Issue
	
	Block a user