|
1 In-house patch created to clear any merge conflicts from source in archive |
|
2 repo to build properly on Solaris. |
|
3 |
|
4 --- CACKey-0.7.4/asn1-x509.c 2016-05-19 14:16:48.225215019 -0400 |
|
5 +++ CACKey-0.7.4/asn1-x509.c 2015-07-16 12:20:20.000000000 -0400 |
|
6 @@ -70,7 +70,6 @@ |
|
7 outbuf->tag = *buf_p; |
|
8 buf_p++; |
|
9 buflen--; |
|
10 -<<<<<<< HEAD |
|
11 if (buflen == 0) { |
|
12 return(-1); |
|
13 } |
|
14 @@ -80,22 +79,6 @@ |
|
15 return(_asn1_x509_read_asn1_object(buf_p, buflen, args)); |
|
16 } |
|
17 |
|
18 -======= |
|
19 - |
|
20 - /* NULL Tag -- no size is required */ |
|
21 - if (outbuf->tag == 0x00) { |
|
22 - outbuf->size = 0; |
|
23 - outbuf->asn1rep_len = 1; |
|
24 - outbuf->asn1rep = buf; |
|
25 - |
|
26 - return(_asn1_x509_read_asn1_object(buf_p, buflen, args)); |
|
27 - } |
|
28 - |
|
29 - if (buflen == 0) { |
|
30 - return(-1); |
|
31 - } |
|
32 - |
|
33 ->>>>>>> trunk |
|
34 small_object_size = *buf_p; |
|
35 buf_p++; |
|
36 buflen--; |
|
37 @@ -112,10 +95,6 @@ |
|
38 |
|
39 buf_p++; |
|
40 buflen--; |
|
41 -<<<<<<< HEAD |
|
42 -======= |
|
43 - |
|
44 ->>>>>>> trunk |
|
45 if (buflen == 0) { |
|
46 break; |
|
47 } |
|
48 @@ -128,14 +107,7 @@ |
|
49 return(-1); |
|
50 } |
|
51 |
|
52 -<<<<<<< HEAD |
|
53 outbuf->contents = buf_p; |
|
54 -======= |
|
55 - if (buflen != 0) { |
|
56 - outbuf->contents = buf_p; |
|
57 - } |
|
58 - |
|
59 ->>>>>>> trunk |
|
60 outbuf->asn1rep_len = outbuf->size + (buf_p - buf); |
|
61 outbuf->asn1rep = buf; |
|
62 |
|
63 @@ -163,41 +135,29 @@ |
|
64 |
|
65 read_ret = asn1_x509_read_asn1_object(buf, buflen, &outbuf->wholething, NULL); |
|
66 if (read_ret != 0) { |
|
67 -<<<<<<< HEAD |
|
68 -======= |
|
69 CACKEY_DEBUG_PRINTF("Failed at reading the contents from the wrapper") |
|
70 |
|
71 ->>>>>>> trunk |
|
72 return(-1); |
|
73 } |
|
74 |
|
75 read_ret = asn1_x509_read_asn1_object(outbuf->wholething.contents, outbuf->wholething.size, &outbuf->certificate, NULL); |
|
76 if (read_ret != 0) { |
|
77 -<<<<<<< HEAD |
|
78 -======= |
|
79 CACKEY_DEBUG_PRINTF("Failed at reading the certificate from the contents"); |
|
80 |
|
81 ->>>>>>> trunk |
|
82 return(-1); |
|
83 } |
|
84 |
|
85 read_ret = asn1_x509_read_asn1_object(outbuf->certificate.contents, outbuf->certificate.size, &outbuf->version, &outbuf->serial_number, &outbuf->signature_algo, &outbuf->issuer, &outbuf->validity, &outbuf->subject, &outbuf->pubkeyinfo, NULL); |
|
86 if (read_ret != 0) { |
|
87 -<<<<<<< HEAD |
|
88 -======= |
|
89 CACKEY_DEBUG_PRINTF("Failed at reading the certificate components from the certificate"); |
|
90 |
|
91 ->>>>>>> trunk |
|
92 return(-1); |
|
93 } |
|
94 |
|
95 read_ret = asn1_x509_read_asn1_object(outbuf->pubkeyinfo.contents, outbuf->pubkeyinfo.size, &outbuf->pubkey_algoid, &outbuf->pubkey, NULL); |
|
96 if (read_ret != 0) { |
|
97 -<<<<<<< HEAD |
|
98 -======= |
|
99 CACKEY_DEBUG_PRINTF("Failed at reading the public key from the certificate components"); |
|
100 |
|
101 ->>>>>>> trunk |
|
102 return(-1); |
|
103 } |
|
104 |
|
105 @@ -242,12 +202,9 @@ |
|
106 |
|
107 read_ret = asn1_x509_read_object(x509_der_buf, x509_der_buf_len, &x509); |
|
108 if (read_ret != 0) { |
|
109 -<<<<<<< HEAD |
|
110 -======= |
|
111 CACKEY_DEBUG_PRINTF("Unable to read serial number from a %lu byte buffer", x509_der_buf_len); |
|
112 CACKEY_DEBUG_PRINTBUF("X.509 DER:", x509_der_buf, x509_der_buf_len); |
|
113 |
|
114 ->>>>>>> trunk |
|
115 return(-1); |
|
116 } |
|
117 |
|
118 @@ -420,11 +377,7 @@ |
|
119 |
|
120 offset = 0; |
|
121 while (1) { |
|
122 -<<<<<<< HEAD |
|
123 - read_ret = asn1_x509_read_asn1_object(whole_thing.contents + offset, whole_thing.size - offset, ¤t_set, NULL); |
|
124 -======= |
|
125 read_ret = asn1_x509_read_asn1_object(((unsigned char *) whole_thing.contents) + offset, whole_thing.size - offset, ¤t_set, NULL); |
|
126 ->>>>>>> trunk |
|
127 if (read_ret != 0) { |
|
128 break; |
|
129 } |