diff options
| author | jsing <> | 2015-09-30 19:07:08 +0000 |
|---|---|---|
| committer | jsing <> | 2015-09-30 19:07:08 +0000 |
| commit | 45f7117344413dc2b1ebbdcd203978ad63cb317d (patch) | |
| tree | 2d3f6ec3cea3420a266f089becd9bba956a8ca5d | |
| parent | a29482a531ffc362b9cb0d10ced9243c5451297f (diff) | |
| download | openbsd-45f7117344413dc2b1ebbdcd203978ad63cb317d.tar.gz openbsd-45f7117344413dc2b1ebbdcd203978ad63cb317d.tar.bz2 openbsd-45f7117344413dc2b1ebbdcd203978ad63cb317d.zip | |
Expand M_i2d_ASN1_OCTET_STRING macros - no change in generated assembly,
aside from line numbers.
| -rw-r--r-- | src/lib/libcrypto/asn1/evp_asn1.c | 8 | ||||
| -rw-r--r-- | src/lib/libssl/src/crypto/asn1/evp_asn1.c | 8 |
2 files changed, 10 insertions, 6 deletions
diff --git a/src/lib/libcrypto/asn1/evp_asn1.c b/src/lib/libcrypto/asn1/evp_asn1.c index 66f89c8b98..1f36cebad7 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.17 2015/09/30 18:41:06 jsing Exp $ */ | 1 | /* $OpenBSD: evp_asn1.c,v 1.18 2015/09/30 19:07:08 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 | * |
| @@ -117,7 +117,8 @@ ASN1_TYPE_set_int_octetstring(ASN1_TYPE *a, long num, unsigned char *data, | |||
| 117 | os.length = len; | 117 | os.length = len; |
| 118 | ASN1_INTEGER_set(&in, num); | 118 | ASN1_INTEGER_set(&in, num); |
| 119 | n = i2d_ASN1_INTEGER(&in, NULL); | 119 | n = i2d_ASN1_INTEGER(&in, NULL); |
| 120 | n += M_i2d_ASN1_OCTET_STRING(&os, NULL); | 120 | n += i2d_ASN1_bytes((ASN1_STRING *)&os, NULL, V_ASN1_OCTET_STRING, |
| 121 | V_ASN1_UNIVERSAL); | ||
| 121 | 122 | ||
| 122 | size = ASN1_object_size(1, n, V_ASN1_SEQUENCE); | 123 | size = ASN1_object_size(1, n, V_ASN1_SEQUENCE); |
| 123 | 124 | ||
| @@ -134,7 +135,8 @@ ASN1_TYPE_set_int_octetstring(ASN1_TYPE *a, long num, unsigned char *data, | |||
| 134 | 135 | ||
| 135 | ASN1_put_object(&p, 1,n, V_ASN1_SEQUENCE, V_ASN1_UNIVERSAL); | 136 | ASN1_put_object(&p, 1,n, V_ASN1_SEQUENCE, V_ASN1_UNIVERSAL); |
| 136 | i2d_ASN1_INTEGER(&in, &p); | 137 | i2d_ASN1_INTEGER(&in, &p); |
| 137 | M_i2d_ASN1_OCTET_STRING(&os, &p); | 138 | i2d_ASN1_bytes((ASN1_STRING *)&os, &p, V_ASN1_OCTET_STRING, |
| 139 | V_ASN1_UNIVERSAL); | ||
| 138 | 140 | ||
| 139 | ASN1_TYPE_set(a, V_ASN1_SEQUENCE, osp); | 141 | ASN1_TYPE_set(a, V_ASN1_SEQUENCE, osp); |
| 140 | return (1); | 142 | return (1); |
diff --git a/src/lib/libssl/src/crypto/asn1/evp_asn1.c b/src/lib/libssl/src/crypto/asn1/evp_asn1.c index 66f89c8b98..1f36cebad7 100644 --- a/src/lib/libssl/src/crypto/asn1/evp_asn1.c +++ b/src/lib/libssl/src/crypto/asn1/evp_asn1.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: evp_asn1.c,v 1.17 2015/09/30 18:41:06 jsing Exp $ */ | 1 | /* $OpenBSD: evp_asn1.c,v 1.18 2015/09/30 19:07:08 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 | * |
| @@ -117,7 +117,8 @@ ASN1_TYPE_set_int_octetstring(ASN1_TYPE *a, long num, unsigned char *data, | |||
| 117 | os.length = len; | 117 | os.length = len; |
| 118 | ASN1_INTEGER_set(&in, num); | 118 | ASN1_INTEGER_set(&in, num); |
| 119 | n = i2d_ASN1_INTEGER(&in, NULL); | 119 | n = i2d_ASN1_INTEGER(&in, NULL); |
| 120 | n += M_i2d_ASN1_OCTET_STRING(&os, NULL); | 120 | n += i2d_ASN1_bytes((ASN1_STRING *)&os, NULL, V_ASN1_OCTET_STRING, |
| 121 | V_ASN1_UNIVERSAL); | ||
| 121 | 122 | ||
| 122 | size = ASN1_object_size(1, n, V_ASN1_SEQUENCE); | 123 | size = ASN1_object_size(1, n, V_ASN1_SEQUENCE); |
| 123 | 124 | ||
| @@ -134,7 +135,8 @@ ASN1_TYPE_set_int_octetstring(ASN1_TYPE *a, long num, unsigned char *data, | |||
| 134 | 135 | ||
| 135 | ASN1_put_object(&p, 1,n, V_ASN1_SEQUENCE, V_ASN1_UNIVERSAL); | 136 | ASN1_put_object(&p, 1,n, V_ASN1_SEQUENCE, V_ASN1_UNIVERSAL); |
| 136 | i2d_ASN1_INTEGER(&in, &p); | 137 | i2d_ASN1_INTEGER(&in, &p); |
| 137 | M_i2d_ASN1_OCTET_STRING(&os, &p); | 138 | i2d_ASN1_bytes((ASN1_STRING *)&os, &p, V_ASN1_OCTET_STRING, |
| 139 | V_ASN1_UNIVERSAL); | ||
| 138 | 140 | ||
| 139 | ASN1_TYPE_set(a, V_ASN1_SEQUENCE, osp); | 141 | ASN1_TYPE_set(a, V_ASN1_SEQUENCE, osp); |
| 140 | return (1); | 142 | return (1); |