Deleted Added
full compact
magic.h (279315) magic.h (289677)
1/*-
2 * Copyright (c) 2014 The FreeBSD Foundation
3 * All rights reserved.
4 *
5 * This software was developed by Edward Tomasz Napierala under sponsorship
6 * from the FreeBSD Foundation.
7 *
8 * Redistribution and use in source and binary forms, with or without

--- 12 unchanged lines hidden (view full) ---

21 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
22 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
23 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
24 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
27 * SUCH DAMAGE.
28 *
1/*-
2 * Copyright (c) 2014 The FreeBSD Foundation
3 * All rights reserved.
4 *
5 * This software was developed by Edward Tomasz Napierala under sponsorship
6 * from the FreeBSD Foundation.
7 *
8 * Redistribution and use in source and binary forms, with or without

--- 12 unchanged lines hidden (view full) ---

21 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
22 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
23 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
24 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
27 * SUCH DAMAGE.
28 *
29 * $FreeBSD: head/usr.sbin/uefisign/magic.h 279315 2015-02-26 09:15:24Z trasz $
29 * $FreeBSD: head/usr.sbin/uefisign/magic.h 289677 2015-10-21 05:37:09Z eadler $
30 *
31 */
32
33/*
34 * This file contains Authenticode-specific ASN.1 "configuration", used,
35 * after being processed by asprintf(3), as an input to ASN1_generate_nconf(3).
36 */
37static const char *magic_fmt =

--- 7 unchanged lines hidden (view full) ---

45"# SPC_PE_IMAGE_DATAOBJ\n"
46"a = OID:1.3.6.1.4.1.311.2.1.15\n"
47"b = SEQUENCE:SpcPeImageData\n"
48"\n"
49"[SpcPeImageData]\n"
50"a = FORMAT:HEX,BITSTRING:00\n"
51/*
52 * Well, there should be some other struct here, "SPCLink", but it doesn't
30 *
31 */
32
33/*
34 * This file contains Authenticode-specific ASN.1 "configuration", used,
35 * after being processed by asprintf(3), as an input to ASN1_generate_nconf(3).
36 */
37static const char *magic_fmt =

--- 7 unchanged lines hidden (view full) ---

45"# SPC_PE_IMAGE_DATAOBJ\n"
46"a = OID:1.3.6.1.4.1.311.2.1.15\n"
47"b = SEQUENCE:SpcPeImageData\n"
48"\n"
49"[SpcPeImageData]\n"
50"a = FORMAT:HEX,BITSTRING:00\n"
51/*
52 * Well, there should be some other struct here, "SPCLink", but it doesn't
53 * appear to be neccessary for UEFI, and I have no idea how to synthesize it,
53 * appear to be necessary for UEFI, and I have no idea how to synthesize it,
54 * as it uses the CHOICE type.
55 */
56"\n"
57"[DigestInfo]\n"
58"a = SEQUENCE:AlgorithmIdentifier\n"
59/*
60 * Here goes the digest computed from PE headers and sections.
61 */
62"b = FORMAT:HEX,OCTETSTRING:%s\n"
63"\n"
64"[AlgorithmIdentifier]\n"
65"a = OBJECT:sha256\n"
66"b = NULL\n";
54 * as it uses the CHOICE type.
55 */
56"\n"
57"[DigestInfo]\n"
58"a = SEQUENCE:AlgorithmIdentifier\n"
59/*
60 * Here goes the digest computed from PE headers and sections.
61 */
62"b = FORMAT:HEX,OCTETSTRING:%s\n"
63"\n"
64"[AlgorithmIdentifier]\n"
65"a = OBJECT:sha256\n"
66"b = NULL\n";