Mercurial > mxe-octave
annotate src/msvc-nettle-1.patch @ 3715:cffa8fa688ed
build: update --enable-stable option to reflect that it is the default
* configure.ac: change --enable-stable help to --disable-stable
author | John Donoghue |
---|---|
date | Tue, 23 Sep 2014 07:57:16 -0400 |
parents | 5e2851e5d048 |
children |
rev | line source |
---|---|
3287
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
1 diff -ur nettle-2.7-orig/Makefile.in nettle-2.7/Makefile.in |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
2 --- nettle-2.7-orig/Makefile.in 2013-11-05 14:51:27 -0500 |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
3 +++ nettle-2.7/Makefile.in 2013-11-05 18:04:21 -0500 |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
4 @@ -16,7 +16,7 @@ |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
5 |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
6 OPT_ASM_SOURCES = @OPT_ASM_SOURCES@ |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
7 |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
8 -SUBDIRS = tools testsuite examples |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
9 +SUBDIRS = tools #testsuite examples |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
10 |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
11 include config.make |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
12 |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
13 @@ -197,6 +197,9 @@ |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
14 hogweed_OBJS = $(hogweed_SOURCES:.c=.$(OBJEXT)) $(OPT_ASM_SOURCES:.asm=.$(OBJEXT)) |
3077
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
15 hogweed_PURE_OBJS = $(hogweed_OBJS:.$(OBJEXT)=.p$(OBJEXT)) |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
16 |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
17 +$(nettle_OBJS): PRE_CPPFLAGS += -DBUILDING_NETTLE |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
18 +$(hogweed_OBJS): PRE_CPPFLAGS += -DBUILDING_HOGWEED |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
19 + |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
20 libnettle.a: $(nettle_OBJS) |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
21 -rm -f $@ |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
22 $(AR) $(ARFLAGS) $@ $(nettle_OBJS) |
3287
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
23 @@ -252,7 +255,7 @@ |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
24 -o twofishdata$(EXEEXT_FOR_BUILD) |
3077
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
25 |
3287
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
26 shadata$(EXEEXT_FOR_BUILD): shadata.c |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
27 - $(CC_FOR_BUILD) `test -f shadata.c || echo '$(srcdir)/'`shadata.c -lm \ |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
28 + $(CC_FOR_BUILD) `test -f shadata.c || echo '$(srcdir)/'`shadata.c \ |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
29 -o shadata$(EXEEXT_FOR_BUILD) |
3077
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
30 |
3287
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
31 gcmdata$(EXEEXT_FOR_BUILD): gcmdata.c |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
32 @@ -340,10 +343,10 @@ |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
33 && test -s $@T && mv -f $@T $@ |
3077
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
34 |
3287
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
35 .s.$(OBJEXT): |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
36 - $(COMPILE) $(CCPIC_MAYBE) -c $< |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
37 + $(COMPILE_AS) $(CCPIC_MAYBE) -c $< |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
38 |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
39 .s.p$(OBJEXT): |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
40 - $(COMPILE) $(SHLIBCFLAGS) -c $< -o $@ |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
41 + $(COMPILE_AS) $(SHLIBCFLAGS) -c $< -o $@ |
3077
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
42 |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
43 # Texinfo rules |
3287
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
44 .texinfo.info: |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
45 diff -ur nettle-2.7-orig/config.make.in nettle-2.7/config.make.in |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
46 --- nettle-2.7-orig/config.make.in 2013-04-24 09:26:53 -0400 |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
47 +++ nettle-2.7/config.make.in 2013-11-05 14:56:57 -0500 |
3077
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
48 @@ -1,6 +1,7 @@ |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
49 # Makefile settings shared between Makefiles. |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
50 |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
51 CC = @CC@ |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
52 +CCAS = @CCAS@ |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
53 CXX = @CXX@ |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
54 CFLAGS = @CFLAGS@ |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
55 CXXFLAGS = @CXXFLAGS@ |
3287
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
56 @@ -72,6 +73,7 @@ |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
57 # flags before CPPFLAGS and LDFLAGS. |
3077
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
58 |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
59 COMPILE = $(CC) $(PRE_CPPFLAGS) $(CPPFLAGS) $(DEFS) $(CFLAGS) $(CCPIC) $(DEP_FLAGS) |
3287
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
60 +COMPILE_AS = $(CCAS) $(PRE_CPPFLAGS) $(CPPFLAGS) $(DEFS) $(CXXFLAGS) $(CCPIC) $(DEP_FLAGS) |
3077
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
61 COMPILE_CXX = $(CXX) $(PRE_CPPFLAGS) $(CPPFLAGS) $(DEFS) $(CXXFLAGS) $(CCPIC) $(DEP_FLAGS) |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
62 LINK = $(CC) $(CFLAGS) $(PRE_LDFLAGS) $(LDFLAGS) |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
63 LINK_CXX = $(CXX) $(CXXFLAGS) $(PRE_LDFLAGS) $(LDFLAGS) |
3287
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
64 diff -ur nettle-2.7-orig/configure nettle-2.7/configure |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
65 --- nettle-2.7-orig/configure 2013-04-24 09:26:53 -0400 |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
66 +++ nettle-2.7/configure 2013-11-05 14:59:15 -0500 |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
67 @@ -693,6 +693,7 @@ |
3077
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
68 LDFLAGS |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
69 CFLAGS |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
70 CC |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
71 +CCAS |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
72 host_os |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
73 host_vendor |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
74 host_cpu |
3287
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
75 @@ -4764,7 +4765,7 @@ |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
76 vmlal.u32 q1, d0, d1 |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
77 |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
78 EOF |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
79 -gmp_assemble="$CC $CFLAGS $CPPFLAGS -c conftest.s >conftest.out 2>&1" |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
80 +gmp_assemble="$CCAS $CFLAGS $CPPFLAGS -c conftest.s >conftest.out 2>&1" |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
81 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_assemble\""; } >&5 |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
82 (eval $gmp_assemble) 2>&5 |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
83 ac_status=$? |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
84 @@ -5106,7 +5107,7 @@ |
3077
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
85 .size foo, .Lend - foo |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
86 |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
87 EOF |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
88 -gmp_assemble="$CC $CFLAGS $CPPFLAGS -c conftest.s >conftest.out 2>&1" |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
89 +gmp_assemble="$CCAS $CFLAGS $CPPFLAGS -c conftest.s >conftest.out 2>&1" |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
90 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_assemble\""; } >&5 |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
91 (eval $gmp_assemble) 2>&5 |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
92 ac_status=$? |
3287
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
93 @@ -5142,7 +5143,7 @@ |
3077
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
94 .size foo, .Lend - foo |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
95 |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
96 EOF |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
97 -gmp_assemble="$CC $CFLAGS $CPPFLAGS -c conftest.s >conftest.out 2>&1" |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
98 +gmp_assemble="$CCAS $CFLAGS $CPPFLAGS -c conftest.s >conftest.out 2>&1" |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
99 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_assemble\""; } >&5 |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
100 (eval $gmp_assemble) 2>&5 |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
101 ac_status=$? |
3287
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
102 @@ -5217,7 +5218,7 @@ |
3077
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
103 .align 3 |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
104 |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
105 EOF |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
106 -gmp_assemble="$CC $CFLAGS $CPPFLAGS -c conftest.s >conftest.out 2>&1" |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
107 +gmp_assemble="$CCAS $CFLAGS $CPPFLAGS -c conftest.s >conftest.out 2>&1" |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
108 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_assemble\""; } >&5 |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
109 (eval $gmp_assemble) 2>&5 |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
110 ac_status=$? |
3287
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
111 diff -ur nettle-2.7-orig/ecc-curve.h nettle-2.7/ecc-curve.h |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
112 --- nettle-2.7-orig/ecc-curve.h 2013-04-24 09:26:52 -0400 |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
113 +++ nettle-2.7/ecc-curve.h 2013-11-05 15:27:46 -0500 |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
114 @@ -25,6 +25,18 @@ |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
115 #ifndef NETTLE_ECC_CURVE_H_INCLUDED |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
116 #define NETTLE_ECC_CURVE_H_INCLUDED |
3077
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
117 |
3287
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
118 +#ifndef HOGWEED_EXPORTED |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
119 +# ifdef _MSC_VER |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
120 +# ifdef BUILDING_HOGWEED |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
121 +# define HOGWEED_EXPORTED __declspec(dllexport) |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
122 +# else |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
123 +# define HOGWEED_EXPORTED __declspec(dllimport) |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
124 +# endif |
3077
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
125 +# else |
3287
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
126 +# define HOGWEED_EXPORTED |
3077
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
127 +# endif |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
128 +#endif |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
129 + |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
130 #ifdef __cplusplus |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
131 extern "C" { |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
132 #endif |
3287
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
133 @@ -32,11 +44,11 @@ |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
134 /* The contets of this struct is internal. */ |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
135 struct ecc_curve; |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
136 |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
137 -extern const struct ecc_curve nettle_secp_192r1; |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
138 -extern const struct ecc_curve nettle_secp_224r1; |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
139 -extern const struct ecc_curve nettle_secp_256r1; |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
140 -extern const struct ecc_curve nettle_secp_384r1; |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
141 -extern const struct ecc_curve nettle_secp_521r1; |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
142 +extern HOGWEED_EXPORTED const struct ecc_curve nettle_secp_192r1; |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
143 +extern HOGWEED_EXPORTED const struct ecc_curve nettle_secp_224r1; |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
144 +extern HOGWEED_EXPORTED const struct ecc_curve nettle_secp_256r1; |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
145 +extern HOGWEED_EXPORTED const struct ecc_curve nettle_secp_384r1; |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
146 +extern HOGWEED_EXPORTED const struct ecc_curve nettle_secp_521r1; |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
147 |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
148 #ifdef __cplusplus |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
149 } |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
150 diff -ur nettle-2.7-orig/examples/Makefile.in nettle-2.7/examples/Makefile.in |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
151 --- nettle-2.7-orig/examples/Makefile.in 2013-11-05 14:51:27 -0500 |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
152 +++ nettle-2.7/examples/Makefile.in 2013-11-05 15:19:45 -0500 |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
153 @@ -11,7 +11,7 @@ |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
154 PRE_LDFLAGS = -L.. |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
155 |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
156 OPENSSL_LIBFLAGS = @OPENSSL_LIBFLAGS@ |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
157 -BENCH_LIBS = @BENCH_LIBS@ -lm |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
158 +BENCH_LIBS = @BENCH_LIBS@ |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
159 |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
160 HOGWEED_TARGETS = rsa-keygen$(EXEEXT) rsa-sign$(EXEEXT) \ |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
161 rsa-verify$(EXEEXT) rsa-encrypt$(EXEEXT) rsa-decrypt$(EXEEXT) \ |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
162 diff -ur nettle-2.7-orig/nettle-meta.h nettle-2.7/nettle-meta.h |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
163 --- nettle-2.7-orig/nettle-meta.h 2013-04-24 09:26:52 -0400 |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
164 +++ nettle-2.7/nettle-meta.h 2013-11-05 15:23:56 -0500 |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
165 @@ -28,6 +28,18 @@ |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
166 |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
167 #include "nettle-types.h" |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
168 |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
169 +#ifndef NETTLE_EXPORTED |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
170 +# ifdef _MSC_VER |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
171 +# ifdef BUILDING_NETTLE |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
172 +# define NETTLE_EXPORTED __declspec(dllexport) |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
173 +# else |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
174 +# define NETTLE_EXPORTED __declspec(dllimport) |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
175 +# endif |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
176 +# else |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
177 +# define NETTLE_EXPORTED |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
178 +# endif |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
179 +#endif |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
180 + |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
181 #ifdef __cplusplus |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
182 extern "C" { |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
183 #endif |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
184 @@ -97,32 +109,32 @@ |
3077
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
185 } |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
186 |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
187 /* null-terminated list of ciphers implemented by this version of nettle */ |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
188 -extern const struct nettle_cipher * const nettle_ciphers[]; |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
189 +extern NETTLE_EXPORTED const struct nettle_cipher * const nettle_ciphers[]; |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
190 |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
191 -extern const struct nettle_cipher nettle_aes128; |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
192 -extern const struct nettle_cipher nettle_aes192; |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
193 -extern const struct nettle_cipher nettle_aes256; |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
194 +extern NETTLE_EXPORTED const struct nettle_cipher nettle_aes128; |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
195 +extern NETTLE_EXPORTED const struct nettle_cipher nettle_aes192; |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
196 +extern NETTLE_EXPORTED const struct nettle_cipher nettle_aes256; |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
197 |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
198 -extern const struct nettle_cipher nettle_arcfour128; |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
199 +extern NETTLE_EXPORTED const struct nettle_cipher nettle_arcfour128; |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
200 |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
201 -extern const struct nettle_cipher nettle_camellia128; |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
202 -extern const struct nettle_cipher nettle_camellia192; |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
203 -extern const struct nettle_cipher nettle_camellia256; |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
204 +extern NETTLE_EXPORTED const struct nettle_cipher nettle_camellia128; |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
205 +extern NETTLE_EXPORTED const struct nettle_cipher nettle_camellia192; |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
206 +extern NETTLE_EXPORTED const struct nettle_cipher nettle_camellia256; |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
207 |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
208 -extern const struct nettle_cipher nettle_cast128; |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
209 +extern NETTLE_EXPORTED const struct nettle_cipher nettle_cast128; |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
210 |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
211 -extern const struct nettle_cipher nettle_serpent128; |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
212 -extern const struct nettle_cipher nettle_serpent192; |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
213 -extern const struct nettle_cipher nettle_serpent256; |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
214 +extern NETTLE_EXPORTED const struct nettle_cipher nettle_serpent128; |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
215 +extern NETTLE_EXPORTED const struct nettle_cipher nettle_serpent192; |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
216 +extern NETTLE_EXPORTED const struct nettle_cipher nettle_serpent256; |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
217 |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
218 -extern const struct nettle_cipher nettle_twofish128; |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
219 -extern const struct nettle_cipher nettle_twofish192; |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
220 -extern const struct nettle_cipher nettle_twofish256; |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
221 +extern NETTLE_EXPORTED const struct nettle_cipher nettle_twofish128; |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
222 +extern NETTLE_EXPORTED const struct nettle_cipher nettle_twofish192; |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
223 +extern NETTLE_EXPORTED const struct nettle_cipher nettle_twofish256; |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
224 |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
225 -extern const struct nettle_cipher nettle_arctwo40; |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
226 -extern const struct nettle_cipher nettle_arctwo64; |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
227 -extern const struct nettle_cipher nettle_arctwo128; |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
228 -extern const struct nettle_cipher nettle_arctwo_gutmann128; |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
229 +extern NETTLE_EXPORTED const struct nettle_cipher nettle_arctwo40; |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
230 +extern NETTLE_EXPORTED const struct nettle_cipher nettle_arctwo64; |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
231 +extern NETTLE_EXPORTED const struct nettle_cipher nettle_arctwo128; |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
232 +extern NETTLE_EXPORTED const struct nettle_cipher nettle_arctwo_gutmann128; |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
233 |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
234 struct nettle_hash |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
235 { |
3287
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
236 @@ -153,22 +165,22 @@ |
3077
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
237 } |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
238 |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
239 /* null-terminated list of digests implemented by this version of nettle */ |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
240 -extern const struct nettle_hash * const nettle_hashes[]; |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
241 +extern NETTLE_EXPORTED const struct nettle_hash * const nettle_hashes[]; |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
242 |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
243 -extern const struct nettle_hash nettle_md2; |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
244 -extern const struct nettle_hash nettle_md4; |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
245 -extern const struct nettle_hash nettle_md5; |
3287
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
246 -extern const struct nettle_hash nettle_gosthash94; |
3077
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
247 -extern const struct nettle_hash nettle_ripemd160; |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
248 -extern const struct nettle_hash nettle_sha1; |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
249 -extern const struct nettle_hash nettle_sha224; |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
250 -extern const struct nettle_hash nettle_sha256; |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
251 -extern const struct nettle_hash nettle_sha384; |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
252 -extern const struct nettle_hash nettle_sha512; |
3287
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
253 -extern const struct nettle_hash nettle_sha3_224; |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
254 -extern const struct nettle_hash nettle_sha3_256; |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
255 -extern const struct nettle_hash nettle_sha3_384; |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
256 -extern const struct nettle_hash nettle_sha3_512; |
3077
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
257 +extern NETTLE_EXPORTED const struct nettle_hash nettle_md2; |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
258 +extern NETTLE_EXPORTED const struct nettle_hash nettle_md4; |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
259 +extern NETTLE_EXPORTED const struct nettle_hash nettle_md5; |
3287
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
260 +extern NETTLE_EXPORTED const struct nettle_hash nettle_gosthash94; |
3077
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
261 +extern NETTLE_EXPORTED const struct nettle_hash nettle_ripemd160; |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
262 +extern NETTLE_EXPORTED const struct nettle_hash nettle_sha1; |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
263 +extern NETTLE_EXPORTED const struct nettle_hash nettle_sha224; |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
264 +extern NETTLE_EXPORTED const struct nettle_hash nettle_sha256; |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
265 +extern NETTLE_EXPORTED const struct nettle_hash nettle_sha384; |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
266 +extern NETTLE_EXPORTED const struct nettle_hash nettle_sha512; |
3287
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
267 +extern NETTLE_EXPORTED const struct nettle_hash nettle_sha3_224; |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
268 +extern NETTLE_EXPORTED const struct nettle_hash nettle_sha3_256; |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
269 +extern NETTLE_EXPORTED const struct nettle_hash nettle_sha3_384; |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
270 +extern NETTLE_EXPORTED const struct nettle_hash nettle_sha3_512; |
3077
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
271 |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
272 struct nettle_armor |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
273 { |
3287
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
274 @@ -220,10 +232,10 @@ |
3077
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
275 } |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
276 |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
277 /* null-terminated list of armor schemes implemented by this version of nettle */ |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
278 -extern const struct nettle_armor * const nettle_armors[]; |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
279 +extern NETTLE_EXPORTED const struct nettle_armor * const nettle_armors[]; |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
280 |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
281 -extern const struct nettle_armor nettle_base64; |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
282 -extern const struct nettle_armor nettle_base16; |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
283 +extern NETTLE_EXPORTED const struct nettle_armor nettle_base64; |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
284 +extern NETTLE_EXPORTED const struct nettle_armor nettle_base16; |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
285 |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
286 #ifdef __cplusplus |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
287 } |
3287
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
288 diff -ur nettle-2.7-orig/tools/sexp-conv.c nettle-2.7/tools/sexp-conv.c |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
289 --- nettle-2.7-orig/tools/sexp-conv.c 2013-04-24 09:26:53 -0400 |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
290 +++ nettle-2.7/tools/sexp-conv.c 2013-11-05 15:04:03 -0500 |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
291 @@ -225,7 +225,10 @@ |
3077
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
292 |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
293 for (;;) |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
294 { |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
295 - static const struct nettle_hash *hashes[] = |
3287
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
296 +#ifndef _MSC_VER |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
297 + static |
5e2851e5d048
* src/msvc-nettle-1.patch: Update to nettle 2.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3077
diff
changeset
|
298 +#endif |
3077
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
299 + const struct nettle_hash *hashes[] = |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
300 { &nettle_md5, &nettle_sha1, &nettle_sha256, NULL }; |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
301 |
9c56d108c141
[MSVC] enable nettle compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
302 static const struct option options[] = |