diff options
Diffstat (limited to 'src/lib/libcrypto/asn1')
-rw-r--r-- | src/lib/libcrypto/asn1/a_int.c | 14 | ||||
-rw-r--r-- | src/lib/libcrypto/asn1/asn1_par.c | 4 | ||||
-rw-r--r-- | src/lib/libcrypto/asn1/evp_asn1.c | 4 | ||||
-rw-r--r-- | src/lib/libcrypto/asn1/p5_pbev2.c | 6 |
4 files changed, 14 insertions, 14 deletions
diff --git a/src/lib/libcrypto/asn1/a_int.c b/src/lib/libcrypto/asn1/a_int.c index cbe68ec6d8..5c0103ba36 100644 --- a/src/lib/libcrypto/asn1/a_int.c +++ b/src/lib/libcrypto/asn1/a_int.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: a_int.c,v 1.29 2015/09/30 17:04:09 jsing Exp $ */ | 1 | /* $OpenBSD: a_int.c,v 1.30 2015/09/30 17:30:15 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 | * |
@@ -196,7 +196,7 @@ c2i_ASN1_INTEGER(ASN1_INTEGER **a, const unsigned char **pp, long len) | |||
196 | int i; | 196 | int i; |
197 | 197 | ||
198 | if ((a == NULL) || ((*a) == NULL)) { | 198 | if ((a == NULL) || ((*a) == NULL)) { |
199 | if ((ret = M_ASN1_INTEGER_new()) == NULL) | 199 | if ((ret = ASN1_INTEGER_new()) == NULL) |
200 | return (NULL); | 200 | return (NULL); |
201 | } else | 201 | } else |
202 | ret = (*a); | 202 | ret = (*a); |
@@ -268,7 +268,7 @@ c2i_ASN1_INTEGER(ASN1_INTEGER **a, const unsigned char **pp, long len) | |||
268 | err: | 268 | err: |
269 | ASN1err(ASN1_F_C2I_ASN1_INTEGER, i); | 269 | ASN1err(ASN1_F_C2I_ASN1_INTEGER, i); |
270 | if (a == NULL || *a != ret) | 270 | if (a == NULL || *a != ret) |
271 | M_ASN1_INTEGER_free(ret); | 271 | ASN1_INTEGER_free(ret); |
272 | return (NULL); | 272 | return (NULL); |
273 | } | 273 | } |
274 | 274 | ||
@@ -289,7 +289,7 @@ d2i_ASN1_UINTEGER(ASN1_INTEGER **a, const unsigned char **pp, long length) | |||
289 | int i; | 289 | int i; |
290 | 290 | ||
291 | if ((a == NULL) || ((*a) == NULL)) { | 291 | if ((a == NULL) || ((*a) == NULL)) { |
292 | if ((ret = M_ASN1_INTEGER_new()) == NULL) | 292 | if ((ret = ASN1_INTEGER_new()) == NULL) |
293 | return (NULL); | 293 | return (NULL); |
294 | } else | 294 | } else |
295 | ret = (*a); | 295 | ret = (*a); |
@@ -334,7 +334,7 @@ d2i_ASN1_UINTEGER(ASN1_INTEGER **a, const unsigned char **pp, long length) | |||
334 | err: | 334 | err: |
335 | ASN1err(ASN1_F_D2I_ASN1_UINTEGER, i); | 335 | ASN1err(ASN1_F_D2I_ASN1_UINTEGER, i); |
336 | if (a == NULL || *a != ret) | 336 | if (a == NULL || *a != ret) |
337 | M_ASN1_INTEGER_free(ret); | 337 | ASN1_INTEGER_free(ret); |
338 | return (NULL); | 338 | return (NULL); |
339 | } | 339 | } |
340 | 340 | ||
@@ -412,7 +412,7 @@ BN_to_ASN1_INTEGER(const BIGNUM *bn, ASN1_INTEGER *ai) | |||
412 | int len, j; | 412 | int len, j; |
413 | 413 | ||
414 | if (ai == NULL) | 414 | if (ai == NULL) |
415 | ret = M_ASN1_INTEGER_new(); | 415 | ret = ASN1_INTEGER_new(); |
416 | else | 416 | else |
417 | ret = ai; | 417 | ret = ai; |
418 | if (ret == NULL) { | 418 | if (ret == NULL) { |
@@ -444,7 +444,7 @@ BN_to_ASN1_INTEGER(const BIGNUM *bn, ASN1_INTEGER *ai) | |||
444 | 444 | ||
445 | err: | 445 | err: |
446 | if (ret != ai) | 446 | if (ret != ai) |
447 | M_ASN1_INTEGER_free(ret); | 447 | ASN1_INTEGER_free(ret); |
448 | return (NULL); | 448 | return (NULL); |
449 | } | 449 | } |
450 | 450 | ||
diff --git a/src/lib/libcrypto/asn1/asn1_par.c b/src/lib/libcrypto/asn1/asn1_par.c index b5742fe97d..9057185e74 100644 --- a/src/lib/libcrypto/asn1/asn1_par.c +++ b/src/lib/libcrypto/asn1/asn1_par.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: asn1_par.c,v 1.22 2015/02/07 13:19:15 doug Exp $ */ | 1 | /* $OpenBSD: asn1_par.c,v 1.23 2015/09/30 17:30:15 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 | * |
@@ -313,7 +313,7 @@ asn1_parse2(BIO *bp, const unsigned char **pp, long length, int offset, | |||
313 | if (BIO_write(bp, "BAD INTEGER", 11) <= 0) | 313 | if (BIO_write(bp, "BAD INTEGER", 11) <= 0) |
314 | goto end; | 314 | goto end; |
315 | } | 315 | } |
316 | M_ASN1_INTEGER_free(bs); | 316 | ASN1_INTEGER_free(bs); |
317 | } else if (tag == V_ASN1_ENUMERATED) { | 317 | } else if (tag == V_ASN1_ENUMERATED) { |
318 | ASN1_ENUMERATED *bs; | 318 | ASN1_ENUMERATED *bs; |
319 | int i; | 319 | int i; |
diff --git a/src/lib/libcrypto/asn1/evp_asn1.c b/src/lib/libcrypto/asn1/evp_asn1.c index a982866f2e..e5fcf26030 100644 --- a/src/lib/libcrypto/asn1/evp_asn1.c +++ b/src/lib/libcrypto/asn1/evp_asn1.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: evp_asn1.c,v 1.15 2015/09/10 14:29:22 jsing Exp $ */ | 1 | /* $OpenBSD: evp_asn1.c,v 1.16 2015/09/30 17:30:15 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 | * |
@@ -194,6 +194,6 @@ err: | |||
194 | ASN1_R_DATA_IS_WRONG); | 194 | ASN1_R_DATA_IS_WRONG); |
195 | } | 195 | } |
196 | M_ASN1_OCTET_STRING_free(os); | 196 | M_ASN1_OCTET_STRING_free(os); |
197 | M_ASN1_INTEGER_free(ai); | 197 | ASN1_INTEGER_free(ai); |
198 | return (ret); | 198 | return (ret); |
199 | } | 199 | } |
diff --git a/src/lib/libcrypto/asn1/p5_pbev2.c b/src/lib/libcrypto/asn1/p5_pbev2.c index 795721fad2..0a6d18d154 100644 --- a/src/lib/libcrypto/asn1/p5_pbev2.c +++ b/src/lib/libcrypto/asn1/p5_pbev2.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: p5_pbev2.c,v 1.21 2015/02/11 04:00:39 jsing Exp $ */ | 1 | /* $OpenBSD: p5_pbev2.c,v 1.22 2015/09/30 17:30:15 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 1999-2004. | 3 | * project 1999-2004. |
4 | */ | 4 | */ |
@@ -330,9 +330,9 @@ PKCS5_pbkdf2_set(int iter, unsigned char *salt, int saltlen, int prf_nid, | |||
330 | /* If have a key len set it up */ | 330 | /* If have a key len set it up */ |
331 | 331 | ||
332 | if (keylen > 0) { | 332 | if (keylen > 0) { |
333 | if (!(kdf->keylength = M_ASN1_INTEGER_new())) | 333 | if (!(kdf->keylength = ASN1_INTEGER_new())) |
334 | goto merr; | 334 | goto merr; |
335 | if (!ASN1_INTEGER_set (kdf->keylength, keylen)) | 335 | if (!ASN1_INTEGER_set(kdf->keylength, keylen)) |
336 | goto merr; | 336 | goto merr; |
337 | } | 337 | } |
338 | 338 | ||