diff options
| author | David Benjamin <davidben@google.com> | 2016-03-26 01:07:11 +0300 |
|---|---|---|
| committer | David Benjamin <davidben@google.com> | 2016-03-31 23:50:33 +0300 |
| commit | 981936791eb76c52daedb18310fced187252ed30 (patch) | |
| tree | 65dcde1bd667ed5d50a0d0dcfd64391308e2f07a /crypto/cipher | |
| parent | 5d38f78e2987be876e3023808b4eed57c84ce23c (diff) | |
Remove some easy obj.h dependencies.
A lot of consumers of obj.h only want the NID values. Others didn't need
it at all. This also removes some OBJ_nid2sn and OBJ_nid2ln calls in EVP
error paths which isn't worth pulling a large table in for.
BUG=chromium:499653
Change-Id: Id6dff578f993012e35b740a13b8e4f9c2edc0744
Reviewed-on: https://boringssl-review.googlesource.com/7563
Reviewed-by: David Benjamin <davidben@google.com>
Diffstat (limited to 'crypto/cipher')
| -rw-r--r-- | crypto/cipher/cipher.c | 2 | ||||
| -rw-r--r-- | crypto/cipher/e_aes.c | 2 | ||||
| -rw-r--r-- | crypto/cipher/e_des.c | 2 | ||||
| -rw-r--r-- | crypto/cipher/e_null.c | 2 | ||||
| -rw-r--r-- | crypto/cipher/e_rc2.c | 2 | ||||
| -rw-r--r-- | crypto/cipher/e_rc4.c | 2 | ||||
| -rw-r--r-- | crypto/cipher/tls_cbc.c | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/crypto/cipher/cipher.c b/crypto/cipher/cipher.c index 44018675..341516a7 100644 --- a/crypto/cipher/cipher.c +++ b/crypto/cipher/cipher.c @@ -61,7 +61,7 @@ #include <openssl/err.h> #include <openssl/mem.h> -#include <openssl/obj.h> +#include <openssl/nid.h> #include "internal.h" diff --git a/crypto/cipher/e_aes.c b/crypto/cipher/e_aes.c index 1412be1d..aa652eb3 100644 --- a/crypto/cipher/e_aes.c +++ b/crypto/cipher/e_aes.c @@ -54,7 +54,7 @@ #include <openssl/cpu.h> #include <openssl/err.h> #include <openssl/mem.h> -#include <openssl/obj.h> +#include <openssl/nid.h> #include <openssl/rand.h> #include <openssl/sha.h> diff --git a/crypto/cipher/e_des.c b/crypto/cipher/e_des.c index b1d312c3..2ba2bed3 100644 --- a/crypto/cipher/e_des.c +++ b/crypto/cipher/e_des.c @@ -56,7 +56,7 @@ #include <openssl/cipher.h> #include <openssl/des.h> -#include <openssl/obj.h> +#include <openssl/nid.h> #include "internal.h" diff --git a/crypto/cipher/e_null.c b/crypto/cipher/e_null.c index cfe1d1b2..3d6a24c3 100644 --- a/crypto/cipher/e_null.c +++ b/crypto/cipher/e_null.c @@ -58,7 +58,7 @@ #include <string.h> -#include <openssl/obj.h> +#include <openssl/nid.h> #include "internal.h" diff --git a/crypto/cipher/e_rc2.c b/crypto/cipher/e_rc2.c index 8ca7bba6..67418d54 100644 --- a/crypto/cipher/e_rc2.c +++ b/crypto/cipher/e_rc2.c @@ -55,7 +55,7 @@ * [including the GNU Public Licence.] */ #include <openssl/cipher.h> -#include <openssl/obj.h> +#include <openssl/nid.h> #include "internal.h" diff --git a/crypto/cipher/e_rc4.c b/crypto/cipher/e_rc4.c index 3a2c166a..e7c2ccaf 100644 --- a/crypto/cipher/e_rc4.c +++ b/crypto/cipher/e_rc4.c @@ -58,7 +58,7 @@ #include <string.h> #include <openssl/cipher.h> -#include <openssl/obj.h> +#include <openssl/nid.h> #include <openssl/rc4.h> diff --git a/crypto/cipher/tls_cbc.c b/crypto/cipher/tls_cbc.c index c0d566dd..510b4c73 100644 --- a/crypto/cipher/tls_cbc.c +++ b/crypto/cipher/tls_cbc.c @@ -54,7 +54,7 @@ #include <string.h> #include <openssl/digest.h> -#include <openssl/obj.h> +#include <openssl/nid.h> #include <openssl/sha.h> #include "../internal.h" |