diff options
| author | djm <> | 2009-01-09 12:15:52 +0000 |
|---|---|---|
| committer | djm <> | 2009-01-09 12:15:52 +0000 |
| commit | 23f8d96f0f508b8bef2602049feee9c44228d34c (patch) | |
| tree | a2a7787bc00e8f6a29153b8c6d9eb5e8f73d6269 /src/lib/libcrypto/ecdh | |
| parent | 30562050421d947c3eb3c10edde6e87730b17471 (diff) | |
| download | openbsd-23f8d96f0f508b8bef2602049feee9c44228d34c.tar.gz openbsd-23f8d96f0f508b8bef2602049feee9c44228d34c.tar.bz2 openbsd-23f8d96f0f508b8bef2602049feee9c44228d34c.zip | |
resolve conflicts
Diffstat (limited to 'src/lib/libcrypto/ecdh')
| -rw-r--r-- | src/lib/libcrypto/ecdh/Makefile | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/src/lib/libcrypto/ecdh/Makefile b/src/lib/libcrypto/ecdh/Makefile index 65d8904ee8..7a7b618eeb 100644 --- a/src/lib/libcrypto/ecdh/Makefile +++ b/src/lib/libcrypto/ecdh/Makefile | |||
| @@ -34,7 +34,7 @@ top: | |||
| 34 | all: lib | 34 | all: lib |
| 35 | 35 | ||
| 36 | lib: $(LIBOBJ) | 36 | lib: $(LIBOBJ) |
| 37 | $(AR) $(LIB) $(LIBOBJ) | 37 | $(ARX) $(LIB) $(LIBOBJ) |
| 38 | $(RANLIB) $(LIB) || echo Never mind. | 38 | $(RANLIB) $(LIB) || echo Never mind. |
| 39 | @touch lib | 39 | @touch lib |
| 40 | 40 | ||
| @@ -88,26 +88,27 @@ ech_key.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h | |||
| 88 | ech_key.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h | 88 | ech_key.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h |
| 89 | ech_key.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h | 89 | ech_key.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h |
| 90 | ech_key.o: ../../include/openssl/engine.h ../../include/openssl/evp.h | 90 | ech_key.o: ../../include/openssl/engine.h ../../include/openssl/evp.h |
| 91 | ech_key.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h | 91 | ech_key.o: ../../include/openssl/fips.h ../../include/openssl/lhash.h |
| 92 | ech_key.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h | 92 | ech_key.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h |
| 93 | ech_key.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h | 93 | ech_key.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h |
| 94 | ech_key.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h | 94 | ech_key.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h |
| 95 | ech_key.o: ../../include/openssl/sha.h ../../include/openssl/stack.h | 95 | ech_key.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h |
| 96 | ech_key.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h | 96 | ech_key.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h |
| 97 | ech_key.o: ../../include/openssl/x509_vfy.h ech_key.c ech_locl.h | 97 | ech_key.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h |
| 98 | ech_key.o: ech_key.c ech_locl.h | ||
| 98 | ech_lib.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h | 99 | ech_lib.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h |
| 99 | ech_lib.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h | 100 | ech_lib.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h |
| 100 | ech_lib.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h | 101 | ech_lib.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h |
| 101 | ech_lib.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h | 102 | ech_lib.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h |
| 102 | ech_lib.o: ../../include/openssl/engine.h ../../include/openssl/err.h | 103 | ech_lib.o: ../../include/openssl/engine.h ../../include/openssl/err.h |
| 103 | ech_lib.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h | 104 | ech_lib.o: ../../include/openssl/evp.h ../../include/openssl/fips.h |
| 104 | ech_lib.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h | 105 | ech_lib.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h |
| 105 | ech_lib.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h | 106 | ech_lib.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h |
| 106 | ech_lib.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h | 107 | ech_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h |
| 107 | ech_lib.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h | 108 | ech_lib.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h |
| 108 | ech_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h | 109 | ech_lib.o: ../../include/openssl/sha.h ../../include/openssl/stack.h |
| 109 | ech_lib.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h | 110 | ech_lib.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h |
| 110 | ech_lib.o: ech_lib.c ech_locl.h | 111 | ech_lib.o: ../../include/openssl/x509_vfy.h ech_lib.c ech_locl.h |
| 111 | ech_ossl.o: ../../e_os.h ../../include/openssl/asn1.h | 112 | ech_ossl.o: ../../e_os.h ../../include/openssl/asn1.h |
| 112 | ech_ossl.o: ../../include/openssl/bio.h ../../include/openssl/bn.h | 113 | ech_ossl.o: ../../include/openssl/bio.h ../../include/openssl/bn.h |
| 113 | ech_ossl.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h | 114 | ech_ossl.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h |