fixup pkinit-ec.c (kdc and lib/krb5) includes
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:
@@ -34,6 +34,7 @@
|
||||
*/
|
||||
|
||||
#include <config.h>
|
||||
#include <roken.h>
|
||||
|
||||
#ifdef PKINIT
|
||||
|
||||
@@ -58,16 +59,10 @@
|
||||
#define HEIM_NO_CRYPTO_HDRS
|
||||
#endif /* HAVE_HCRYPTO_W_OPENSSL */
|
||||
|
||||
#ifdef HAVE_STDINT_H
|
||||
#include <stdint.h>
|
||||
#endif
|
||||
|
||||
#define NO_HCRYPTO_POLLUTION
|
||||
|
||||
#include <hcrypto/des.h>
|
||||
|
||||
#include "kdc_locl.h"
|
||||
|
||||
#include <hcrypto/des.h>
|
||||
#include <heim_asn1.h>
|
||||
#include <rfc2459_asn1.h>
|
||||
#include <cms_asn1.h>
|
||||
|
@@ -59,8 +59,6 @@
|
||||
#define HEIM_NO_CRYPTO_HDRS
|
||||
#endif
|
||||
|
||||
#include <config.h>
|
||||
|
||||
/*
|
||||
* 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
|
||||
@@ -74,9 +72,8 @@
|
||||
*/
|
||||
#define NO_HCRYPTO_POLLUTION
|
||||
|
||||
#include <hcrypto/des.h>
|
||||
#include "krb5_locl.h"
|
||||
|
||||
#include <hcrypto/des.h>
|
||||
#include <cms_asn1.h>
|
||||
#include <pkcs8_asn1.h>
|
||||
#include <pkcs9_asn1.h>
|
||||
|
Reference in New Issue
Block a user