aboutsummaryrefslogtreecommitdiffstats
path: root/crypto/openssl/crypto/asn1
diff options
context:
space:
mode:
authorJung-uk Kim <jkim@FreeBSD.org>2014-01-22 19:57:11 +0000
committerJung-uk Kim <jkim@FreeBSD.org>2014-01-22 19:57:11 +0000
commitde78d5d8fdfc5d310165c9a486cc8d5cb6249959 (patch)
tree4c8798ce163b45133d4f5fb5c859c7235ff5efea /crypto/openssl/crypto/asn1
parentb7bbf8b9f3c79ecd478e09d8665ec80cc041a2f7 (diff)
parent2dc7f78169ea4545102b8d9b0604f785cdc798f5 (diff)
downloadsrc-de78d5d8fdfc5d310165c9a486cc8d5cb6249959.tar.gz
src-de78d5d8fdfc5d310165c9a486cc8d5cb6249959.zip
Merge OpenSSL 1.0.1f.
Approved by: so (delphij), benl (silence)
Notes
Notes: svn path=/head/; revision=261037
Diffstat (limited to 'crypto/openssl/crypto/asn1')
-rw-r--r--crypto/openssl/crypto/asn1/a_int.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/openssl/crypto/asn1/a_int.c b/crypto/openssl/crypto/asn1/a_int.c
index ad0d2506f632..297c45a9ff12 100644
--- a/crypto/openssl/crypto/asn1/a_int.c
+++ b/crypto/openssl/crypto/asn1/a_int.c
@@ -116,7 +116,7 @@ int i2c_ASN1_INTEGER(ASN1_INTEGER *a, unsigned char **pp)
int pad=0,ret,i,neg;
unsigned char *p,*n,pb=0;
- if ((a == NULL) || (a->data == NULL)) return(0);
+ if (a == NULL) return(0);
neg=a->type & V_ASN1_NEG;
if (a->length == 0)
ret=1;