OpenSSL: OpenSSL-fips-0_9_8-stable: openssl/ Configure Makefile....

Thread: OpenSSL: OpenSSL-fips-0_9_8-stable: openssl/ Configure Makefile....

Search this list only Search all lists
OpenSSL: OpenSSL-fips-0_9_8-stable: openssl/ Configure Makefile....
Germany	2007-08-26 09:57:10
OpenSSL CVS Repository http://cvs.openssl.org/ ____________________________________________________________ ________________ Server: cvs.openssl.org Name: Andy Polyakov Root: /v/openssl/cvs Email: approopenssl.org Module: openssl Date: 26-Aug-2007 16:57:10 Branch: OpenSSL-fips-0_9_8-stable Handle: 2007082615570802 Modified files: (Branch: OpenSSL-fips-0_9_8-stable) openssl Configure Makefile.shared TABLE openssl/fips fips.c Log: IRIX and Tru64 platform updates [from HEAD]. Summary: Revision Changes Path 1.488.2.35.2.21+2 -2 openssl/Configure 1.47.2.10.2.7+4 -4 openssl/Makefile.shared 1.184.2.15.2.10+2 -2 openssl/TABLE 1.1.4.3 +8 -0 openssl/fips/fips.c ____________________________________________________________ ________________ patch -p0 <<' .' Index: openssl/Configure ============================================================ ================ $ cvs diff -u -r1.488.2.35.2.20 -r1.488.2.35.2.21 Configure --- openssl/Configure 1 Aug 2007 11:33:01 -0000 1.488.2.35.2.20 +++ openssl/Configure 26 Aug 2007 14:57:08 -0000 1.488.2.35.2.21 -234,10 +234,10 # Only N32 and N64 ABIs are supported. If you need O32 ABI build, invoke # './Configure irix-cc -o32' manually. "irix-mips3-gcc","gcc:-mabi=n32 -O3 -DTERMIOS -DB_ENDIAN -DBN_DIV3W::-D_SGI_MP_SOURCE:::MD2_CHAR RC4_INDEX RC4_CHAR RC4_CHUNK_LL DES_UNROLL DES_RISC2 DES_PTR BF_PTR SIXTY_FOUR_BIT::bn-mips3.o::::::::::dlfcn:irix-shared::-mabi =n32:.so.$(SHLIB_MAJOR).$(SHLIB_MINOR)", -"irix-mips3-cc", "cc:-n32 -mips3 -O2 -use_readonly_const -DTERMIOS -DB_ENDIAN -DBN_DIV3W::-D_SGI_MP_SOURCE::ES_PTR RC4_CHAR RC4_CHUNK_LL DES_RISC2 DES_UNROLL BF_PTR SIXTY_FOUR_BIT::bn-mips3.o::::::::::dlfcn:irix-shared::-n32: .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)", +"irix-mips3-cc", "cc:-n32 -mips3 -O2 -use_readonly_const -G0 -rdata_shared -DTERMIOS -DB_ENDIAN -DBN_DIV3W::-D_SGI_MP_SOURCE::ES_PTR RC4_CHAR RC4_CHUNK_LL DES_RISC2 DES_UNROLL BF_PTR SIXTY_FOUR_BIT::bn-mips3.o::::::::::dlfcn:irix-shared::-n32: .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)", # N64 ABI builds. "irix64-mips4-gcc","gcc:-mabi=64 -mips4 -O3 -DTERMIOS -DB_ENDIAN -DBN_DIV3W::-D_SGI_MP_SOURCE:::RC4_CHAR RC4_CHUNK DES_RISC2 DES_UNROLL SIXTY_FOUR_BIT_LONG::bn-mips3.o::::::::::dlfcn:irix-shared:: -mabi=64:.so.$(SHLIB_MAJOR).$(SHLIB_MINOR)", -"irix64-mips4-cc", "cc:-64 -mips4 -O2 -use_readonly_const -DTERMIOS -DB_ENDIAN -DBN_DIV3W::-D_SGI_MP_SOURCE:::RC4_CHAR RC4_CHUNK DES_RISC2 DES_UNROLL SIXTY_FOUR_BIT_LONG::bn-mips3.o::::::::::dlfcn:irix-shared:: -64:.so.$(SHLIB_MAJOR).$(SHLIB_MINOR)", +"irix64-mips4-cc", "cc:-64 -mips4 -O2 -use_readonly_const -G0 -rdata_shared -DTERMIOS -DB_ENDIAN -DBN_DIV3W::-D_SGI_MP_SOURCE:::RC4_CHAR RC4_CHUNK DES_RISC2 DES_UNROLL SIXTY_FOUR_BIT_LONG::bn-mips3.o::::::::::dlfcn:irix-shared:: -64:.so.$(SHLIB_MAJOR).$(SHLIB_MINOR)", #### Unified HP-UX ANSI C configs. # Special notes: . patch -p0 <<' .' Index: openssl/Makefile.shared ============================================================ ================ $ cvs diff -u -r1.47.2.10.2.6 -r1.47.2.10.2.7 Makefile.shared --- openssl/Makefile.shared 1 Aug 2007 14:22:36 -0000 1.47.2.10.2.6 +++ openssl/Makefile.shared 26 Aug 2007 14:57:09 -0000 1.47.2.10.2.7 -284,7 +284,7 SHLIB_SOVER=; ALLSYMSFLAGS='-all'; NOALLSYMSFLAGS='-none'; - SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared"; + SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-B,symbolic"; if [ -n "$$SHLIB_HIST" ]; then SHAREDFLAGS="$$SHAREDFLAGS -set_version $$SHLIB_HIST"; fi; -305,7 +305,7 SHLIB_SOVER=; ALLSYMSFLAGS='-all'; NOALLSYMSFLAGS='-none'; - SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared"; + SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-B,symbolic"; if [ -n "$$SHLIB_HIST" ]; then SHAREDFLAGS="$$SHAREDFLAGS -set_version $$SHLIB_HIST"; fi; -428,7 +428,7 ($(CC) -v 2>&1 \| grep gcc) > /dev/null && MINUSWL="-Wl,"; ALLSYMSFLAGS="$$-all"; NOALLSYMSFLAGS="$$-none"; - SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-soname,$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"; + SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-soname,$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX,-B,symbolic&q uot;; fi; $(LINK_SO_O) link_a.irix: -442,7 +442,7 ($(CC) -v 2>&1 \| grep gcc) > /dev/null && MINUSWL="-Wl,"; ALLSYMSFLAGS="$$-all"; NOALLSYMSFLAGS="$$-none"; - SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-soname,$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"; + SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-soname,$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX,-B,symbolic&q uot;; fi; $(LINK_SO_A) link_app.irix: . patch -p0 <<' .' Index: openssl/TABLE ============================================================ ================ $ cvs diff -u -r1.184.2.15.2.9 -r1.184.2.15.2.10 TABLE --- openssl/TABLE 1 Aug 2007 11:33:06 -0000 1.184.2.15.2.9 +++ openssl/TABLE 26 Aug 2007 14:57:09 -0000 1.184.2.15.2.10 -2351,7 +2351,7 * irix-mips3-cc $cc = cc -$cflags = -n32 -mips3 -O2 -use_readonly_const -DTERMIOS -DB_ENDIAN -DBN_DIV3W +$cflags = -n32 -mips3 -O2 -use_readonly_const -G0 -rdata_shared -DTERMIOS -DB_ENDIAN -DBN_DIV3W $unistd = $thread_cflag = -D_SGI_MP_SOURCE $sys_id = -2405,7 +2405,7 * irix64-mips4-cc $cc = cc -$cflags = -64 -mips4 -O2 -use_readonly_const -DTERMIOS -DB_ENDIAN -DBN_DIV3W +$cflags = -64 -mips4 -O2 -use_readonly_const -G0 -rdata_shared -DTERMIOS -DB_ENDIAN -DBN_DIV3W $unistd = $thread_cflag = -D_SGI_MP_SOURCE $sys_id = . patch -p0 <<' .' Index: openssl/fips/fips.c ============================================================ ================ $ cvs diff -u -r1.1.4.2 -r1.1.4.3 fips.c --- openssl/fips/fips.c 15 Aug 2007 13:35:31 -0000 1.1.4.2 +++ openssl/fips/fips.c 26 Aug 2007 14:57:10 -0000 1.1.4.3 -209,7 +209,11 { unsigned char sig[EVP_MAX_MD_SIZE]; unsigned int len; +#if defined(__sgi) && (defined(__mips) \|\| defined(mips)) + extern int __dso_displacement[]; +#else extern int OPENSSL_NONPIC_relocated; +#endif if (FIPS_text_start()==NULL) { -224,7 +228,11 { if (FIPS_signature>=FIPS_rodata_start && FIPS_signature<FIPS_rodata_end) FIPSerr(FIPS_F_FIPS_CHECK_INCORE_FINGERPRINT,FIPS_R_FINGERPR INT_DOES_NOT_MATCH_SEGMENT_ALIASING); +#if defined(__sgi) && (defined(__mips) \|\| defined(mips)) + else if (__dso_displacement!=NULL) +#else else if (OPENSSL_NONPIC_relocated) +#endif FIPSerr(FIPS_F_FIPS_CHECK_INCORE_FINGERPRINT,FIPS_R_FINGERPR INT_DOES_NOT_MATCH_NONPIC_RELOCATED); else FIPSerr(FIPS_F_FIPS_CHECK_INCORE_FINGERPRINT,FIPS_R_FINGERPR INT_DOES_NOT_MATCH); . ____________________________________________________________ __________ OpenSSL Project http://www.openssl.org CVS Repository Commit List openssl-cvsopenssl.org Automated List Manager majordomoopenssl.org

[1]

about | contact Other archives ( Real Estate discussion Medical topics )