1 diff -ruN ../a/openssl-0.9.8k/fips/fipsld openssl-0.9.8k/fips/fipsld

     2 --- ../a/openssl-0.9.8k/fips/fipsld	2008-09-16 12:12:10.000000000 +0200

     3 +++ openssl-0.9.8k/fips/fipsld	2009-10-06 16:45:34.379991933 +0200

     4 @@ -12,6 +12,14 @@

     5  

     6  #set -x

     7  

     8 +# Solaris OpenSSL:

     9 +# Wrap the calls to cc to remove the "-g" option when compiling

    10 +# (SPARC only). If "-g" is used on SPARC to build libcrypto.so

    11 +# the fingerprint will be incorrectly generated as "-g" promotes

    12 +# static symbols to globals which then interacts with the linker to

    13 +# produce a changed text section.

    14 +CCWRAP=ccwrap

    15 +

    16  CC=${FIPSLD_CC:-${CC}}

    17  [ -n "${CC}" ] || { echo '$CC is not defined'; exit 1; }

    18  

    19 @@ -112,7 +120,7 @@

    20  	fi

    21  

    22  	/bin/rm -f "${TARGET}"

    23 -	${CC}	${CANISTER_O_CMD:+"${CANISTER_O_CMD}"} \

    24 +	${CCWRAP} ${CC}	${CANISTER_O_CMD:+"${CANISTER_O_CMD}"} \

    25  		"${PREMAIN_C}" \

    26  		${_WL_PREMAIN} "$@"

    27  

    28 @@ -124,7 +132,7 @@

    29  	fi

    30  

    31  	# recompile with signature...

    32 -	${CC}	${CANISTER_O_CMD:+"${CANISTER_O_CMD}"} \

    33 +	${CCWRAP} ${CC}	${CANISTER_O_CMD:+"${CANISTER_O_CMD}"} \

    34  		-DHMAC_SHA1_SIG=\"${SIG}\" "${PREMAIN_C}" \

    35  		${_WL_PREMAIN} "$@"

    36  	;;

    37 @@ -151,7 +159,7 @@

    38  	{ echo "${PREMAIN_C} fingerprint mismatch"; exit 1; }

    39  

    40  	/bin/rm -f "${TARGET}"

    41 -	${CC}	${CANISTER_O_CMD:+"${CANISTER_O_CMD}"} \

    42 +	${CCWRAP} ${CC}	${CANISTER_O_CMD:+"${CANISTER_O_CMD}"} \

    43  		"${PREMAIN_C}" \

    44  		${_WL_PREMAIN} "$@"

    45  

    46 @@ -163,7 +171,7 @@

    47  	fi

    48  

    49  	# recompile with signature...

    50 -	${CC}	${CANISTER_O_CMD:+"${CANISTER_O_CMD}"} \

    51 +	${CCWRAP} ${CC}	${CANISTER_O_CMD:+"${CANISTER_O_CMD}"} \

    52  		-DHMAC_SHA1_SIG=\"${SIG}\" "${PREMAIN_C}" \

    53  		${_WL_PREMAIN} "$@"

    54  	;;