6277N/AIn-house patch created to clear any merge conflicts from source in archive

6277N/Arepo to build properly on Solaris.

6277N/A

6277N/A--- CACKey-0.7.4/asn1-x509.c 2016-05-19 14:16:48.225215019 -0400

6277N/A+++ CACKey-0.7.4/asn1-x509.c 2015-07-16 12:20:20.000000000 -0400

6277N/A@@ -70,7 +70,6 @@

6277N/A outbuf->tag = *buf_p;

6277N/A buf_p++;

6277N/A buflen--;

6277N/A-<<<<<<< HEAD

6277N/A if (buflen == 0) {

6277N/A return(-1);

6277N/A }

6277N/A@@ -80,22 +79,6 @@

6277N/A return(_asn1_x509_read_asn1_object(buf_p, buflen, args));

6277N/A }

6277N/A

6277N/A-=======

6277N/A-

6277N/A- /* NULL Tag -- no size is required */

6277N/A- if (outbuf->tag == 0x00) {

6277N/A- outbuf->size = 0;

6277N/A- outbuf->asn1rep_len = 1;

6277N/A- outbuf->asn1rep = buf;

6277N/A-

6277N/A- return(_asn1_x509_read_asn1_object(buf_p, buflen, args));

6277N/A- }

6277N/A-

6277N/A- if (buflen == 0) {

6277N/A- return(-1);

6277N/A- }

6277N/A-

6277N/A->>>>>>> trunk

6277N/A small_object_size = *buf_p;

6277N/A buf_p++;

6277N/A buflen--;

6277N/A@@ -112,10 +95,6 @@

6277N/A

6277N/A buf_p++;

6277N/A buflen--;

6277N/A-<<<<<<< HEAD

6277N/A-=======

6277N/A-

6277N/A->>>>>>> trunk

6277N/A if (buflen == 0) {

6277N/A break;

6277N/A }

6277N/A@@ -128,14 +107,7 @@

6277N/A return(-1);

6277N/A }

6277N/A

6277N/A-<<<<<<< HEAD

6277N/A outbuf->contents = buf_p;

6277N/A-=======

6277N/A- if (buflen != 0) {

6277N/A- outbuf->contents = buf_p;

6277N/A- }

6277N/A-

6277N/A->>>>>>> trunk

6277N/A outbuf->asn1rep_len = outbuf->size + (buf_p - buf);

6277N/A outbuf->asn1rep = buf;

6277N/A

6277N/A@@ -163,41 +135,29 @@

6277N/A

6277N/A read_ret = asn1_x509_read_asn1_object(buf, buflen, &outbuf->wholething, NULL);

6277N/A if (read_ret != 0) {

6277N/A-<<<<<<< HEAD

6277N/A-=======

6277N/A CACKEY_DEBUG_PRINTF("Failed at reading the contents from the wrapper")

6277N/A

6277N/A->>>>>>> trunk

6277N/A return(-1);

6277N/A }

6277N/A

6277N/A read_ret = asn1_x509_read_asn1_object(outbuf->wholething.contents, outbuf->wholething.size, &outbuf->certificate, NULL);

6277N/A if (read_ret != 0) {

6277N/A-<<<<<<< HEAD

6277N/A-=======

6277N/A CACKEY_DEBUG_PRINTF("Failed at reading the certificate from the contents");

6277N/A

6277N/A->>>>>>> trunk

6277N/A return(-1);

6277N/A }

6277N/A

6277N/A 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);

6277N/A if (read_ret != 0) {

6277N/A-<<<<<<< HEAD

6277N/A-=======

6277N/A CACKEY_DEBUG_PRINTF("Failed at reading the certificate components from the certificate");

6277N/A

6277N/A->>>>>>> trunk

6277N/A return(-1);

6277N/A }

6277N/A

6277N/A read_ret = asn1_x509_read_asn1_object(outbuf->pubkeyinfo.contents, outbuf->pubkeyinfo.size, &outbuf->pubkey_algoid, &outbuf->pubkey, NULL);

6277N/A if (read_ret != 0) {

6277N/A-<<<<<<< HEAD

6277N/A-=======

6277N/A CACKEY_DEBUG_PRINTF("Failed at reading the public key from the certificate components");

6277N/A

6277N/A->>>>>>> trunk

6277N/A return(-1);

6277N/A }

6277N/A

6277N/A@@ -242,12 +202,9 @@

6277N/A

6277N/A read_ret = asn1_x509_read_object(x509_der_buf, x509_der_buf_len, &x509);

6277N/A if (read_ret != 0) {

6277N/A-<<<<<<< HEAD

6277N/A-=======

6277N/A CACKEY_DEBUG_PRINTF("Unable to read serial number from a %lu byte buffer", x509_der_buf_len);

6277N/A CACKEY_DEBUG_PRINTBUF("X.509 DER:", x509_der_buf, x509_der_buf_len);

6277N/A

6277N/A->>>>>>> trunk

6277N/A return(-1);

6277N/A }

6277N/A

6277N/A@@ -420,11 +377,7 @@

6277N/A

6277N/A offset = 0;

6277N/A while (1) {

6277N/A-<<<<<<< HEAD

6277N/A- read_ret = asn1_x509_read_asn1_object(whole_thing.contents + offset, whole_thing.size - offset, &current_set, NULL);

6277N/A-=======

6277N/A read_ret = asn1_x509_read_asn1_object(((unsigned char *) whole_thing.contents) + offset, whole_thing.size - offset, &current_set, NULL);

6277N/A->>>>>>> trunk

6277N/A if (read_ret != 0) {

6277N/A break;

6277N/A }