diff --git a/lib/gssapi/accept_sec_context.c b/lib/gssapi/accept_sec_context.c
index 103e06942..da3a4edc1 100644
--- a/lib/gssapi/accept_sec_context.c
+++ b/lib/gssapi/accept_sec_context.c
@@ -606,7 +606,7 @@ code_NegTokenArg(OM_uint32 *minor_status,
 	    ret = der_put_length_and_tag(buf + buf_size - buf_len - 1,
 					 buf_size - buf_len,
 					 buf_len,
-					 CONTEXT,
+					 ASN1_C_CONTEXT,
 					 CONS,
 					 1,
 					 &tmp);
@@ -838,7 +838,7 @@ spnego_accept_sec_context
 	return ret;
 
     ret = der_match_tag_and_length(data.data, data.length,
-				   CONTEXT, CONS, 0, &len, &taglen);
+				   ASN1_C_CONTEXT, CONS, 0, &len, &taglen);
     if (ret)
 	return ret;
 
diff --git a/lib/gssapi/init_sec_context.c b/lib/gssapi/init_sec_context.c
index aef83c509..414800fae 100644
--- a/lib/gssapi/init_sec_context.c
+++ b/lib/gssapi/init_sec_context.c
@@ -659,7 +659,7 @@ spnego_reply
 
     ret = der_match_tag_and_length((const char *)indata.data,
 				   indata.length,
-				   CONTEXT, CONS, 1, &len, &taglen);
+				   ASN1_C_CONTEXT, CONS, 1, &len, &taglen);
     if (ret)
 	return ret;
 
@@ -924,7 +924,7 @@ spnego_initial
 	ret = der_put_length_and_tag(buf + buf_size - buf_len - 1,
 				     buf_size - buf_len,
 				     buf_len,
-				     CONTEXT,
+				     ASN1_C_CONTEXT,
 				     CONS,
 				     0,
 				     &tmp);
diff --git a/lib/gssapi/krb5/accept_sec_context.c b/lib/gssapi/krb5/accept_sec_context.c
index 103e06942..da3a4edc1 100644
--- a/lib/gssapi/krb5/accept_sec_context.c
+++ b/lib/gssapi/krb5/accept_sec_context.c
@@ -606,7 +606,7 @@ code_NegTokenArg(OM_uint32 *minor_status,
 	    ret = der_put_length_and_tag(buf + buf_size - buf_len - 1,
 					 buf_size - buf_len,
 					 buf_len,
-					 CONTEXT,
+					 ASN1_C_CONTEXT,
 					 CONS,
 					 1,
 					 &tmp);
@@ -838,7 +838,7 @@ spnego_accept_sec_context
 	return ret;
 
     ret = der_match_tag_and_length(data.data, data.length,
-				   CONTEXT, CONS, 0, &len, &taglen);
+				   ASN1_C_CONTEXT, CONS, 0, &len, &taglen);
     if (ret)
 	return ret;
 
diff --git a/lib/gssapi/krb5/init_sec_context.c b/lib/gssapi/krb5/init_sec_context.c
index aef83c509..414800fae 100644
--- a/lib/gssapi/krb5/init_sec_context.c
+++ b/lib/gssapi/krb5/init_sec_context.c
@@ -659,7 +659,7 @@ spnego_reply
 
     ret = der_match_tag_and_length((const char *)indata.data,
 				   indata.length,
-				   CONTEXT, CONS, 1, &len, &taglen);
+				   ASN1_C_CONTEXT, CONS, 1, &len, &taglen);
     if (ret)
 	return ret;
 
@@ -924,7 +924,7 @@ spnego_initial
 	ret = der_put_length_and_tag(buf + buf_size - buf_len - 1,
 				     buf_size - buf_len,
 				     buf_len,
-				     CONTEXT,
+				     ASN1_C_CONTEXT,
 				     CONS,
 				     0,
 				     &tmp);