Use proto3 syntax consistently

PiperOrigin-RevId: 847792592

Author: schoppmp

willow/proto/shell/ciphertexts.proto

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-edition = "2023";
+syntax = "proto3";
 
 package secure_aggregation.willow;
 

willow/proto/shell/parameters.proto

@@ -12,10 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-edition = "2023";
+syntax = "proto3";
 
 package secure_aggregation.willow;
 
+option java_multiple_files = true;
+option java_outer_classname = "ParametersProto";
+
 // This proto defines how to pack an input vector into a KAHE plaintext.
 // An input vector is split into `num_packed_coeffs` many sub-vectors of
 // length `dimension` each. Each sub-vector is then packed into a single

willow/proto/willow/aggregation_config.proto

@@ -12,15 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-edition = "2023";
+syntax = "proto3";
 
 package secure_aggregation.willow;
 
-import "willow/proto/shell/ciphertexts.proto";
-import "willow/proto/zk/proofs.proto";
-
 option java_multiple_files = true;
-option java_outer_classname = "CommonProto";
+option java_outer_classname = "AggregationConfigProto";
 
 // The configuration of the aggregation as a proto.
 message AggregationConfigProto {

willow/proto/willow/decryptor.proto

@@ -17,6 +17,7 @@ syntax = "proto3";
 package secure_aggregation.willow;
 
 option java_multiple_files = true;
+option java_outer_classname = "DecryptorProto";
 
 message GenerateKeyRequest {
   // The key ID to use for the generated key. If the key with the given ID

willow/proto/willow/input_spec.proto

@@ -16,6 +16,9 @@ syntax = "proto3";
 
 package secure_aggregation.willow;
 
+option java_multiple_files = true;
+option java_outer_classname = "InputSpecProto";
+
 // This message describes the specification of the input data for the secure
 // aggregation protocol. It contains two lists of `InputVectorSpec` messages:
 // `metric_vector_specs` for metrics to be aggregated and

willow/proto/willow/key.proto

@@ -17,6 +17,7 @@ syntax = "proto3";
 package secure_aggregation.willow;
 
 option java_multiple_files = true;
+option java_outer_classname = "KeyProto";
 
 // A simple container for a Willow public cryptographic key that embeds the key
 // ID and the "raw" key material.

willow/proto/zk/proofs.proto

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-edition = "2023";
+syntax = "proto3";
 
 package secure_aggregation.willow;