diff options
| author | djm <> | 2009-01-09 12:15:52 +0000 |
|---|---|---|
| committer | djm <> | 2009-01-09 12:15:52 +0000 |
| commit | eef32868c6aa961f0ae29b5a113d0690dc4db25e (patch) | |
| tree | a2a7787bc00e8f6a29153b8c6d9eb5e8f73d6269 /src/lib/libcrypto/asn1/t_x509.c | |
| parent | ed26972d251de1f03147983371ecfba887241c5e (diff) | |
| download | openbsd-eef32868c6aa961f0ae29b5a113d0690dc4db25e.tar.gz openbsd-eef32868c6aa961f0ae29b5a113d0690dc4db25e.tar.bz2 openbsd-eef32868c6aa961f0ae29b5a113d0690dc4db25e.zip | |
resolve conflicts
Diffstat (limited to 'src/lib/libcrypto/asn1/t_x509.c')
| -rw-r--r-- | src/lib/libcrypto/asn1/t_x509.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/libcrypto/asn1/t_x509.c b/src/lib/libcrypto/asn1/t_x509.c index cb76c32c8d..8f746f9c05 100644 --- a/src/lib/libcrypto/asn1/t_x509.c +++ b/src/lib/libcrypto/asn1/t_x509.c | |||
| @@ -393,7 +393,7 @@ int ASN1_GENERALIZEDTIME_print(BIO *bp, ASN1_GENERALIZEDTIME *tm) | |||
| 393 | d= (v[6]-'0')*10+(v[7]-'0'); | 393 | d= (v[6]-'0')*10+(v[7]-'0'); |
| 394 | h= (v[8]-'0')*10+(v[9]-'0'); | 394 | h= (v[8]-'0')*10+(v[9]-'0'); |
| 395 | m= (v[10]-'0')*10+(v[11]-'0'); | 395 | m= (v[10]-'0')*10+(v[11]-'0'); |
| 396 | if (i >= 14 && | 396 | if (tm->length >= 14 && |
| 397 | (v[12] >= '0') && (v[12] <= '9') && | 397 | (v[12] >= '0') && (v[12] <= '9') && |
| 398 | (v[13] >= '0') && (v[13] <= '9')) | 398 | (v[13] >= '0') && (v[13] <= '9')) |
| 399 | s= (v[12]-'0')*10+(v[13]-'0'); | 399 | s= (v[12]-'0')*10+(v[13]-'0'); |
| @@ -429,7 +429,7 @@ int ASN1_UTCTIME_print(BIO *bp, ASN1_UTCTIME *tm) | |||
| 429 | d= (v[4]-'0')*10+(v[5]-'0'); | 429 | d= (v[4]-'0')*10+(v[5]-'0'); |
| 430 | h= (v[6]-'0')*10+(v[7]-'0'); | 430 | h= (v[6]-'0')*10+(v[7]-'0'); |
| 431 | m= (v[8]-'0')*10+(v[9]-'0'); | 431 | m= (v[8]-'0')*10+(v[9]-'0'); |
| 432 | if (i >=12 && | 432 | if (tm->length >=12 && |
| 433 | (v[10] >= '0') && (v[10] <= '9') && | 433 | (v[10] >= '0') && (v[10] <= '9') && |
| 434 | (v[11] >= '0') && (v[11] <= '9')) | 434 | (v[11] >= '0') && (v[11] <= '9')) |
| 435 | s= (v[10]-'0')*10+(v[11]-'0'); | 435 | s= (v[10]-'0')*10+(v[11]-'0'); |