diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2000-12-08 19:09:35 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2000-12-08 19:09:35 +0000 |
| commit | 9d6b1ce6441c7cc6aed344f02d9f676ab5e04217 (patch) | |
| tree | 7329435a21d3289cb3caad6d3d6c065f484373e1 /crypto/x509/x509_v3.c | |
| parent | 66ebbb6a56bc1688fa37878e4feec985b0c260d7 (diff) | |
Merge from the ASN1 branch of new ASN1 code
to main trunk.
Lets see if the makes it to openssl-cvs :-)
Diffstat (limited to 'crypto/x509/x509_v3.c')
| -rw-r--r-- | crypto/x509/x509_v3.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/crypto/x509/x509_v3.c b/crypto/x509/x509_v3.c index 52887986fe..b5f7daa2e5 100644 --- a/crypto/x509/x509_v3.c +++ b/crypto/x509/x509_v3.c @@ -115,8 +115,8 @@ int X509v3_get_ext_by_critical(const STACK_OF(X509_EXTENSION) *sk, int crit, for ( ; lastpos < n; lastpos++) { ex=sk_X509_EXTENSION_value(sk,lastpos); - if ( (ex->critical && crit) || - (!ex->critical && !crit)) + if ( ((ex->critical > 0) && crit) || + (!(ex->critical <= 0) && !crit)) return(lastpos); } return(-1); @@ -234,7 +234,7 @@ int X509_EXTENSION_set_object(X509_EXTENSION *ex, ASN1_OBJECT *obj) int X509_EXTENSION_set_critical(X509_EXTENSION *ex, int crit) { if (ex == NULL) return(0); - ex->critical=(crit)?0xFF:0; + ex->critical=(crit)?0xFF:-1; return(1); } @@ -263,5 +263,6 @@ ASN1_OCTET_STRING *X509_EXTENSION_get_data(X509_EXTENSION *ex) int X509_EXTENSION_get_critical(X509_EXTENSION *ex) { if (ex == NULL) return(0); - return(ex->critical); + if(ex->critical > 0) return 1; + return 0; } |