diff options
Diffstat (limited to 'src/lib/libcrypto/rsa')
| -rw-r--r-- | src/lib/libcrypto/rsa/rsa_ameth.c | 10 | ||||
| -rw-r--r-- | src/lib/libcrypto/rsa/rsa_asn1.c | 6 | ||||
| -rw-r--r-- | src/lib/libcrypto/rsa/rsa_crpt.c | 8 | ||||
| -rw-r--r-- | src/lib/libcrypto/rsa/rsa_depr.c | 3 | ||||
| -rw-r--r-- | src/lib/libcrypto/rsa/rsa_eay.c | 6 | ||||
| -rw-r--r-- | src/lib/libcrypto/rsa/rsa_gen.c | 5 | ||||
| -rw-r--r-- | src/lib/libcrypto/rsa/rsa_lib.c | 8 | ||||
| -rw-r--r-- | src/lib/libcrypto/rsa/rsa_none.c | 6 | ||||
| -rw-r--r-- | src/lib/libcrypto/rsa/rsa_oaep.c | 7 | ||||
| -rw-r--r-- | src/lib/libcrypto/rsa/rsa_pk1.c | 4 | ||||
| -rw-r--r-- | src/lib/libcrypto/rsa/rsa_pmeth.c | 10 | ||||
| -rw-r--r-- | src/lib/libcrypto/rsa/rsa_prn.c | 7 | ||||
| -rw-r--r-- | src/lib/libcrypto/rsa/rsa_pss.c | 6 | ||||
| -rw-r--r-- | src/lib/libcrypto/rsa/rsa_saos.c | 6 | ||||
| -rw-r--r-- | src/lib/libcrypto/rsa/rsa_sign.c | 7 | ||||
| -rw-r--r-- | src/lib/libcrypto/rsa/rsa_ssl.c | 6 | ||||
| -rw-r--r-- | src/lib/libcrypto/rsa/rsa_x931.c | 8 |
17 files changed, 60 insertions, 53 deletions
diff --git a/src/lib/libcrypto/rsa/rsa_ameth.c b/src/lib/libcrypto/rsa/rsa_ameth.c index 1eeb58ed9b..bcc0eee4b9 100644 --- a/src/lib/libcrypto/rsa/rsa_ameth.c +++ b/src/lib/libcrypto/rsa/rsa_ameth.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: rsa_ameth.c,v 1.10 2014/07/10 22:45:57 jsing Exp $ */ | 1 | /* $OpenBSD: rsa_ameth.c,v 1.11 2014/07/11 08:44:49 jsing Exp $ */ |
| 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
| 3 | * project 2006. | 3 | * project 2006. |
| 4 | */ | 4 | */ |
| @@ -60,14 +60,16 @@ | |||
| 60 | 60 | ||
| 61 | #include <openssl/opensslconf.h> | 61 | #include <openssl/opensslconf.h> |
| 62 | 62 | ||
| 63 | #include "cryptlib.h" | ||
| 64 | #include <openssl/asn1t.h> | 63 | #include <openssl/asn1t.h> |
| 65 | #include <openssl/x509.h> | ||
| 66 | #include <openssl/rsa.h> | ||
| 67 | #include <openssl/bn.h> | 64 | #include <openssl/bn.h> |
| 65 | #include <openssl/err.h> | ||
| 66 | #include <openssl/rsa.h> | ||
| 67 | #include <openssl/x509.h> | ||
| 68 | |||
| 68 | #ifndef OPENSSL_NO_CMS | 69 | #ifndef OPENSSL_NO_CMS |
| 69 | #include <openssl/cms.h> | 70 | #include <openssl/cms.h> |
| 70 | #endif | 71 | #endif |
| 72 | |||
| 71 | #include "asn1_locl.h" | 73 | #include "asn1_locl.h" |
| 72 | 74 | ||
| 73 | static int | 75 | static int |
diff --git a/src/lib/libcrypto/rsa/rsa_asn1.c b/src/lib/libcrypto/rsa/rsa_asn1.c index 9bc5f17b06..573b9f8b8d 100644 --- a/src/lib/libcrypto/rsa/rsa_asn1.c +++ b/src/lib/libcrypto/rsa/rsa_asn1.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: rsa_asn1.c,v 1.8 2014/07/09 19:51:38 jsing Exp $ */ | 1 | /* $OpenBSD: rsa_asn1.c,v 1.9 2014/07/11 08:44:49 jsing Exp $ */ |
| 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
| 3 | * project 2000. | 3 | * project 2000. |
| 4 | */ | 4 | */ |
| @@ -57,11 +57,11 @@ | |||
| 57 | */ | 57 | */ |
| 58 | 58 | ||
| 59 | #include <stdio.h> | 59 | #include <stdio.h> |
| 60 | #include "cryptlib.h" | 60 | |
| 61 | #include <openssl/asn1t.h> | ||
| 61 | #include <openssl/bn.h> | 62 | #include <openssl/bn.h> |
| 62 | #include <openssl/rsa.h> | 63 | #include <openssl/rsa.h> |
| 63 | #include <openssl/x509.h> | 64 | #include <openssl/x509.h> |
| 64 | #include <openssl/asn1t.h> | ||
| 65 | 65 | ||
| 66 | /* Override the default free and new methods */ | 66 | /* Override the default free and new methods */ |
| 67 | static int | 67 | static int |
diff --git a/src/lib/libcrypto/rsa/rsa_crpt.c b/src/lib/libcrypto/rsa/rsa_crpt.c index 220ce9497a..2adb2b31b2 100644 --- a/src/lib/libcrypto/rsa/rsa_crpt.c +++ b/src/lib/libcrypto/rsa/rsa_crpt.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: rsa_crpt.c,v 1.10 2014/07/10 22:45:57 jsing Exp $ */ | 1 | /* $OpenBSD: rsa_crpt.c,v 1.11 2014/07/11 08:44:49 jsing Exp $ */ |
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * | 4 | * |
| @@ -60,12 +60,12 @@ | |||
| 60 | 60 | ||
| 61 | #include <openssl/opensslconf.h> | 61 | #include <openssl/opensslconf.h> |
| 62 | 62 | ||
| 63 | #include <openssl/bn.h> | ||
| 63 | #include <openssl/crypto.h> | 64 | #include <openssl/crypto.h> |
| 64 | #include "cryptlib.h" | ||
| 65 | #include <openssl/lhash.h> | 65 | #include <openssl/lhash.h> |
| 66 | #include <openssl/bn.h> | ||
| 67 | #include <openssl/rsa.h> | ||
| 68 | #include <openssl/rand.h> | 66 | #include <openssl/rand.h> |
| 67 | #include <openssl/rsa.h> | ||
| 68 | |||
| 69 | #ifndef OPENSSL_NO_ENGINE | 69 | #ifndef OPENSSL_NO_ENGINE |
| 70 | #include <openssl/engine.h> | 70 | #include <openssl/engine.h> |
| 71 | #endif | 71 | #endif |
diff --git a/src/lib/libcrypto/rsa/rsa_depr.c b/src/lib/libcrypto/rsa/rsa_depr.c index 547f9a491e..b830a2293c 100644 --- a/src/lib/libcrypto/rsa/rsa_depr.c +++ b/src/lib/libcrypto/rsa/rsa_depr.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: rsa_depr.c,v 1.7 2014/07/10 22:45:57 jsing Exp $ */ | 1 | /* $OpenBSD: rsa_depr.c,v 1.8 2014/07/11 08:44:49 jsing Exp $ */ |
| 2 | /* ==================================================================== | 2 | /* ==================================================================== |
| 3 | * Copyright (c) 1998-2002 The OpenSSL Project. All rights reserved. | 3 | * Copyright (c) 1998-2002 The OpenSSL Project. All rights reserved. |
| 4 | * | 4 | * |
| @@ -61,7 +61,6 @@ | |||
| 61 | 61 | ||
| 62 | #include <openssl/opensslconf.h> | 62 | #include <openssl/opensslconf.h> |
| 63 | 63 | ||
| 64 | #include "cryptlib.h" | ||
| 65 | #include <openssl/bn.h> | 64 | #include <openssl/bn.h> |
| 66 | #include <openssl/rsa.h> | 65 | #include <openssl/rsa.h> |
| 67 | 66 | ||
diff --git a/src/lib/libcrypto/rsa/rsa_eay.c b/src/lib/libcrypto/rsa/rsa_eay.c index 3cc8f6c5cf..571a9a0f05 100644 --- a/src/lib/libcrypto/rsa/rsa_eay.c +++ b/src/lib/libcrypto/rsa/rsa_eay.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: rsa_eay.c,v 1.33 2014/07/10 22:45:57 jsing Exp $ */ | 1 | /* $OpenBSD: rsa_eay.c,v 1.34 2014/07/11 08:44:49 jsing Exp $ */ |
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * | 4 | * |
| @@ -113,10 +113,10 @@ | |||
| 113 | 113 | ||
| 114 | #include <openssl/opensslconf.h> | 114 | #include <openssl/opensslconf.h> |
| 115 | 115 | ||
| 116 | #include "cryptlib.h" | ||
| 117 | #include <openssl/bn.h> | 116 | #include <openssl/bn.h> |
| 118 | #include <openssl/rsa.h> | 117 | #include <openssl/err.h> |
| 119 | #include <openssl/rand.h> | 118 | #include <openssl/rand.h> |
| 119 | #include <openssl/rsa.h> | ||
| 120 | 120 | ||
| 121 | static int RSA_eay_public_encrypt(int flen, const unsigned char *from, | 121 | static int RSA_eay_public_encrypt(int flen, const unsigned char *from, |
| 122 | unsigned char *to, RSA *rsa, int padding); | 122 | unsigned char *to, RSA *rsa, int padding); |
diff --git a/src/lib/libcrypto/rsa/rsa_gen.c b/src/lib/libcrypto/rsa/rsa_gen.c index f000b41940..a3b9da4856 100644 --- a/src/lib/libcrypto/rsa/rsa_gen.c +++ b/src/lib/libcrypto/rsa/rsa_gen.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: rsa_gen.c,v 1.15 2014/07/09 19:51:38 jsing Exp $ */ | 1 | /* $OpenBSD: rsa_gen.c,v 1.16 2014/07/11 08:44:49 jsing Exp $ */ |
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * | 4 | * |
| @@ -64,8 +64,9 @@ | |||
| 64 | 64 | ||
| 65 | #include <stdio.h> | 65 | #include <stdio.h> |
| 66 | #include <time.h> | 66 | #include <time.h> |
| 67 | #include "cryptlib.h" | 67 | |
| 68 | #include <openssl/bn.h> | 68 | #include <openssl/bn.h> |
| 69 | #include <openssl/err.h> | ||
| 69 | #include <openssl/rsa.h> | 70 | #include <openssl/rsa.h> |
| 70 | 71 | ||
| 71 | static int rsa_builtin_keygen(RSA *rsa, int bits, BIGNUM *e_value, BN_GENCB *cb); | 72 | static int rsa_builtin_keygen(RSA *rsa, int bits, BIGNUM *e_value, BN_GENCB *cb); |
diff --git a/src/lib/libcrypto/rsa/rsa_lib.c b/src/lib/libcrypto/rsa/rsa_lib.c index d7a51c7b05..157c347f88 100644 --- a/src/lib/libcrypto/rsa/rsa_lib.c +++ b/src/lib/libcrypto/rsa/rsa_lib.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: rsa_lib.c,v 1.27 2014/07/10 22:45:57 jsing Exp $ */ | 1 | /* $OpenBSD: rsa_lib.c,v 1.28 2014/07/11 08:44:49 jsing Exp $ */ |
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * | 4 | * |
| @@ -60,12 +60,12 @@ | |||
| 60 | 60 | ||
| 61 | #include <openssl/opensslconf.h> | 61 | #include <openssl/opensslconf.h> |
| 62 | 62 | ||
| 63 | #include <openssl/bn.h> | ||
| 63 | #include <openssl/crypto.h> | 64 | #include <openssl/crypto.h> |
| 64 | #include "cryptlib.h" | ||
| 65 | #include <openssl/lhash.h> | 65 | #include <openssl/lhash.h> |
| 66 | #include <openssl/bn.h> | ||
| 67 | #include <openssl/rsa.h> | ||
| 68 | #include <openssl/rand.h> | 66 | #include <openssl/rand.h> |
| 67 | #include <openssl/rsa.h> | ||
| 68 | |||
| 69 | #ifndef OPENSSL_NO_ENGINE | 69 | #ifndef OPENSSL_NO_ENGINE |
| 70 | #include <openssl/engine.h> | 70 | #include <openssl/engine.h> |
| 71 | #endif | 71 | #endif |
diff --git a/src/lib/libcrypto/rsa/rsa_none.c b/src/lib/libcrypto/rsa/rsa_none.c index 503d93bb68..3527f1c682 100644 --- a/src/lib/libcrypto/rsa/rsa_none.c +++ b/src/lib/libcrypto/rsa/rsa_none.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: rsa_none.c,v 1.8 2014/07/10 13:58:23 jsing Exp $ */ | 1 | /* $OpenBSD: rsa_none.c,v 1.9 2014/07/11 08:44:49 jsing Exp $ */ |
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * | 4 | * |
| @@ -59,10 +59,10 @@ | |||
| 59 | #include <stdio.h> | 59 | #include <stdio.h> |
| 60 | #include <string.h> | 60 | #include <string.h> |
| 61 | 61 | ||
| 62 | #include "cryptlib.h" | ||
| 63 | #include <openssl/bn.h> | 62 | #include <openssl/bn.h> |
| 64 | #include <openssl/rsa.h> | 63 | #include <openssl/err.h> |
| 65 | #include <openssl/rand.h> | 64 | #include <openssl/rand.h> |
| 65 | #include <openssl/rsa.h> | ||
| 66 | 66 | ||
| 67 | int | 67 | int |
| 68 | RSA_padding_add_none(unsigned char *to, int tlen, const unsigned char *from, | 68 | RSA_padding_add_none(unsigned char *to, int tlen, const unsigned char *from, |
diff --git a/src/lib/libcrypto/rsa/rsa_oaep.c b/src/lib/libcrypto/rsa/rsa_oaep.c index 09799818d3..9be0f9be31 100644 --- a/src/lib/libcrypto/rsa/rsa_oaep.c +++ b/src/lib/libcrypto/rsa/rsa_oaep.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: rsa_oaep.c,v 1.22 2014/07/10 22:45:57 jsing Exp $ */ | 1 | /* $OpenBSD: rsa_oaep.c,v 1.23 2014/07/11 08:44:49 jsing Exp $ */ |
| 2 | /* Written by Ulf Moeller. This software is distributed on an "AS IS" | 2 | /* Written by Ulf Moeller. This software is distributed on an "AS IS" |
| 3 | basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. */ | 3 | basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. */ |
| 4 | 4 | ||
| @@ -24,11 +24,12 @@ | |||
| 24 | #include <openssl/opensslconf.h> | 24 | #include <openssl/opensslconf.h> |
| 25 | 25 | ||
| 26 | #if !defined(OPENSSL_NO_SHA) && !defined(OPENSSL_NO_SHA1) | 26 | #if !defined(OPENSSL_NO_SHA) && !defined(OPENSSL_NO_SHA1) |
| 27 | #include "cryptlib.h" | 27 | |
| 28 | #include <openssl/bn.h> | 28 | #include <openssl/bn.h> |
| 29 | #include <openssl/rsa.h> | 29 | #include <openssl/err.h> |
| 30 | #include <openssl/evp.h> | 30 | #include <openssl/evp.h> |
| 31 | #include <openssl/rand.h> | 31 | #include <openssl/rand.h> |
| 32 | #include <openssl/rsa.h> | ||
| 32 | #include <openssl/sha.h> | 33 | #include <openssl/sha.h> |
| 33 | 34 | ||
| 34 | static int MGF1(unsigned char *mask, long len, const unsigned char *seed, | 35 | static int MGF1(unsigned char *mask, long len, const unsigned char *seed, |
diff --git a/src/lib/libcrypto/rsa/rsa_pk1.c b/src/lib/libcrypto/rsa/rsa_pk1.c index 6d11ee19f9..4f82bf6768 100644 --- a/src/lib/libcrypto/rsa/rsa_pk1.c +++ b/src/lib/libcrypto/rsa/rsa_pk1.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: rsa_pk1.c,v 1.12 2014/07/10 13:58:23 jsing Exp $ */ | 1 | /* $OpenBSD: rsa_pk1.c,v 1.13 2014/07/11 08:44:49 jsing Exp $ */ |
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * | 4 | * |
| @@ -59,8 +59,8 @@ | |||
| 59 | #include <stdio.h> | 59 | #include <stdio.h> |
| 60 | #include <string.h> | 60 | #include <string.h> |
| 61 | 61 | ||
| 62 | #include "cryptlib.h" | ||
| 63 | #include <openssl/bn.h> | 62 | #include <openssl/bn.h> |
| 63 | #include <openssl/err.h> | ||
| 64 | #include <openssl/rsa.h> | 64 | #include <openssl/rsa.h> |
| 65 | #include <openssl/rand.h> | 65 | #include <openssl/rand.h> |
| 66 | 66 | ||
diff --git a/src/lib/libcrypto/rsa/rsa_pmeth.c b/src/lib/libcrypto/rsa/rsa_pmeth.c index 0b2d680eed..954190d560 100644 --- a/src/lib/libcrypto/rsa/rsa_pmeth.c +++ b/src/lib/libcrypto/rsa/rsa_pmeth.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: rsa_pmeth.c,v 1.13 2014/07/10 22:45:57 jsing Exp $ */ | 1 | /* $OpenBSD: rsa_pmeth.c,v 1.14 2014/07/11 08:44:49 jsing Exp $ */ |
| 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
| 3 | * project 2006. | 3 | * project 2006. |
| 4 | */ | 4 | */ |
| @@ -62,15 +62,17 @@ | |||
| 62 | 62 | ||
| 63 | #include <openssl/opensslconf.h> | 63 | #include <openssl/opensslconf.h> |
| 64 | 64 | ||
| 65 | #include "cryptlib.h" | ||
| 66 | #include <openssl/asn1t.h> | 65 | #include <openssl/asn1t.h> |
| 67 | #include <openssl/x509.h> | ||
| 68 | #include <openssl/rsa.h> | ||
| 69 | #include <openssl/bn.h> | 66 | #include <openssl/bn.h> |
| 67 | #include <openssl/err.h> | ||
| 70 | #include <openssl/evp.h> | 68 | #include <openssl/evp.h> |
| 69 | #include <openssl/rsa.h> | ||
| 70 | #include <openssl/x509.h> | ||
| 71 | |||
| 71 | #ifndef OPENSSL_NO_CMS | 72 | #ifndef OPENSSL_NO_CMS |
| 72 | #include <openssl/cms.h> | 73 | #include <openssl/cms.h> |
| 73 | #endif | 74 | #endif |
| 75 | |||
| 74 | #include "evp_locl.h" | 76 | #include "evp_locl.h" |
| 75 | #include "rsa_locl.h" | 77 | #include "rsa_locl.h" |
| 76 | 78 | ||
diff --git a/src/lib/libcrypto/rsa/rsa_prn.c b/src/lib/libcrypto/rsa/rsa_prn.c index 5d5b0e29d8..db82dab5be 100644 --- a/src/lib/libcrypto/rsa/rsa_prn.c +++ b/src/lib/libcrypto/rsa/rsa_prn.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: rsa_prn.c,v 1.5 2014/07/09 19:51:38 jsing Exp $ */ | 1 | /* $OpenBSD: rsa_prn.c,v 1.6 2014/07/11 08:44:49 jsing Exp $ */ |
| 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
| 3 | * project 2006. | 3 | * project 2006. |
| 4 | */ | 4 | */ |
| @@ -57,9 +57,10 @@ | |||
| 57 | */ | 57 | */ |
| 58 | 58 | ||
| 59 | #include <stdio.h> | 59 | #include <stdio.h> |
| 60 | #include "cryptlib.h" | 60 | |
| 61 | #include <openssl/rsa.h> | 61 | #include <openssl/err.h> |
| 62 | #include <openssl/evp.h> | 62 | #include <openssl/evp.h> |
| 63 | #include <openssl/rsa.h> | ||
| 63 | 64 | ||
| 64 | int | 65 | int |
| 65 | RSA_print_fp(FILE *fp, const RSA *x, int off) | 66 | RSA_print_fp(FILE *fp, const RSA *x, int off) |
diff --git a/src/lib/libcrypto/rsa/rsa_pss.c b/src/lib/libcrypto/rsa/rsa_pss.c index fa32a856ba..e18ca632aa 100644 --- a/src/lib/libcrypto/rsa/rsa_pss.c +++ b/src/lib/libcrypto/rsa/rsa_pss.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: rsa_pss.c,v 1.8 2014/07/10 13:58:23 jsing Exp $ */ | 1 | /* $OpenBSD: rsa_pss.c,v 1.9 2014/07/11 08:44:49 jsing Exp $ */ |
| 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
| 3 | * project 2005. | 3 | * project 2005. |
| 4 | */ | 4 | */ |
| @@ -59,11 +59,11 @@ | |||
| 59 | #include <stdio.h> | 59 | #include <stdio.h> |
| 60 | #include <string.h> | 60 | #include <string.h> |
| 61 | 61 | ||
| 62 | #include "cryptlib.h" | ||
| 63 | #include <openssl/bn.h> | 62 | #include <openssl/bn.h> |
| 64 | #include <openssl/rsa.h> | 63 | #include <openssl/err.h> |
| 65 | #include <openssl/evp.h> | 64 | #include <openssl/evp.h> |
| 66 | #include <openssl/rand.h> | 65 | #include <openssl/rand.h> |
| 66 | #include <openssl/rsa.h> | ||
| 67 | #include <openssl/sha.h> | 67 | #include <openssl/sha.h> |
| 68 | 68 | ||
| 69 | static const unsigned char zeroes[] = { 0, 0, 0, 0, 0, 0, 0, 0 }; | 69 | static const unsigned char zeroes[] = { 0, 0, 0, 0, 0, 0, 0, 0 }; |
diff --git a/src/lib/libcrypto/rsa/rsa_saos.c b/src/lib/libcrypto/rsa/rsa_saos.c index f2cf06af4c..47b2a4e95f 100644 --- a/src/lib/libcrypto/rsa/rsa_saos.c +++ b/src/lib/libcrypto/rsa/rsa_saos.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: rsa_saos.c,v 1.14 2014/07/10 13:58:23 jsing Exp $ */ | 1 | /* $OpenBSD: rsa_saos.c,v 1.15 2014/07/11 08:44:49 jsing Exp $ */ |
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * | 4 | * |
| @@ -59,10 +59,10 @@ | |||
| 59 | #include <stdio.h> | 59 | #include <stdio.h> |
| 60 | #include <string.h> | 60 | #include <string.h> |
| 61 | 61 | ||
| 62 | #include "cryptlib.h" | ||
| 63 | #include <openssl/bn.h> | 62 | #include <openssl/bn.h> |
| 64 | #include <openssl/rsa.h> | 63 | #include <openssl/err.h> |
| 65 | #include <openssl/objects.h> | 64 | #include <openssl/objects.h> |
| 65 | #include <openssl/rsa.h> | ||
| 66 | #include <openssl/x509.h> | 66 | #include <openssl/x509.h> |
| 67 | 67 | ||
| 68 | int | 68 | int |
diff --git a/src/lib/libcrypto/rsa/rsa_sign.c b/src/lib/libcrypto/rsa/rsa_sign.c index c7e0a55829..a446b563b3 100644 --- a/src/lib/libcrypto/rsa/rsa_sign.c +++ b/src/lib/libcrypto/rsa/rsa_sign.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: rsa_sign.c,v 1.21 2014/07/10 13:58:23 jsing Exp $ */ | 1 | /* $OpenBSD: rsa_sign.c,v 1.22 2014/07/11 08:44:49 jsing Exp $ */ |
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * | 4 | * |
| @@ -59,11 +59,12 @@ | |||
| 59 | #include <stdio.h> | 59 | #include <stdio.h> |
| 60 | #include <string.h> | 60 | #include <string.h> |
| 61 | 61 | ||
| 62 | #include "cryptlib.h" | ||
| 63 | #include <openssl/bn.h> | 62 | #include <openssl/bn.h> |
| 64 | #include <openssl/rsa.h> | 63 | #include <openssl/err.h> |
| 65 | #include <openssl/objects.h> | 64 | #include <openssl/objects.h> |
| 65 | #include <openssl/rsa.h> | ||
| 66 | #include <openssl/x509.h> | 66 | #include <openssl/x509.h> |
| 67 | |||
| 67 | #include "rsa_locl.h" | 68 | #include "rsa_locl.h" |
| 68 | 69 | ||
| 69 | /* Size of an SSL signature: MD5+SHA1 */ | 70 | /* Size of an SSL signature: MD5+SHA1 */ |
diff --git a/src/lib/libcrypto/rsa/rsa_ssl.c b/src/lib/libcrypto/rsa/rsa_ssl.c index 71372341c2..a5fe5004b1 100644 --- a/src/lib/libcrypto/rsa/rsa_ssl.c +++ b/src/lib/libcrypto/rsa/rsa_ssl.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: rsa_ssl.c,v 1.12 2014/07/10 13:58:23 jsing Exp $ */ | 1 | /* $OpenBSD: rsa_ssl.c,v 1.13 2014/07/11 08:44:49 jsing Exp $ */ |
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * | 4 | * |
| @@ -59,10 +59,10 @@ | |||
| 59 | #include <stdio.h> | 59 | #include <stdio.h> |
| 60 | #include <string.h> | 60 | #include <string.h> |
| 61 | 61 | ||
| 62 | #include "cryptlib.h" | ||
| 63 | #include <openssl/bn.h> | 62 | #include <openssl/bn.h> |
| 64 | #include <openssl/rsa.h> | 63 | #include <openssl/err.h> |
| 65 | #include <openssl/rand.h> | 64 | #include <openssl/rand.h> |
| 65 | #include <openssl/rsa.h> | ||
| 66 | 66 | ||
| 67 | int | 67 | int |
| 68 | RSA_padding_add_SSLv23(unsigned char *to, int tlen, const unsigned char *from, | 68 | RSA_padding_add_SSLv23(unsigned char *to, int tlen, const unsigned char *from, |
diff --git a/src/lib/libcrypto/rsa/rsa_x931.c b/src/lib/libcrypto/rsa/rsa_x931.c index 5809f62cbd..8ee309e6c9 100644 --- a/src/lib/libcrypto/rsa/rsa_x931.c +++ b/src/lib/libcrypto/rsa/rsa_x931.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: rsa_x931.c,v 1.7 2014/07/10 13:58:23 jsing Exp $ */ | 1 | /* $OpenBSD: rsa_x931.c,v 1.8 2014/07/11 08:44:49 jsing Exp $ */ |
| 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
| 3 | * project 2005. | 3 | * project 2005. |
| 4 | */ | 4 | */ |
| @@ -59,11 +59,11 @@ | |||
| 59 | #include <stdio.h> | 59 | #include <stdio.h> |
| 60 | #include <string.h> | 60 | #include <string.h> |
| 61 | 61 | ||
| 62 | #include "cryptlib.h" | ||
| 63 | #include <openssl/bn.h> | 62 | #include <openssl/bn.h> |
| 64 | #include <openssl/rsa.h> | 63 | #include <openssl/err.h> |
| 65 | #include <openssl/rand.h> | ||
| 66 | #include <openssl/objects.h> | 64 | #include <openssl/objects.h> |
| 65 | #include <openssl/rand.h> | ||
| 66 | #include <openssl/rsa.h> | ||
| 67 | 67 | ||
| 68 | int | 68 | int |
| 69 | RSA_padding_add_X931(unsigned char *to, int tlen, const unsigned char *from, | 69 | RSA_padding_add_X931(unsigned char *to, int tlen, const unsigned char *from, |
