From owner-p4-projects@FreeBSD.ORG Fri Apr 6 09:48:43 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A28EC16A40A; Fri, 6 Apr 2007 09:48:43 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 786AE16A408 for ; Fri, 6 Apr 2007 09:48:43 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 6619313C487 for ; Fri, 6 Apr 2007 09:48:43 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l369mhfp081711 for ; Fri, 6 Apr 2007 09:48:43 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l369mhET081708 for perforce@freebsd.org; Fri, 6 Apr 2007 09:48:43 GMT (envelope-from gonzo@FreeBSD.org) Date: Fri, 6 Apr 2007 09:48:43 GMT Message-Id: <200704060948.l369mhET081708@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 117489 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Apr 2007 09:48:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=117489 Change 117489 by gonzo@gonzo_jeeves on 2007/04/06 09:48:05 o Sync opensslconf-mips.h (make it just like -arm one) Affected files ... .. //depot/projects/mips2/src/secure/lib/libcrypto/opensslconf-mips.h#3 edit Differences ... ==== //depot/projects/mips2/src/secure/lib/libcrypto/opensslconf-mips.h#3 (text+ko) ==== @@ -1,17 +1,43 @@ -/* $FreeBSD$ */ +/* $FreeBSD: src/secure/lib/libcrypto/opensslconf-arm.h,v 1.3 2006/10/01 07:56:43 simon Exp $ */ /* opensslconf.h */ - /* WARNING: Generated automatically from opensslconf.h.in by Configure. */ /* OpenSSL was configured with the following options: */ +#ifndef OPENSSL_DOING_MAKEDEPEND + +/* Disabled by default in OpenSSL 0.9.8. */ +#ifndef OPENSSL_NO_CAMELLIA +# define OPENSSL_NO_CAMELLIA +#endif +/* libgmp is not in the FreeBSD base system. */ +#ifndef OPENSSL_NO_GMP +# define OPENSSL_NO_GMP +#endif +/* The Kerberos 5 support is MIT-specific. */ +#ifndef OPENSSL_NO_KRB5 +# define OPENSSL_NO_KRB5 +#endif + +#endif /* OPENSSL_DOING_MAKEDEPEND */ +#ifndef OPENSSL_THREADS +# define OPENSSL_THREADS +#endif +#ifndef OPENSSL_NO_STATIC_ENGINE +# define OPENSSL_NO_STATIC_ENGINE +#endif + +/* The OPENSSL_NO_* macros are also defined as NO_* if the application + asks for it. This is a transient feature that is provided for those + who haven't had the time to do the appropriate changes in their + applications. */ #ifdef OPENSSL_ALGORITHM_DEFINES - /* no ciphers excluded */ -#endif -#ifdef OPENSSL_THREAD_DEFINES -# ifndef THREADS -# define THREADS +# if defined(OPENSSL_NO_GMP) && !defined(NO_GMP) +# define NO_GMP +# endif +# if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5) +# define NO_KRB5 +# endif # endif -#endif #ifdef OPENSSL_OTHER_DEFINES # ifndef NO_ASM # define NO_ASM @@ -30,8 +56,11 @@ #endif #endif +#undef OPENSSL_UNISTD #define OPENSSL_UNISTD +#undef OPENSSL_EXPORT_VAR_AS_FUNCTION + #if defined(HEADER_IDEA_H) && !defined(IDEA_INT) #define IDEA_INT unsigned int #endif @@ -65,7 +94,7 @@ #endif #endif -#if (defined(HEADER_DES_H) || defined(HEADER_NEW_DES_H)) && !defined(DES_LONG) +#if (defined(HEADER_NEW_DES_H) || defined(HEADER_DES_H)) && !defined(DES_LONG) /* If this is set to 'unsigned int' on a DEC Alpha, this gives about a * %20 speed up (longs are 8 bytes, int's are 4). */ #ifndef DES_LONG @@ -115,11 +144,11 @@ * units. It reduces register dependancies at the expense of 2 more * registers */ #ifndef DES_RISC1 -#undef DES_RISC1 +#define DES_RISC1 #endif #ifndef DES_RISC2 -#define DES_RISC2 +#undef DES_RISC2 #endif #if defined(DES_RISC1) && defined(DES_RISC2) @@ -174,5 +203,3 @@ #endif /* DES_DEFAULT_OPTIONS */ #endif /* HEADER_DES_LOCL_H */ -/* The Kerberos 5 support is MIT-specific. */ -#define OPENSSL_NO_KRB5