oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

fixup pkinit-ec.c (kdc and lib/krb5) includes

Browse Source 
All source files must start with

  include <config.h>
  include <roken.h>

when krb5_locl.h or kdc_locl.h are includes, they must come before
other Heimdal include files.

Do not include stdint.h when roken.h is included.
Do not include config.h more than once.

Change-Id: I0baecb5d48317996f48b1a6c41b051f42f2fde61
This commit is contained in:
Jeffrey Altman
2016-04-17 17:10:08 -05:00
parent 87d56ef018
commit ce4fd05b12
2 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
kdc/pkinit-ec.c
View File

@@ -34,6 +34,7 @@
*/ */
#include <config.h> #include <config.h>
#include <roken.h>
#ifdef PKINIT #ifdef PKINIT
@@ -58,16 +59,10 @@
#define HEIM_NO_CRYPTO_HDRS #define HEIM_NO_CRYPTO_HDRS
#endif /* HAVE_HCRYPTO_W_OPENSSL */ #endif /* HAVE_HCRYPTO_W_OPENSSL */
#ifdef HAVE_STDINT_H
#include <stdint.h>
#endif
#define NO_HCRYPTO_POLLUTION #define NO_HCRYPTO_POLLUTION
#include <hcrypto/des.h>
#include "kdc_locl.h" #include "kdc_locl.h"
#include <hcrypto/des.h>
#include <heim_asn1.h> #include <heim_asn1.h>
#include <rfc2459_asn1.h> #include <rfc2459_asn1.h>
#include <cms_asn1.h> #include <cms_asn1.h>

5
lib/krb5/pkinit-ec.c
View File

@@ -59,8 +59,6 @@
#define HEIM_NO_CRYPTO_HDRS #define HEIM_NO_CRYPTO_HDRS
#endif #endif
#include <config.h>
/* /*
* NO_HCRYPTO_POLLUTION -> don't refer to hcrypto type/function names * NO_HCRYPTO_POLLUTION -> don't refer to hcrypto type/function names
* that we don't need in this file and which would clash with OpenSSL's * that we don't need in this file and which would clash with OpenSSL's
@@ -74,9 +72,8 @@
*/ */
#define NO_HCRYPTO_POLLUTION #define NO_HCRYPTO_POLLUTION
#include <hcrypto/des.h>
#include "krb5_locl.h" #include "krb5_locl.h"
#include <hcrypto/des.h>
#include <cms_asn1.h> #include <cms_asn1.h>
#include <pkcs8_asn1.h> #include <pkcs8_asn1.h>
#include <pkcs9_asn1.h> #include <pkcs9_asn1.h>