Fix OCSP has_version test It wasn't actually testing the case we were trying to test. The Go rewrite preserved the original Python bug. Now fix the bug. Change-Id: I4b7a570b71bc26f0c284f3c2a070579f2a917f82 Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/102868 Reviewed-by: Matt Mueller <mattm@google.com> Commit-Queue: David Benjamin <davidben@google.com> Auto-Submit: David Benjamin <davidben@google.com>

diff --git a/pki/testdata/ocsp_unittest/has_version.pem b/pki/testdata/ocsp_unittest/has_version.pem
index 4dcb7bc..d40e197 100644
--- a/pki/testdata/ocsp_unittest/has_version.pem
+++ b/pki/testdata/ocsp_unittest/has_version.pem

@@ -18,30 +18,31 @@
 
     Signature Algorithm: sha1WithRSAEncryption
     Signature Value:
-        0f:89:81:dc:c9:44:a5:27:55:4f:dd:1c:14:70:30:f6:aa:17:
-        cd:20:4a:71:3e:00:d1:1f:97:bb:6c:48:d5:10:0c:19:55:24:
-        b3:69:97:9c:96:82:90:85:8c:44:3c:f7:ef:03:88:a3:61:12:
-        b7:48:5a:0b:c1:89:aa:bf:18:9a:54:fb:11:e6:e4:2d:49:93:
-        55:1b:eb:37:87:e9:56:bb:d7:35:7a:35:32:78:8d:92:15:39:
-        3d:96:65:c0:ac:fe:90:5f:43:94:78:ab:11:5c:e3:70:aa:00:
-        7e:b3:cc:75:af:b1:08:5f:c9:b8:5d:0e:34:cf:fa:79:43:83:
-        5c:c1:4b:09:a7:d0:d3:71:74:90:87:e2:14:ae:f1:e3:e3:ff:
-        b3:df:c4:3b:6d:6e:4c:cd:65:4e:44:ab:e2:7d:53:e7:21:40:
-        64:f1:bf:c6:bc:3b:74:31:de:40:30:c2:b1:0c:95:e0:70:00:
-        fe:07:c7:52:12:68:43:16:08:08:bb:cf:ba:13:06:1c:3d:e4:
-        e5:48:59:5d:e5:1e:fa:f7:c4:21:9a:97:02:4e:0f:5d:43:b1:
-        b0:9f:61:55:81:c2:da:69:88:5a:4e:26:90:d9:9f:df:e5:34:
-        94:9c:95:03:5b:f5:09:21:ce:18:d6:e0:be:b1:25:6e:00:8c:
-        51:c0:bf:34
+        93:c7:30:35:32:0c:4e:f6:bc:fb:a0:b8:81:8c:9f:89:ae:48:
+        7c:02:4b:8b:87:35:c0:71:ce:da:38:8f:a4:ff:9e:42:91:25:
+        2d:90:79:fc:d3:a8:15:f3:ce:4f:30:fb:fa:73:ec:43:67:50:
+        54:e7:c8:3d:5e:8d:ed:6e:e3:77:9d:9b:e3:14:bb:0b:ff:6d:
+        3b:b4:a5:08:e5:1f:aa:ac:6a:7e:19:6d:74:96:31:ec:33:fd:
+        e3:b3:54:ac:62:c5:e7:a8:79:d0:81:da:57:40:93:7a:f0:04:
+        5f:20:5e:01:00:41:5c:00:f6:c8:49:66:4a:19:bc:fd:b1:ed:
+        c7:2c:d6:96:d7:7d:79:5e:33:56:f7:b4:71:d1:cd:af:a6:5e:
+        fd:f9:6d:9d:47:cb:9d:e8:84:25:52:02:b9:20:95:0e:b1:01:
+        07:fa:0d:3b:b2:2c:81:2c:6d:32:66:07:9c:40:92:87:0a:98:
+        25:ca:63:c5:fd:fe:84:47:d1:36:25:97:31:4e:cb:b0:d2:62:
+        dd:91:0c:a1:61:72:e8:24:ef:03:ce:d1:8c:1c:a5:6d:58:71:
+        8a:87:da:50:49:f4:c3:b1:d6:86:d0:01:b6:26:01:71:02:67:
+        50:be:4f:44:f1:a2:68:f6:a0:ee:c1:d7:bb:1d:59:69:dd:26:
+        a7:82:9c:54
 -----BEGIN OCSP RESPONSE-----
-MIIBugoBAKCCAbMwggGvBgkrBgEFBQcwAQEEggGgMIIBnDCBhaEhMB8xHTAbBgNVBAMMFFRlc3Q
-gSW50ZXJtZWRpYXRlIENBGA8yMDE3MDMwMjAwMDAwMFowTzBNMDgwBwYFKw4DAhoEFESbHFsxxu
-mZCWZSPknD93PAJBkKBBQ0XLKLHYzdbL/49cz0ZSHoeo3zkQIBBYAAGA8yMDE3MDMwMTAwMDAwM
-FowDQYJKoZIhvcNAQEFBQADggEBAA+JgdzJRKUnVU/dHBRwMPaqF80gSnE+ANEfl7tsSNUQDBlV
-JLNpl5yWgpCFjEQ89+8DiKNhErdIWgvBiaq/GJpU+xHm5C1Jk1Ub6zeH6Va71zV6NTJ4jZIVOT2
-WZcCs/pBfQ5R4qxFc43CqAH6zzHWvsQhfybhdDjTP+nlDg1zBSwmn0NNxdJCH4hSu8ePj/7PfxD
-ttbkzNZU5Eq+J9U+chQGTxv8a8O3Qx3kAwwrEMleBwAP4Hx1ISaEMWCAi7z7oTBhw95OVIWV3lH
-vr3xCGalwJOD11DsbCfYVWBwtppiFpOJpDZn9/lNJSclQNb9QkhzhjW4L6xJW4AjFHAvzQ=
+MIIBvwoBAKCCAbgwggG0BgkrBgEFBQcwAQEEggGlMIIBoTCBiqADAgEAoSEwHzEdMBsGA1UEAww
+UVGVzdCBJbnRlcm1lZGlhdGUgQ0EYDzIwMTcwMzAyMDAwMDAwWjBPME0wODAHBgUrDgMCGgQURJ
+scWzHG6ZkJZlI+ScP3c8AkGQoEFDRcsosdjN1sv/j1zPRlIeh6jfORAgEFgAAYDzIwMTcwMzAxM
+DAwMDAwWjANBgkqhkiG9w0BAQUFAAOCAQEAk8cwNTIMTva8+6C4gYyfia5IfAJLi4c1wHHO2jiP
+pP+eQpElLZB5/NOoFfPOTzD7+nPsQ2dQVOfIPV6N7W7jd52b4xS7C/9tO7SlCOUfqqxqfhltdJY
+x7DP947NUrGLF56h50IHaV0CTevAEXyBeAQBBXAD2yElmShm8/bHtxyzWltd9eV4zVve0cdHNr6
+Ze/fltnUfLneiEJVICuSCVDrEBB/oNO7IsgSxtMmYHnECShwqYJcpjxf3+hEfRNiWXMU7LsNJi3
+ZEMoWFy6CTvA87RjBylbVhxiofaUEn0w7HWhtABtiYBcQJnUL5PRPGiaPag7sHXux1Zad0mp4Kc
+VA==
 -----END OCSP RESPONSE-----
 
 $ openssl x509 -text < [CA CERTIFICATE]

diff --git a/pki/testdata/ocsp_unittest/make_ocsp.go b/pki/testdata/ocsp_unittest/make_ocsp.go
index c9e74cb..1086d22 100644
--- a/pki/testdata/ocsp_unittest/make_ocsp.go
+++ b/pki/testdata/ocsp_unittest/make_ocsp.go

@@ -387,7 +387,7 @@
 		})
 	} else {
 		tbsBuilder.AddASN1(cbasn1.SEQUENCE, func(respData *cryptobyte.Builder) {
-			if resp.version != nil && *resp.version != 1 {
+			if resp.version != nil {
 				respData.AddASN1(cbasn1.Tag(0).ContextSpecific().Constructed(), func(b *cryptobyte.Builder) {
 					b.AddASN1Int64(int64(*resp.version))
 				})
@@ -632,8 +632,8 @@
 		"has_version",
 		"Includes a default version V1",
 		ca, cert,
-		// TODO(davidben): This test actually does not include it.
-		create(ocspResponse{version: new(1)}),
+		// v1 is encoded with value zero.
+		create(ocspResponse{version: new(0)}),
 	)
 
 	store(