Skip to content

Commit

Permalink
fixup pkinit-ec.c (kdc and lib/krb5) includes
Browse files Browse the repository at this point in the history
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
  • Loading branch information
jaltman committed Apr 17, 2016
1 parent 87d56ef commit ce4fd05
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 11 deletions.
9 changes: 2 additions & 7 deletions kdc/pkinit-ec.c
Expand Up @@ -34,6 +34,7 @@
*/

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

#ifdef PKINIT

Expand All @@ -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>
Expand Down
5 changes: 1 addition & 4 deletions lib/krb5/pkinit-ec.c
Expand Up @@ -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
Expand All @@ -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>
Expand Down

0 comments on commit ce4fd05

Please sign in to comment.