params etc for linux experiments

brownie · Dec 31, 2010 · cd7ea4a · cd7ea4a
1 parent 1a9995a
commit cd7ea4a
Show file tree

Hide file tree

Showing 12 changed files with 4,721 additions and 126 deletions.
diff --git a/src/Makefile b/src/Makefile
@@ -76,8 +76,8 @@ CC = gcc
 CPP = g++
 
 # Extra libraries: where are ANTLR and boost installed?
-OPTDIR=/opt/local
-ANTLRDIR=/opt/local
+OPTDIR=/pro/brownie/local
+ANTLRDIR=/pro/brownie/local
 
 #TEST_BIN = brownieTest
 #TEST_SRCS = BrownieTester.cpp
@@ -139,7 +139,7 @@ ${UNITTEST_BIN}: $(CASHLIB_STATIC) $(UNITTEST_OBJS)
 parser:
 	cd ZKP && ${ANTLRDIR}/bin/antlr zkp.g
 
-Serialize.h.gch: Serialize.h
+Serialize.h.gch : Serialize.h
 	$(CPP) $(CFLAGS) -MD -c -o $@ $<
 
 %.o : %.cpp Serialize.h.gch
@@ -159,4 +159,4 @@ Serialize.h.gch: Serialize.h
 	  rm -f $*.d
 
 clean:
-	@rm -f ${TEST_BIN} ${ZKPTEST_BIN} *.o NTL/*.o ZKP/*.o *.d *.P $(CASHLIB_STATIC) $(DEPDIR)/*.P
+	@rm -f ${TEST_BIN} ${ZKPTEST_BIN} *.o NTL/*.o ZKP/*.o *.d *.P $(CASHLIB_STATIC) $(DEPDIR)/*.P *.gch
diff --git a/src/ZKP/examples/cl-obtain-temp.txt b/src/ZKP/examples/cl-obtain-temp.txt
@@ -0,0 +1 @@
+computation: given: group: pkGroup = <f,g_1,g_2,g_3,g_4,h> group: G1 = <g1,h1> group: G2 = <g2,h2> group: G3 = <g3,h3>  integers: x[1:l], stat, modSize compute: random integer in [0,2^(modSize+stat)): vprime C := h^vprime * for(i, 1:l, *, g_i^x_i) proof: given:group: pkGroup = <f,g_1,g_2,g_3,g_4,h> group: G1 = <g1,h1> group: G2 = <g2,h2> group: G3 = <g3,h3>  element in pkGroup: C element in G1: c_1 commitment to x_1: c_1 = g1^x_1*h1^r_1  element in G2: c_2 commitment to x_2: c_2 = g2^x_2*h2^r_2  element in G3: c_3 commitment to x_3: c_3 = g3^x_3*h3^r_3   integer: l_x prove knowledge of: integers: x[1:l], r[1:l] exponent in pkGroup: vprime such that: for(i, 1:l, range: (-(2^l_x-1)) <= x_i < 2^l_x) C = h^vprime * for(i, 1:l, *, g_i^x_i) c_1 = g1^x_1*h1^r_1 c_2 = g2^x_2*h2^r_2 c_3 = g3^x_3*h3^r_3 
diff --git a/src/bank.80.params b/src/bank.80.params
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <!DOCTYPE boost_serialization>
-<boost_serialization signature="serialization::archive" version="5">
+<boost_serialization signature="serialization::archive" version="8">
 <BankParameters class_id="0" tracking_level="1" version="0" object_id="_0">
 	<type>0</type>
 	<ecashGroup class_id="1" tracking_level="1" version="0" object_id="_1">
@@ -488,6 +488,14 @@
 		<count>11</count>
 		<item_version>0</item_version>
 		<item class_id="8" tracking_level="0" version="0">
+			<first class_id_reference="6" object_id_reference="_10"></first>
+			<second>256</second>
+		</item>
+		<item>
+			<first class_id_reference="6" object_id_reference="_11"></first>
+			<second>512</second>
+		</item>
+		<item>
 			<first class_id_reference="6" object_id_reference="_12"></first>
 			<second>1024</second>
 		</item>
@@ -523,14 +531,6 @@
 			<first class_id_reference="6" object_id_reference="_9"></first>
 			<second>128</second>
 		</item>
-		<item>
-			<first class_id_reference="6" object_id_reference="_10"></first>
-			<second>256</second>
-		</item>
-		<item>
-			<first class_id_reference="6" object_id_reference="_11"></first>
-			<second>512</second>
-		</item>
 	</groupToDenom>
 	<denomToGroup class_id="9" tracking_level="0" version="0">
 		<count>11</count>

diff --git a/src/buym1.xml b/src/buym1.xml
diff --git a/src/buym2.xml b/src/buym2.xml
diff --git a/src/public.80.arbiter b/src/public.80.arbiter
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <!DOCTYPE boost_serialization>
-<boost_serialization signature="serialization::archive" version="5">
+<boost_serialization signature="serialization::archive" version="8">
 <VEPublicKey class_id="0" tracking_level="0" version="0">
 	<secondGroup class_id="1" tracking_level="1" version="0" object_id="_0">
 		<Group class_id="2" tracking_level="0" version="0">

diff --git a/src/public.regular.80.arbiter b/src/public.regular.80.arbiter
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <!DOCTYPE boost_serialization>
-<boost_serialization signature="serialization::archive" version="5">
+<boost_serialization signature="serialization::archive" version="8">
 <VEPublicKey class_id="0" tracking_level="0" version="0">
 	<secondGroup class_id="1" tracking_level="1" version="0" object_id="_0">
 		<Group class_id="2" tracking_level="0" version="0">

diff --git a/src/secret.80.arbiter b/src/secret.80.arbiter
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <!DOCTYPE boost_serialization>
-<boost_serialization signature="serialization::archive" version="5">
+<boost_serialization signature="serialization::archive" version="8">
 <VESecretKey class_id="0" tracking_level="0" version="0">
 	<bigP class_id="1" tracking_level="0" version="0">
 		<mpz>11950762107909537350060952269521020645878695760193930282760603525846057587806554815094523521104902266848862172073516396515293981266544222696303689575679263</mpz>

diff --git a/src/secret.regular.80.arbiter b/src/secret.regular.80.arbiter
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <!DOCTYPE boost_serialization>
-<boost_serialization signature="serialization::archive" version="5">
+<boost_serialization signature="serialization::archive" version="8">
 <VESecretKey class_id="0" tracking_level="0" version="0">
 	<bigP class_id="1" tracking_level="0" version="0">
 		<mpz>9389546402921297587627049645265788268434092503338963492977327595532238933961807871220944819362533546753322479715354900107739479950030310351001827811230163</mpz>

diff --git a/src/tool.80.bank b/src/tool.80.bank
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <!DOCTYPE boost_serialization>
-<boost_serialization signature="serialization::archive" version="5">
+<boost_serialization signature="serialization::archive" version="8">
 <BankTool class_id="0" tracking_level="0" version="0">
 	<stat>80</stat>
 	<lx>160</lx>
@@ -499,14 +499,14 @@
 				<first class_id_reference="7" object_id_reference="_4"></first>
 				<second>4</second>
 			</item>
-			<item>
-				<first class_id_reference="7" object_id_reference="_5"></first>
-				<second>8</second>
-			</item>
 			<item>
 				<first class_id_reference="7" object_id_reference="_2"></first>
 				<second>1</second>
 			</item>
+			<item>
+				<first class_id_reference="7" object_id_reference="_5"></first>
+				<second>8</second>
+			</item>
 			<item>
 				<first class_id_reference="7" object_id_reference="_3"></first>
 				<second>2</second>
@@ -515,10 +515,6 @@
 				<first class_id_reference="7" object_id_reference="_7"></first>
 				<second>32</second>
 			</item>
-			<item>
-				<first class_id_reference="7" object_id_reference="_11"></first>
-				<second>512</second>
-			</item>
 			<item>
 				<first class_id_reference="7" object_id_reference="_8"></first>
 				<second>64</second>
@@ -531,6 +527,10 @@
 				<first class_id_reference="7" object_id_reference="_10"></first>
 				<second>256</second>
 			</item>
+			<item>
+				<first class_id_reference="7" object_id_reference="_11"></first>
+				<second>512</second>
+			</item>
 			<item>
 				<first class_id_reference="7" object_id_reference="_12"></first>
 				<second>1024</second>
@@ -1086,6 +1086,14 @@
 		<groupToDenom>
 			<count>11</count>
 			<item_version>0</item_version>
+			<item>
+				<first class_id_reference="7" object_id_reference="_23"></first>
+				<second>256</second>
+			</item>
+			<item>
+				<first class_id_reference="7" object_id_reference="_24"></first>
+				<second>512</second>
+			</item>
 			<item>
 				<first class_id_reference="7" object_id_reference="_25"></first>
 				<second>1024</second>
@@ -1122,14 +1130,6 @@
 				<first class_id_reference="7" object_id_reference="_22"></first>
 				<second>128</second>
 			</item>
-			<item>
-				<first class_id_reference="7" object_id_reference="_23"></first>
-				<second>256</second>
-			</item>
-			<item>
-				<first class_id_reference="7" object_id_reference="_24"></first>
-				<second>512</second>
-			</item>
 		</groupToDenom>
 		<denomToGroup>
 			<count>11</count>

diff --git a/src/tool.80.user b/src/tool.80.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <!DOCTYPE boost_serialization>
-<boost_serialization signature="serialization::archive" version="5">
+<boost_serialization signature="serialization::archive" version="8">
 <UserTool class_id="0" tracking_level="0" version="0">
 	<stat>80</stat>
 	<lx>160</lx>