mirror of
				https://github.com/drwetter/testssl.sh.git
				synced 2025-10-31 13:55:25 +01:00 
			
		
		
		
	don't do double work, reordering stuff
This commit is contained in:
		| @@ -5,14 +5,6 @@ | ||||
| # instructions @ https://github.com/drwetter/testssl.sh/tree/2.9dev/bin | ||||
|  | ||||
|  | ||||
| echo | ||||
| echo "###################################################################" | ||||
| echo "#######      Build script for Peter Mosmans openssl         #######" | ||||
| echo "####### which contains all broken and all advanced features #######" | ||||
| echo "###################################################################" | ||||
| echo | ||||
| sleep 3 | ||||
|  | ||||
| STDOPTIONS="--prefix=/usr/ --openssldir=/etc/ssl -DOPENSSL_USE_BUILD_DATE enable-zlib \ | ||||
| enable-ssl2 enable-ssl3 enable-ssl-trace enable-rc5 enable-rc2 \ | ||||
| enable-gost enable-cms enable-md2 enable-mdc2 enable-ec enable-ec2m enable-ecdh enable-ecdsa \ | ||||
| @@ -81,42 +73,45 @@ testv6_patch() { | ||||
| } | ||||
|  | ||||
|  | ||||
|  | ||||
| echo | ||||
| echo "###################################################################" | ||||
| echo "#######   Build script for Peter Mosmans openssl fork       #######" | ||||
| echo "####### which contains all broken and all advanced features #######" | ||||
| echo "###################################################################" | ||||
| echo | ||||
|  | ||||
| testv6_patch | ||||
|  | ||||
| if [ "$1" = krb ]; then | ||||
| 	name2add=krb | ||||
| else | ||||
| 	name2add=static | ||||
| fi | ||||
|  | ||||
| echo "doing a build for $(uname).$(uname -m)".$name2add | ||||
| echo | ||||
| sleep 3 | ||||
|  | ||||
|  | ||||
| case $(uname) in | ||||
|      Linux|FreeBSD) | ||||
| 		case $(uname -m) in | ||||
|          		i686|armv7l) clean | ||||
| 				if [ "$1" == krb ]; then | ||||
| 					name2add=krb | ||||
| 				if [ "$1" = krb ]; then | ||||
| 					./config $STDOPTIONS no-ec_nistp_64_gcc_128 --with-krb5-flavor=MIT | ||||
| 				else | ||||
| 					name2add=static | ||||
| 					./config $STDOPTIONS no-ec_nistp_64_gcc_128 -static | ||||
| 				fi | ||||
| 				[ $? -ne 0 ] && error "configuring" | ||||
| 				makeall && copyfiles "$name2add" | ||||
| 				[ $? -ne 0 ] && error "copying files" | ||||
| 				echo "\n(w/o 4 GOST ciphers): $(apps/openssl ciphers -V 'ALL:COMPLEMENTOFALL' | wc -l)" | ||||
| 				echo | ||||
| 				echo "------------ all ok ------------" | ||||
| 				echo | ||||
| 				;; | ||||
| 			x86_64|amd64) clean | ||||
|                	if [ "$1" = krb ]; then | ||||
| 					name2add=krb | ||||
| 					./config $STDOPTIONS enable-ec_nistp_64_gcc_128 --with-krb5-flavor=MIT | ||||
| 				else | ||||
| 					name2add=static | ||||
| 					./config $STDOPTIONS enable-ec_nistp_64_gcc_128 -static | ||||
| 				fi | ||||
| 				[ $? -ne 0 ] && error "configuring" | ||||
| 				makeall && copyfiles "$name2add" | ||||
| 				[ $? -ne 0 ] && error "copying files" | ||||
| 				echo "\n(w/o 4 GOST ciphers): $(apps/openssl ciphers -V 'ALL:COMPLEMENTOFALL' | wc -l)" | ||||
| 				echo | ||||
| 				echo "------------ all ok ------------" | ||||
| 				echo | ||||
| 				;; | ||||
| 			*) echo " Sorry, don't know this architecture $(uname -m)" | ||||
|                	exit 1 | ||||
| @@ -138,6 +133,15 @@ case $(uname) in | ||||
| esac | ||||
|  | ||||
|  | ||||
| #  vim:ts=5:sw=5 | ||||
| #  $Id: make-openssl.sh,v 1.18 2017/05/12 15:03:00 dirkw Exp $ | ||||
| makeall && copyfiles "$name2add" | ||||
| [ $? -ne 0 ] && error "copying files" | ||||
| echo | ||||
| echo "(w/o 4 GOST ciphers): $(apps/openssl ciphers -V 'ALL:COMPLEMENTOFALL' | wc -l)" | ||||
| echo | ||||
| echo "------------ all ok ------------" | ||||
| echo | ||||
|  | ||||
|  | ||||
| #  vim:ts=5:sw=5 | ||||
| #  $Id: make-openssl.sh,v 1.19 2017/05/12 15:56:24 dirkw Exp $ | ||||
|  | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 Dirk
					Dirk