]>
Commit | Line | Data |
---|---|---|
92ae11e3 SS |
1 | From 2d6fe5942218ee8f24eb6ccd8ffec5fab65c170b Mon Sep 17 00:00:00 2001 |
2 | From: Lukas Slebodnik <lukas.slebodnik@intrak.sk> | |
3 | Date: Fri, 18 Nov 2016 17:29:44 +0100 | |
4 | Subject: [PATCH 32/39] UTIL: Fix implicit declaration of function 'htobe32' | |
5 | MIME-Version: 1.0 | |
6 | Content-Type: text/plain; charset=UTF-8 | |
7 | Content-Transfer-Encoding: 8bit | |
8 | ||
9 | Include internal wrapper header file for endian related functions. | |
10 | The "util/sss_endian.h" include available header file on different | |
11 | platform or it provides compatible macros in the worst case. | |
12 | ||
13 | Breakage noticed when building SSSD on FreeBSD | |
14 | ||
15 | CC src/util/cert/nss/libsss_cert_la-cert.lo | |
16 | src/util/cert/nss/cert.c: In function 'cert_to_ssh_key': | |
17 | src/util/cert/nss/cert.c:358: error: implicit declaration of function 'htobe32' | |
18 | gmake[2]: *** [Makefile:12421: src/util/cert/nss/libsss_cert_la-cert.lo] Error 1 | |
19 | gmake[2]: Leaving directory '/root/sssd_from_git' | |
20 | gmake[1]: *** [Makefile:20050: all-recursive] Error 1 | |
21 | gmake[1]: Leaving directory '/root/sssd_from_git' | |
22 | gmake: *** [Makefile:7116: all] Error 2 | |
23 | ||
24 | Reviewed-by: Fabiano FidĂȘncio <fidencio@redhat.com> | |
25 | (cherry picked from commit 58aa8d645fa95641431a2828e985f80c7fc36465) | |
26 | (cherry picked from commit a70351fddb9c26763b2bf658f56ff043a7b3db6f) | |
27 | --- | |
28 | src/util/cert/libcrypto/cert.c | 1 + | |
29 | src/util/cert/nss/cert.c | 1 + | |
30 | 2 files changed, 2 insertions(+) | |
31 | ||
32 | diff --git a/src/util/cert/libcrypto/cert.c b/src/util/cert/libcrypto/cert.c | |
33 | index aba598d7c..c54db86bb 100644 | |
34 | --- a/src/util/cert/libcrypto/cert.c | |
35 | +++ b/src/util/cert/libcrypto/cert.c | |
36 | @@ -22,6 +22,7 @@ | |
37 | #include <openssl/pem.h> | |
38 | ||
39 | #include "util/util.h" | |
40 | +#include "util/sss_endian.h" | |
41 | ||
42 | errno_t sss_cert_der_to_pem(TALLOC_CTX *mem_ctx, const uint8_t *der_blob, | |
43 | size_t der_size, char **pem, size_t *pem_size) | |
44 | diff --git a/src/util/cert/nss/cert.c b/src/util/cert/nss/cert.c | |
45 | index b5e0ff961..9d31cfe9b 100644 | |
46 | --- a/src/util/cert/nss/cert.c | |
47 | +++ b/src/util/cert/nss/cert.c | |
48 | @@ -31,6 +31,7 @@ | |
49 | #include "util/crypto/sss_crypto.h" | |
50 | #include "util/crypto/nss/nss_util.h" | |
51 | #include "util/cert.h" | |
52 | +#include "util/sss_endian.h" | |
53 | ||
54 | #define NS_CERT_HEADER "-----BEGIN CERTIFICATE-----" | |
55 | #define NS_CERT_TRAILER "-----END CERTIFICATE-----" | |
56 | -- | |
57 | 2.11.0 | |
58 |