[src/netbsd-1-5]: src/lib/libcrypto Pull up rev 1.2:

[thorpej <thorpej%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/1848ce0003f5
branches:  netbsd-1-5
changeset: 488214:1848ce0003f5
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Thu Jun 22 06:55:03 2000 +0000

description:
Pull up rev 1.2:
s/CFLAGS/CPPFLAGS/g

diffstat:

 lib/libcrypto/asn1.inc    |  4 ++--
 lib/libcrypto/bf.inc      |  4 ++--
 lib/libcrypto/bio.inc     |  4 ++--
 lib/libcrypto/bn.inc      |  4 ++--
 lib/libcrypto/buffer.inc  |  4 ++--
 lib/libcrypto/cast.inc    |  4 ++--
 lib/libcrypto/comp.inc    |  4 ++--
 lib/libcrypto/conf.inc    |  4 ++--
 lib/libcrypto/crypto.inc  |  4 ++--
 lib/libcrypto/des.inc     |  4 ++--
 lib/libcrypto/dh.inc      |  4 ++--
 lib/libcrypto/dsa.inc     |  4 ++--
 lib/libcrypto/err.inc     |  4 ++--
 lib/libcrypto/evp.inc     |  4 ++--
 lib/libcrypto/hmac.inc    |  4 ++--
 lib/libcrypto/lhash.inc   |  4 ++--
 lib/libcrypto/md2.inc     |  4 ++--
 lib/libcrypto/md5.inc     |  4 ++--
 lib/libcrypto/mdc2.inc    |  4 ++--
 lib/libcrypto/objects.inc |  4 ++--
 lib/libcrypto/pem.inc     |  4 ++--
 lib/libcrypto/pkcs12.inc  |  4 ++--
 lib/libcrypto/pkcs7.inc   |  4 ++--
 lib/libcrypto/rand.inc    |  4 ++--
 lib/libcrypto/rc2.inc     |  4 ++--
 lib/libcrypto/rc4.inc     |  4 ++--
 lib/libcrypto/ripemd.inc  |  4 ++--
 lib/libcrypto/sha.inc     |  4 ++--
 lib/libcrypto/stack.inc   |  4 ++--
 lib/libcrypto/txt_db.inc  |  4 ++--
 lib/libcrypto/x509.inc    |  4 ++--
 lib/libcrypto/x509v3.inc  |  4 ++--
 32 files changed, 64 insertions(+), 64 deletions(-)

diffs (truncated from 576 to 300 lines):

diff -r c7b66a115df6 -r 1848ce0003f5 lib/libcrypto/asn1.inc
--- a/lib/libcrypto/asn1.inc    Thu Jun 22 05:11:20 2000 +0000
+++ b/lib/libcrypto/asn1.inc    Thu Jun 22 06:55:03 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: asn1.inc,v 1.1.1.1 2000/06/16 04:21:32 thorpej Exp $
+#      $NetBSD: asn1.inc,v 1.1.1.1.2.1 2000/06/22 06:55:03 thorpej Exp $
 #
 #      @(#) Copyright (c) 1995 Simon J. Gerraty
 #
@@ -7,7 +7,7 @@
 
 .PATH: ${OPENSSLSRC}/crypto/asn1
 
-CFLAGS+=       -I${OPENSSLSRC}/crypto/asn1
+CPPFLAGS+=     -I${OPENSSLSRC}/crypto/asn1
 
 SRCS+= a_object.c a_bitstr.c a_utctm.c a_gentm.c a_time.c a_int.c a_octet.c \
        a_print.c a_type.c a_set.c a_dup.c a_d2i_fp.c a_i2d_fp.c a_bmp.c \
diff -r c7b66a115df6 -r 1848ce0003f5 lib/libcrypto/bf.inc
--- a/lib/libcrypto/bf.inc      Thu Jun 22 05:11:20 2000 +0000
+++ b/lib/libcrypto/bf.inc      Thu Jun 22 06:55:03 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bf.inc,v 1.1.1.1 2000/06/16 04:21:32 thorpej Exp $
+#      $NetBSD: bf.inc,v 1.1.1.1.2.1 2000/06/22 06:55:03 thorpej Exp $
 #
 #      @(#) Copyright (c) 1995 Simon J. Gerraty
 #
@@ -7,7 +7,7 @@
 
 .PATH: ${OPENSSLSRC}/crypto/bf
 
-CFLAGS+=       -I${OPENSSLSRC}/crypto/bf
+CPPFLAGS+=     -I${OPENSSLSRC}/crypto/bf
 
 SRCS+=bf_skey.c bf_ecb.c   bf_enc.c  bf_cfb64.c bf_ofb64.c
 
diff -r c7b66a115df6 -r 1848ce0003f5 lib/libcrypto/bio.inc
--- a/lib/libcrypto/bio.inc     Thu Jun 22 05:11:20 2000 +0000
+++ b/lib/libcrypto/bio.inc     Thu Jun 22 06:55:03 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bio.inc,v 1.1.1.1 2000/06/16 04:21:32 thorpej Exp $
+#      $NetBSD: bio.inc,v 1.1.1.1.2.1 2000/06/22 06:55:03 thorpej Exp $
 #
 #      @(#) Copyright (c) 1995 Simon J. Gerraty
 #
@@ -7,7 +7,7 @@
 
 .PATH: ${OPENSSLSRC}/crypto/bio
 
-CFLAGS+=       -I${OPENSSLSRC}/crypto/bio
+CPPFLAGS+=     -I${OPENSSLSRC}/crypto/bio
 
 SRCS+= bio_lib.c bio_cb.c bio_err.c \
        bss_mem.c bss_null.c bss_fd.c \
diff -r c7b66a115df6 -r 1848ce0003f5 lib/libcrypto/bn.inc
--- a/lib/libcrypto/bn.inc      Thu Jun 22 05:11:20 2000 +0000
+++ b/lib/libcrypto/bn.inc      Thu Jun 22 06:55:03 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bn.inc,v 1.1.1.1 2000/06/16 04:21:32 thorpej Exp $
+#      $NetBSD: bn.inc,v 1.1.1.1.2.1 2000/06/22 06:55:04 thorpej Exp $
 #
 #      @(#) Copyright (c) 1995 Simon J. Gerraty
 #
@@ -7,7 +7,7 @@
 
 .PATH: ${OPENSSLSRC}/crypto/bn
 
-CFLAGS+=       -I${OPENSSLSRC}/crypto/bn
+CPPFLAGS+=     -I${OPENSSLSRC}/crypto/bn
 
 SRCS+= bn_add.c bn_div.c bn_exp.c bn_lib.c bn_mul.c \
        bn_print.c bn_rand.c bn_shift.c bn_word.c bn_blind.c \
diff -r c7b66a115df6 -r 1848ce0003f5 lib/libcrypto/buffer.inc
--- a/lib/libcrypto/buffer.inc  Thu Jun 22 05:11:20 2000 +0000
+++ b/lib/libcrypto/buffer.inc  Thu Jun 22 06:55:03 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: buffer.inc,v 1.1.1.1 2000/06/16 04:21:32 thorpej Exp $
+#      $NetBSD: buffer.inc,v 1.1.1.1.2.1 2000/06/22 06:55:04 thorpej Exp $
 #
 #      @(#) Copyright (c) 1995 Simon J. Gerraty
 #
@@ -7,7 +7,7 @@
 
 .PATH: ${OPENSSLSRC}/crypto/buffer
 
-CFLAGS+=       -I${OPENSSLSRC}/crypto/buffer
+CPPFLAGS+=     -I${OPENSSLSRC}/crypto/buffer
 
 SRCS+= buffer.c buf_err.c
 
diff -r c7b66a115df6 -r 1848ce0003f5 lib/libcrypto/cast.inc
--- a/lib/libcrypto/cast.inc    Thu Jun 22 05:11:20 2000 +0000
+++ b/lib/libcrypto/cast.inc    Thu Jun 22 06:55:03 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: cast.inc,v 1.1.1.1 2000/06/16 04:21:32 thorpej Exp $
+#      $NetBSD: cast.inc,v 1.1.1.1.2.1 2000/06/22 06:55:04 thorpej Exp $
 #
 #      @(#) Copyright (c) 1995 Simon J. Gerraty
 #
@@ -7,7 +7,7 @@
 
 .PATH: ${OPENSSLSRC}/crypto/cast
 
-CFLAGS+=       -I${OPENSSLSRC}/crypto/cast
+CPPFLAGS+=     -I${OPENSSLSRC}/crypto/cast
 
 SRCS+=c_skey.c c_ecb.c c_enc.c  c_cfb64.c c_ofb64.c
 
diff -r c7b66a115df6 -r 1848ce0003f5 lib/libcrypto/comp.inc
--- a/lib/libcrypto/comp.inc    Thu Jun 22 05:11:20 2000 +0000
+++ b/lib/libcrypto/comp.inc    Thu Jun 22 06:55:03 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: comp.inc,v 1.1.1.1 2000/06/16 04:21:32 thorpej Exp $
+#      $NetBSD: comp.inc,v 1.1.1.1.2.1 2000/06/22 06:55:04 thorpej Exp $
 #
 #      @(#) Copyright (c) 1995 Simon J. Gerraty
 #
@@ -7,7 +7,7 @@
 
 .PATH: ${OPENSSLSRC}/crypto/comp
 
-CFLAGS+=       -I${OPENSSLSRC}/crypto/comp
+CPPFLAGS+=     -I${OPENSSLSRC}/crypto/comp
 
 SRCS+= comp_lib.c \
        c_rle.c c_zlib.c
diff -r c7b66a115df6 -r 1848ce0003f5 lib/libcrypto/conf.inc
--- a/lib/libcrypto/conf.inc    Thu Jun 22 05:11:20 2000 +0000
+++ b/lib/libcrypto/conf.inc    Thu Jun 22 06:55:03 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: conf.inc,v 1.1.1.1 2000/06/16 04:21:32 thorpej Exp $
+#      $NetBSD: conf.inc,v 1.1.1.1.2.1 2000/06/22 06:55:04 thorpej Exp $
 #
 #      @(#) Copyright (c) 1995 Simon J. Gerraty
 #
@@ -7,7 +7,7 @@
 
 .PATH: ${OPENSSLSRC}/crypto/conf
 
-CFLAGS+=       -I${OPENSSLSRC}/crypto/conf
+CPPFLAGS+=     -I${OPENSSLSRC}/crypto/conf
 
 SRCS+= conf.c conf_err.c
 
diff -r c7b66a115df6 -r 1848ce0003f5 lib/libcrypto/crypto.inc
--- a/lib/libcrypto/crypto.inc  Thu Jun 22 05:11:20 2000 +0000
+++ b/lib/libcrypto/crypto.inc  Thu Jun 22 06:55:03 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: crypto.inc,v 1.1.1.1 2000/06/16 04:21:32 thorpej Exp $
+#      $NetBSD: crypto.inc,v 1.1.1.1.2.1 2000/06/22 06:55:04 thorpej Exp $
 #
 #      @(#) Copyright (c) 1995 Simon J. Gerraty
 #
@@ -7,7 +7,7 @@
 
 .PATH: ${OPENSSLSRC}/crypto
 
-CFLAGS+=       -I${OPENSSLSRC}/crypto
+CPPFLAGS+=     -I${OPENSSLSRC}/crypto
 
 SRCS+= cryptlib.c mem.c cversion.c ex_data.c tmdiff.c cpt_err.c
 
diff -r c7b66a115df6 -r 1848ce0003f5 lib/libcrypto/des.inc
--- a/lib/libcrypto/des.inc     Thu Jun 22 05:11:20 2000 +0000
+++ b/lib/libcrypto/des.inc     Thu Jun 22 06:55:03 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: des.inc,v 1.1.1.1 2000/06/16 04:21:32 thorpej Exp $
+#      $NetBSD: des.inc,v 1.1.1.1.2.1 2000/06/22 06:55:04 thorpej Exp $
 #
 #      @(#) Copyright (c) 1995 Simon J. Gerraty
 #
@@ -7,7 +7,7 @@
 
 .PATH: ${OPENSSLSRC}/crypto/des
 
-CFLAGS+=       -I${OPENSSLSRC}/crypto/des
+CPPFLAGS+=     -I${OPENSSLSRC}/crypto/des
 
 SRCS+= set_key.c  ecb_enc.c  cbc_enc.c \
        ecb3_enc.c cfb64enc.c cfb64ede.c cfb_enc.c  ofb64ede.c \
diff -r c7b66a115df6 -r 1848ce0003f5 lib/libcrypto/dh.inc
--- a/lib/libcrypto/dh.inc      Thu Jun 22 05:11:20 2000 +0000
+++ b/lib/libcrypto/dh.inc      Thu Jun 22 06:55:03 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: dh.inc,v 1.1.1.1 2000/06/16 04:21:32 thorpej Exp $
+#      $NetBSD: dh.inc,v 1.1.1.1.2.1 2000/06/22 06:55:04 thorpej Exp $
 #
 #      @(#) Copyright (c) 1995 Simon J. Gerraty
 #
@@ -7,7 +7,7 @@
 
 .PATH: ${OPENSSLSRC}/crypto/dh
 
-CFLAGS+=       -I${OPENSSLSRC}/crypto/dh
+CPPFLAGS+=     -I${OPENSSLSRC}/crypto/dh
 
 SRCS+= dh_gen.c dh_key.c dh_lib.c dh_check.c dh_err.c
 
diff -r c7b66a115df6 -r 1848ce0003f5 lib/libcrypto/dsa.inc
--- a/lib/libcrypto/dsa.inc     Thu Jun 22 05:11:20 2000 +0000
+++ b/lib/libcrypto/dsa.inc     Thu Jun 22 06:55:03 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: dsa.inc,v 1.1.1.1 2000/06/16 04:21:32 thorpej Exp $
+#      $NetBSD: dsa.inc,v 1.1.1.1.2.1 2000/06/22 06:55:04 thorpej Exp $
 #
 #      @(#) Copyright (c) 1995 Simon J. Gerraty
 #
@@ -7,7 +7,7 @@
 
 .PATH: ${OPENSSLSRC}/crypto/dsa
 
-CFLAGS+=       -I${OPENSSLSRC}/crypto/dsa
+CPPFLAGS+=     -I${OPENSSLSRC}/crypto/dsa
 
 SRCS+= dsa_gen.c dsa_key.c dsa_lib.c dsa_asn1.c dsa_vrf.c dsa_sign.c dsa_err.c
 
diff -r c7b66a115df6 -r 1848ce0003f5 lib/libcrypto/err.inc
--- a/lib/libcrypto/err.inc     Thu Jun 22 05:11:20 2000 +0000
+++ b/lib/libcrypto/err.inc     Thu Jun 22 06:55:03 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: err.inc,v 1.1.1.1 2000/06/16 04:21:32 thorpej Exp $
+#      $NetBSD: err.inc,v 1.1.1.1.2.1 2000/06/22 06:55:04 thorpej Exp $
 #
 #      @(#) Copyright (c) 1995 Simon J. Gerraty
 #
@@ -7,7 +7,7 @@
 
 .PATH: ${OPENSSLSRC}/crypto/err
 
-CFLAGS+=       -I${OPENSSLSRC}/crypto/err
+CPPFLAGS+=     -I${OPENSSLSRC}/crypto/err
 
 SRCS+=err.c err_all.c err_prn.c
 
diff -r c7b66a115df6 -r 1848ce0003f5 lib/libcrypto/evp.inc
--- a/lib/libcrypto/evp.inc     Thu Jun 22 05:11:20 2000 +0000
+++ b/lib/libcrypto/evp.inc     Thu Jun 22 06:55:03 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: evp.inc,v 1.1.1.1 2000/06/16 04:21:32 thorpej Exp $
+#      $NetBSD: evp.inc,v 1.1.1.1.2.1 2000/06/22 06:55:04 thorpej Exp $
 #
 #      @(#) Copyright (c) 1995 Simon J. Gerraty
 #
@@ -7,7 +7,7 @@
 
 .PATH: ${OPENSSLSRC}/crypto/evp
 
-CFLAGS+=       -I${OPENSSLSRC}/crypto/evp
+CPPFLAGS+=     -I${OPENSSLSRC}/crypto/evp
 
 SRCS+= encode.c digest.c evp_enc.c evp_key.c \
        e_ecb_d.c e_cbc_d.c e_cfb_d.c e_ofb_d.c \
diff -r c7b66a115df6 -r 1848ce0003f5 lib/libcrypto/hmac.inc
--- a/lib/libcrypto/hmac.inc    Thu Jun 22 05:11:20 2000 +0000
+++ b/lib/libcrypto/hmac.inc    Thu Jun 22 06:55:03 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: hmac.inc,v 1.1.1.1 2000/06/16 04:21:32 thorpej Exp $
+#      $NetBSD: hmac.inc,v 1.1.1.1.2.1 2000/06/22 06:55:04 thorpej Exp $
 #
 #      @(#) Copyright (c) 1995 Simon J. Gerraty
 #
@@ -7,7 +7,7 @@
 
 .PATH: ${OPENSSLSRC}/crypto/hmac
 
-CFLAGS+=       -I${OPENSSLSRC}/crypto/hmac
+CPPFLAGS+=     -I${OPENSSLSRC}/crypto/hmac
 
 SRCS+=hmac.c
 
diff -r c7b66a115df6 -r 1848ce0003f5 lib/libcrypto/lhash.inc
--- a/lib/libcrypto/lhash.inc   Thu Jun 22 05:11:20 2000 +0000
+++ b/lib/libcrypto/lhash.inc   Thu Jun 22 06:55:03 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: lhash.inc,v 1.1.1.1 2000/06/16 04:21:32 thorpej Exp $
+#      $NetBSD: lhash.inc,v 1.1.1.1.2.1 2000/06/22 06:55:04 thorpej Exp $
 #
 #      @(#) Copyright (c) 1995 Simon J. Gerraty
 #
@@ -7,7 +7,7 @@
 
 .PATH: ${OPENSSLSRC}/crypto/lhash
 
-CFLAGS+=       -I${OPENSSLSRC}/crypto/lhash
+CPPFLAGS+=     -I${OPENSSLSRC}/crypto/lhash
 
 SRCS+=lhash.c lh_stats.c
 
diff -r c7b66a115df6 -r 1848ce0003f5 lib/libcrypto/md2.inc
--- a/lib/libcrypto/md2.inc     Thu Jun 22 05:11:20 2000 +0000
+++ b/lib/libcrypto/md2.inc     Thu Jun 22 06:55:03 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: md2.inc,v 1.1.1.1 2000/06/16 04:21:32 thorpej Exp $
+#      $NetBSD: md2.inc,v 1.1.1.1.2.1 2000/06/22 06:55:04 thorpej Exp $
 #
 #      @(#) Copyright (c) 1995 Simon J. Gerraty
 #
@@ -7,7 +7,7 @@
 
 .PATH: ${OPENSSLSRC}/crypto/md2