diff options
Diffstat (limited to 'src/lib/libcrypto/engine')
-rw-r--r-- | src/lib/libcrypto/engine/eng_cnf.c | 4 | ||||
-rw-r--r-- | src/lib/libcrypto/engine/eng_ctrl.c | 4 | ||||
-rw-r--r-- | src/lib/libcrypto/engine/eng_dyn.c | 4 | ||||
-rw-r--r-- | src/lib/libcrypto/engine/eng_fat.c | 3 | ||||
-rw-r--r-- | src/lib/libcrypto/engine/eng_init.c | 4 | ||||
-rw-r--r-- | src/lib/libcrypto/engine/eng_lib.c | 3 | ||||
-rw-r--r-- | src/lib/libcrypto/engine/eng_list.c | 4 | ||||
-rw-r--r-- | src/lib/libcrypto/engine/eng_openssl.c | 3 | ||||
-rw-r--r-- | src/lib/libcrypto/engine/eng_pkey.c | 4 | ||||
-rw-r--r-- | src/lib/libcrypto/engine/eng_table.c | 3 | ||||
-rw-r--r-- | src/lib/libcrypto/engine/tb_asnmth.c | 4 | ||||
-rw-r--r-- | src/lib/libcrypto/engine/tb_cipher.c | 4 | ||||
-rw-r--r-- | src/lib/libcrypto/engine/tb_digest.c | 4 | ||||
-rw-r--r-- | src/lib/libcrypto/engine/tb_pkmeth.c | 4 |
14 files changed, 38 insertions, 14 deletions
diff --git a/src/lib/libcrypto/engine/eng_cnf.c b/src/lib/libcrypto/engine/eng_cnf.c index d9cc5986db..acdebda6a6 100644 --- a/src/lib/libcrypto/engine/eng_cnf.c +++ b/src/lib/libcrypto/engine/eng_cnf.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: eng_cnf.c,v 1.12 2014/07/10 13:58:22 jsing Exp $ */ | 1 | /* $OpenBSD: eng_cnf.c,v 1.13 2015/02/11 03:19:37 doug Exp $ */ |
2 | /* Written by Stephen Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Stephen Henson (steve@openssl.org) for the OpenSSL |
3 | * project 2001. | 3 | * project 2001. |
4 | */ | 4 | */ |
@@ -58,6 +58,8 @@ | |||
58 | 58 | ||
59 | #include <string.h> | 59 | #include <string.h> |
60 | 60 | ||
61 | #include <openssl/err.h> | ||
62 | |||
61 | #include "eng_int.h" | 63 | #include "eng_int.h" |
62 | #include <openssl/conf.h> | 64 | #include <openssl/conf.h> |
63 | 65 | ||
diff --git a/src/lib/libcrypto/engine/eng_ctrl.c b/src/lib/libcrypto/engine/eng_ctrl.c index ea31bfc582..bf832dc626 100644 --- a/src/lib/libcrypto/engine/eng_ctrl.c +++ b/src/lib/libcrypto/engine/eng_ctrl.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: eng_ctrl.c,v 1.9 2014/07/10 13:58:22 jsing Exp $ */ | 1 | /* $OpenBSD: eng_ctrl.c,v 1.10 2015/02/11 03:19:37 doug Exp $ */ |
2 | /* ==================================================================== | 2 | /* ==================================================================== |
3 | * Copyright (c) 1999-2001 The OpenSSL Project. All rights reserved. | 3 | * Copyright (c) 1999-2001 The OpenSSL Project. All rights reserved. |
4 | * | 4 | * |
@@ -55,6 +55,8 @@ | |||
55 | 55 | ||
56 | #include <string.h> | 56 | #include <string.h> |
57 | 57 | ||
58 | #include <openssl/err.h> | ||
59 | |||
58 | #include "eng_int.h" | 60 | #include "eng_int.h" |
59 | 61 | ||
60 | /* When querying a ENGINE-specific control command's 'description', this string | 62 | /* When querying a ENGINE-specific control command's 'description', this string |
diff --git a/src/lib/libcrypto/engine/eng_dyn.c b/src/lib/libcrypto/engine/eng_dyn.c index dfb35a8403..c78d9f6856 100644 --- a/src/lib/libcrypto/engine/eng_dyn.c +++ b/src/lib/libcrypto/engine/eng_dyn.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: eng_dyn.c,v 1.12 2014/07/13 16:03:09 beck Exp $ */ | 1 | /* $OpenBSD: eng_dyn.c,v 1.13 2015/02/11 03:19:37 doug Exp $ */ |
2 | /* Written by Geoff Thorpe (geoff@geoffthorpe.net) for the OpenSSL | 2 | /* Written by Geoff Thorpe (geoff@geoffthorpe.net) for the OpenSSL |
3 | * project 2001. | 3 | * project 2001. |
4 | */ | 4 | */ |
@@ -58,6 +58,8 @@ | |||
58 | 58 | ||
59 | #include <string.h> | 59 | #include <string.h> |
60 | 60 | ||
61 | #include <openssl/err.h> | ||
62 | |||
61 | #include "eng_int.h" | 63 | #include "eng_int.h" |
62 | #include <openssl/dso.h> | 64 | #include <openssl/dso.h> |
63 | 65 | ||
diff --git a/src/lib/libcrypto/engine/eng_fat.c b/src/lib/libcrypto/engine/eng_fat.c index 9805729922..b54757d8ad 100644 --- a/src/lib/libcrypto/engine/eng_fat.c +++ b/src/lib/libcrypto/engine/eng_fat.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: eng_fat.c,v 1.14 2014/07/10 22:45:57 jsing Exp $ */ | 1 | /* $OpenBSD: eng_fat.c,v 1.15 2015/02/11 03:19:37 doug Exp $ */ |
2 | /* ==================================================================== | 2 | /* ==================================================================== |
3 | * Copyright (c) 1999-2001 The OpenSSL Project. All rights reserved. | 3 | * Copyright (c) 1999-2001 The OpenSSL Project. All rights reserved. |
4 | * | 4 | * |
@@ -62,6 +62,7 @@ | |||
62 | 62 | ||
63 | #include <openssl/opensslconf.h> | 63 | #include <openssl/opensslconf.h> |
64 | 64 | ||
65 | #include <openssl/err.h> | ||
65 | #include "eng_int.h" | 66 | #include "eng_int.h" |
66 | #include <openssl/conf.h> | 67 | #include <openssl/conf.h> |
67 | 68 | ||
diff --git a/src/lib/libcrypto/engine/eng_init.c b/src/lib/libcrypto/engine/eng_init.c index caebf5d822..b50e22594c 100644 --- a/src/lib/libcrypto/engine/eng_init.c +++ b/src/lib/libcrypto/engine/eng_init.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: eng_init.c,v 1.6 2014/06/12 15:49:29 deraadt Exp $ */ | 1 | /* $OpenBSD: eng_init.c,v 1.7 2015/02/11 03:19:37 doug Exp $ */ |
2 | /* ==================================================================== | 2 | /* ==================================================================== |
3 | * Copyright (c) 1999-2001 The OpenSSL Project. All rights reserved. | 3 | * Copyright (c) 1999-2001 The OpenSSL Project. All rights reserved. |
4 | * | 4 | * |
@@ -53,6 +53,8 @@ | |||
53 | * | 53 | * |
54 | */ | 54 | */ |
55 | 55 | ||
56 | #include <openssl/err.h> | ||
57 | |||
56 | #include "eng_int.h" | 58 | #include "eng_int.h" |
57 | 59 | ||
58 | /* Initialise a engine type for use (or up its functional reference count | 60 | /* Initialise a engine type for use (or up its functional reference count |
diff --git a/src/lib/libcrypto/engine/eng_lib.c b/src/lib/libcrypto/engine/eng_lib.c index b3b9213d87..f5f54fc657 100644 --- a/src/lib/libcrypto/engine/eng_lib.c +++ b/src/lib/libcrypto/engine/eng_lib.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: eng_lib.c,v 1.10 2014/10/22 13:02:04 jsing Exp $ */ | 1 | /* $OpenBSD: eng_lib.c,v 1.11 2015/02/11 03:19:37 doug Exp $ */ |
2 | /* Written by Geoff Thorpe (geoff@geoffthorpe.net) for the OpenSSL | 2 | /* Written by Geoff Thorpe (geoff@geoffthorpe.net) for the OpenSSL |
3 | * project 2000. | 3 | * project 2000. |
4 | */ | 4 | */ |
@@ -58,6 +58,7 @@ | |||
58 | 58 | ||
59 | #include <string.h> | 59 | #include <string.h> |
60 | 60 | ||
61 | #include <openssl/err.h> | ||
61 | #include <openssl/rand.h> | 62 | #include <openssl/rand.h> |
62 | 63 | ||
63 | #include "eng_int.h" | 64 | #include "eng_int.h" |
diff --git a/src/lib/libcrypto/engine/eng_list.c b/src/lib/libcrypto/engine/eng_list.c index 78e978116a..740db90852 100644 --- a/src/lib/libcrypto/engine/eng_list.c +++ b/src/lib/libcrypto/engine/eng_list.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: eng_list.c,v 1.16 2015/02/07 13:19:15 doug Exp $ */ | 1 | /* $OpenBSD: eng_list.c,v 1.17 2015/02/11 03:19:37 doug Exp $ */ |
2 | /* Written by Geoff Thorpe (geoff@geoffthorpe.net) for the OpenSSL | 2 | /* Written by Geoff Thorpe (geoff@geoffthorpe.net) for the OpenSSL |
3 | * project 2000. | 3 | * project 2000. |
4 | */ | 4 | */ |
@@ -66,6 +66,8 @@ | |||
66 | 66 | ||
67 | #include <openssl/opensslconf.h> | 67 | #include <openssl/opensslconf.h> |
68 | 68 | ||
69 | #include <openssl/err.h> | ||
70 | |||
69 | #include "cryptlib.h" | 71 | #include "cryptlib.h" |
70 | #include "eng_int.h" | 72 | #include "eng_int.h" |
71 | 73 | ||
diff --git a/src/lib/libcrypto/engine/eng_openssl.c b/src/lib/libcrypto/engine/eng_openssl.c index f1a58df857..ed123d7107 100644 --- a/src/lib/libcrypto/engine/eng_openssl.c +++ b/src/lib/libcrypto/engine/eng_openssl.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: eng_openssl.c,v 1.9 2014/07/11 08:44:48 jsing Exp $ */ | 1 | /* $OpenBSD: eng_openssl.c,v 1.10 2015/02/11 03:19:37 doug Exp $ */ |
2 | /* Written by Geoff Thorpe (geoff@geoffthorpe.net) for the OpenSSL | 2 | /* Written by Geoff Thorpe (geoff@geoffthorpe.net) for the OpenSSL |
3 | * project 2000. | 3 | * project 2000. |
4 | */ | 4 | */ |
@@ -69,6 +69,7 @@ | |||
69 | #include <openssl/crypto.h> | 69 | #include <openssl/crypto.h> |
70 | #include <openssl/dso.h> | 70 | #include <openssl/dso.h> |
71 | #include <openssl/engine.h> | 71 | #include <openssl/engine.h> |
72 | #include <openssl/err.h> | ||
72 | #include <openssl/evp.h> | 73 | #include <openssl/evp.h> |
73 | #include <openssl/pem.h> | 74 | #include <openssl/pem.h> |
74 | #include <openssl/rand.h> | 75 | #include <openssl/rand.h> |
diff --git a/src/lib/libcrypto/engine/eng_pkey.c b/src/lib/libcrypto/engine/eng_pkey.c index dc832450a6..74b1ce03b7 100644 --- a/src/lib/libcrypto/engine/eng_pkey.c +++ b/src/lib/libcrypto/engine/eng_pkey.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: eng_pkey.c,v 1.5 2014/06/22 12:05:09 jsing Exp $ */ | 1 | /* $OpenBSD: eng_pkey.c,v 1.6 2015/02/11 03:19:37 doug Exp $ */ |
2 | /* ==================================================================== | 2 | /* ==================================================================== |
3 | * Copyright (c) 1999-2001 The OpenSSL Project. All rights reserved. | 3 | * Copyright (c) 1999-2001 The OpenSSL Project. All rights reserved. |
4 | * | 4 | * |
@@ -53,6 +53,8 @@ | |||
53 | * | 53 | * |
54 | */ | 54 | */ |
55 | 55 | ||
56 | #include <openssl/err.h> | ||
57 | |||
56 | #include "eng_int.h" | 58 | #include "eng_int.h" |
57 | 59 | ||
58 | /* Basic get/set stuff */ | 60 | /* Basic get/set stuff */ |
diff --git a/src/lib/libcrypto/engine/eng_table.c b/src/lib/libcrypto/engine/eng_table.c index 9d52075a76..342c76fa1b 100644 --- a/src/lib/libcrypto/engine/eng_table.c +++ b/src/lib/libcrypto/engine/eng_table.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: eng_table.c,v 1.7 2014/07/11 08:44:48 jsing Exp $ */ | 1 | /* $OpenBSD: eng_table.c,v 1.8 2015/02/11 03:19:37 doug Exp $ */ |
2 | /* ==================================================================== | 2 | /* ==================================================================== |
3 | * Copyright (c) 2001 The OpenSSL Project. All rights reserved. | 3 | * Copyright (c) 2001 The OpenSSL Project. All rights reserved. |
4 | * | 4 | * |
@@ -53,6 +53,7 @@ | |||
53 | * | 53 | * |
54 | */ | 54 | */ |
55 | 55 | ||
56 | #include <openssl/err.h> | ||
56 | #include <openssl/evp.h> | 57 | #include <openssl/evp.h> |
57 | #include <openssl/lhash.h> | 58 | #include <openssl/lhash.h> |
58 | 59 | ||
diff --git a/src/lib/libcrypto/engine/tb_asnmth.c b/src/lib/libcrypto/engine/tb_asnmth.c index d43eea5447..3ba5541933 100644 --- a/src/lib/libcrypto/engine/tb_asnmth.c +++ b/src/lib/libcrypto/engine/tb_asnmth.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: tb_asnmth.c,v 1.4 2014/07/10 13:58:22 jsing Exp $ */ | 1 | /* $OpenBSD: tb_asnmth.c,v 1.5 2015/02/11 03:19:37 doug Exp $ */ |
2 | /* ==================================================================== | 2 | /* ==================================================================== |
3 | * Copyright (c) 2006 The OpenSSL Project. All rights reserved. | 3 | * Copyright (c) 2006 The OpenSSL Project. All rights reserved. |
4 | * | 4 | * |
@@ -55,6 +55,8 @@ | |||
55 | 55 | ||
56 | #include <string.h> | 56 | #include <string.h> |
57 | 57 | ||
58 | #include <openssl/err.h> | ||
59 | |||
58 | #include "eng_int.h" | 60 | #include "eng_int.h" |
59 | #include "asn1_locl.h" | 61 | #include "asn1_locl.h" |
60 | #include <openssl/evp.h> | 62 | #include <openssl/evp.h> |
diff --git a/src/lib/libcrypto/engine/tb_cipher.c b/src/lib/libcrypto/engine/tb_cipher.c index d869acf405..a888d7a958 100644 --- a/src/lib/libcrypto/engine/tb_cipher.c +++ b/src/lib/libcrypto/engine/tb_cipher.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: tb_cipher.c,v 1.6 2014/06/12 15:49:29 deraadt Exp $ */ | 1 | /* $OpenBSD: tb_cipher.c,v 1.7 2015/02/11 03:19:37 doug Exp $ */ |
2 | /* ==================================================================== | 2 | /* ==================================================================== |
3 | * Copyright (c) 2000 The OpenSSL Project. All rights reserved. | 3 | * Copyright (c) 2000 The OpenSSL Project. All rights reserved. |
4 | * | 4 | * |
@@ -53,6 +53,8 @@ | |||
53 | * | 53 | * |
54 | */ | 54 | */ |
55 | 55 | ||
56 | #include <openssl/err.h> | ||
57 | |||
56 | #include "eng_int.h" | 58 | #include "eng_int.h" |
57 | 59 | ||
58 | /* If this symbol is defined then ENGINE_get_cipher_engine(), the function that | 60 | /* If this symbol is defined then ENGINE_get_cipher_engine(), the function that |
diff --git a/src/lib/libcrypto/engine/tb_digest.c b/src/lib/libcrypto/engine/tb_digest.c index 5bdb37a915..f7720d39e7 100644 --- a/src/lib/libcrypto/engine/tb_digest.c +++ b/src/lib/libcrypto/engine/tb_digest.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: tb_digest.c,v 1.6 2014/06/12 15:49:29 deraadt Exp $ */ | 1 | /* $OpenBSD: tb_digest.c,v 1.7 2015/02/11 03:19:37 doug Exp $ */ |
2 | /* ==================================================================== | 2 | /* ==================================================================== |
3 | * Copyright (c) 2000 The OpenSSL Project. All rights reserved. | 3 | * Copyright (c) 2000 The OpenSSL Project. All rights reserved. |
4 | * | 4 | * |
@@ -53,6 +53,8 @@ | |||
53 | * | 53 | * |
54 | */ | 54 | */ |
55 | 55 | ||
56 | #include <openssl/err.h> | ||
57 | |||
56 | #include "eng_int.h" | 58 | #include "eng_int.h" |
57 | 59 | ||
58 | /* If this symbol is defined then ENGINE_get_digest_engine(), the function that | 60 | /* If this symbol is defined then ENGINE_get_digest_engine(), the function that |
diff --git a/src/lib/libcrypto/engine/tb_pkmeth.c b/src/lib/libcrypto/engine/tb_pkmeth.c index 954bd9a838..3840434262 100644 --- a/src/lib/libcrypto/engine/tb_pkmeth.c +++ b/src/lib/libcrypto/engine/tb_pkmeth.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: tb_pkmeth.c,v 1.4 2014/06/12 15:49:29 deraadt Exp $ */ | 1 | /* $OpenBSD: tb_pkmeth.c,v 1.5 2015/02/11 03:19:37 doug Exp $ */ |
2 | /* ==================================================================== | 2 | /* ==================================================================== |
3 | * Copyright (c) 2006 The OpenSSL Project. All rights reserved. | 3 | * Copyright (c) 2006 The OpenSSL Project. All rights reserved. |
4 | * | 4 | * |
@@ -53,6 +53,8 @@ | |||
53 | * | 53 | * |
54 | */ | 54 | */ |
55 | 55 | ||
56 | #include <openssl/err.h> | ||
57 | |||
56 | #include "eng_int.h" | 58 | #include "eng_int.h" |
57 | #include <openssl/evp.h> | 59 | #include <openssl/evp.h> |
58 | 60 | ||