diff options
| author | djm <> | 2006-06-27 05:07:03 +0000 |
|---|---|---|
| committer | djm <> | 2006-06-27 05:07:03 +0000 |
| commit | 7fe7e1ed6bcd0e342aed7c0f890962dda616aa0d (patch) | |
| tree | 224c33f66b0b932c84dda315d9ba4236bf125b1c /src/lib/libcrypto/x509/x509_vfy.c | |
| parent | 3f764f48d2626a43b6eeef7652c28303269d1204 (diff) | |
| download | openbsd-7fe7e1ed6bcd0e342aed7c0f890962dda616aa0d.tar.gz openbsd-7fe7e1ed6bcd0e342aed7c0f890962dda616aa0d.tar.bz2 openbsd-7fe7e1ed6bcd0e342aed7c0f890962dda616aa0d.zip | |
resolve conflicts
Diffstat (limited to 'src/lib/libcrypto/x509/x509_vfy.c')
| -rw-r--r-- | src/lib/libcrypto/x509/x509_vfy.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/libcrypto/x509/x509_vfy.c b/src/lib/libcrypto/x509/x509_vfy.c index e43c861ee7..383e082aba 100644 --- a/src/lib/libcrypto/x509/x509_vfy.c +++ b/src/lib/libcrypto/x509/x509_vfy.c | |||
| @@ -944,7 +944,7 @@ int X509_cmp_time(ASN1_TIME *ctm, time_t *cmp_time) | |||
| 944 | offset=0; | 944 | offset=0; |
| 945 | else | 945 | else |
| 946 | { | 946 | { |
| 947 | if ((*str != '+') && (str[5] != '-')) | 947 | if ((*str != '+') && (*str != '-')) |
| 948 | return 0; | 948 | return 0; |
| 949 | offset=((str[1]-'0')*10+(str[2]-'0'))*60; | 949 | offset=((str[1]-'0')*10+(str[2]-'0'))*60; |
| 950 | offset+=(str[3]-'0')*10+(str[4]-'0'); | 950 | offset+=(str[3]-'0')*10+(str[4]-'0'); |